static int gp2x_old_gamma = 100;\r
static unsigned char *movie_data = NULL;\r
static int movie_size = 0;\r
-static int frame_count = 0;\r
unsigned char *framebuff = 0; // temporary buffer for alt renderer\r
int state_slot = 0;\r
\r
while ( (*string++ = (char)tolower(*string)) );\r
}\r
\r
-static int try_rfn_ext(char *ext)\r
+static int try_rfn_cut(void)\r
{\r
FILE *tmp;\r
char *p;\r
\r
- p = romFileName + strlen(romFileName) - 4;\r
- if (p < romFileName) p = romFileName;\r
- strcpy(p, ext);\r
+ p = romFileName + strlen(romFileName) - 1;\r
+ for (; p > romFileName; p--)\r
+ if (*p == '.') break;\r
+ *p = 0;\r
\r
if((tmp = fopen(romFileName, "rb"))) {\r
fclose(tmp);\r
return 0;\r
}\r
\r
+static void get_ext(char *file, char *ext)\r
+{\r
+ char *p;\r
+\r
+ p = file + strlen(file) - 4;\r
+ if (p < file) p = file;\r
+ strncpy(ext, p, 4);\r
+ ext[4] = 0;\r
+ strlwr(ext);\r
+}\r
+\r
+char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };\r
+char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303", "eu_mcd1_9210" };\r
+char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
+\r
+extern char **g_argv;\r
+\r
+int find_bios(int region, char **bios_file)\r
+{\r
+ static char bios_path[1024];\r
+ int i, j, count;\r
+ char **files;\r
+ FILE *f = NULL;\r
+\r
+ if (region == 4) { // US\r
+ files = biosfiles_us;\r
+ count = sizeof(biosfiles_us) / sizeof(char *);\r
+ } else if (region == 8) { // EU\r
+ files = biosfiles_eu;\r
+ count = sizeof(biosfiles_eu) / sizeof(char *);\r
+ } else if (region == 1 || region == 2) {\r
+ files = biosfiles_jp;\r
+ count = sizeof(biosfiles_jp) / sizeof(char *);\r
+ } else {\r
+ return 0;\r
+ }\r
+\r
+ for (i = 0; i < count; i++)\r
+ {\r
+ strncpy(bios_path, g_argv[0], 1023);\r
+ bios_path[1024-32] = 0;\r
+ for (j = strlen(bios_path); j > 0; j--)\r
+ if (bios_path[j] == '/') { bios_path[j+1] = 0; break; }\r
+ strcat(bios_path, files[i]);\r
+ strcat(bios_path, ".bin");\r
+ f = fopen(bios_path, "rb");\r
+ if (f) break;\r
+\r
+ bios_path[strlen(bios_path) - 4] = 0;\r
+ strcat(bios_path, ".zip");\r
+ f = fopen(bios_path, "rb");\r
+ if (f) break;\r
+ }\r
+\r
+ if (f) {\r
+ printf("using bios: %s\n", bios_path);\r
+ fclose(f);\r
+ if (bios_file) *bios_file = bios_path;\r
+ return 1;\r
+ } else {\r
+ sprintf(menuErrorMsg, "no %s BIOS files found, read docs",\r
+ region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+ printf("%s\n", menuErrorMsg);\r
+ return 0;\r
+ }\r
+}\r
+\r
+/* checks if romFileName points to valid MegaCD image\r
+ * if so, checks for suitable BIOS */\r
+static int cd_check(char *ext, char **bios_file)\r
+{\r
+ unsigned char buf[32];\r
+ FILE *cd_f;\r
+ int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe\r
+\r
+ cd_f = fopen(romFileName, "rb");\r
+ if (!cd_f) return 0; // let the upper level handle this\r
+\r
+ if (fread(buf, 1, 32, cd_f) != 32) {\r
+ fclose(cd_f);\r
+ return 0;\r
+ }\r
+\r
+ if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1; // Sega CD (ISO)\r
+ if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2; // Sega CD (BIN)\r
+ if (type == 0) {\r
+ fclose(cd_f);\r
+ return 0;\r
+ }\r
+\r
+ /* it seems we have a CD image here. Try to detect region and load a suitable BIOS now.. */\r
+ fseek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
+ fread(buf, 1, 1, cd_f);\r
+ fclose(cd_f);\r
+\r
+ if (buf[0] == 0x64) region = 8; // EU\r
+ if (buf[0] == 0xa1) region = 1; // JAP\r
+\r
+ printf("detected %s Sega/Mega CD image with %s region\n",\r
+ type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+\r
+ if (PicoRegionOverride) {\r
+ region = PicoRegionOverride;\r
+ printf("overrided region to %s\n", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+ }\r
+\r
+ if(find_bios(region, bios_file))\r
+ return type; // CD and BIOS detected\r
+\r
+ return -1; // CD detected but load failed\r
+}\r
+\r
int emu_ReloadRom(void)\r
{\r
unsigned int rom_size = 0;\r
- char ext[5], *p;\r
+ char *used_rom_name = romFileName;\r
+ char ext[5];\r
FILE *rom;\r
- int ret;\r
+ int ret, cd_state;\r
\r
printf("emu_ReloadRom(%s)\n", romFileName);\r
\r
- // detect wrong extensions (.srm and .mds)\r
- p = romFileName + strlen(romFileName) - 4;\r
- if (p < romFileName) p = romFileName;\r
- strncpy(ext, p, 4);\r
- ext[4] = 0;\r
- strlwr(ext);\r
+ get_ext(romFileName, ext);\r
\r
+ // detect wrong extensions\r
if(!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
sprintf(menuErrorMsg, "Not a ROM selected.");\r
return 0;\r
sprintf(menuErrorMsg, "Invalid GMV file.");\r
return 0;\r
}\r
- dummy = try_rfn_ext(".zip") || try_rfn_ext(".bin") ||\r
- try_rfn_ext(".smd") || try_rfn_ext(".gen");\r
+ dummy = try_rfn_cut() || try_rfn_cut();\r
if (!dummy) {\r
sprintf(menuErrorMsg, "Could't find a ROM for movie.");\r
return 0;\r
}\r
+ get_ext(romFileName, ext);\r
+ }\r
+\r
+ // check for MegaCD image\r
+ cd_state = cd_check(ext, &used_rom_name);\r
+ if (cd_state > 0) {\r
+ PicoMCD |= 1;\r
+ get_ext(used_rom_name, ext);\r
+ } else if (cd_state == -1) {\r
+ // bios_help() ?\r
+ return 0;\r
+ } else {\r
+ PicoMCD &= ~1;\r
}\r
\r
- rom = fopen(romFileName, "rb");\r
+ rom = fopen(used_rom_name, "rb");\r
if(!rom) {\r
sprintf(menuErrorMsg, "Failed to open rom.");\r
return 0;\r
// zipfile support\r
if(!strcasecmp(ext, ".zip")) {\r
fclose(rom);\r
- ret = CartLoadZip(romFileName, &rom_data, &rom_size);\r
+ ret = CartLoadZip(used_rom_name, &rom_data, &rom_size);\r
if(ret) {\r
- if (ret == 4) strcpy(menuErrorMsg, "No ROMs in zip found.");\r
+ if (ret == 4) strcpy(menuErrorMsg, "No ROMs found in zip.");\r
else sprintf(menuErrorMsg, "Unzip failed with code %i", ret);\r
printf("%s\n", menuErrorMsg);\r
return 0;\r
return 0;\r
}\r
\r
+ // load config for this ROM (do this before insert to get correct region)\r
+ ret = emu_ReadConfig(1);\r
+ if (!ret)\r
+ emu_ReadConfig(0);\r
+\r
printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
if(PicoCartInsert(rom_data, rom_size)) {\r
sprintf(menuErrorMsg, "Failed to load ROM.");\r
return 0;\r
}\r
\r
- // load config for this ROM\r
- ret = emu_ReadConfig(1);\r
- if (!ret)\r
- emu_ReadConfig(0);\r
+ Pico.m.frame_count = 0;\r
+\r
+ // insert CD if it was detected\r
+ if (cd_state > 0) {\r
+ ret = Insert_CD(romFileName, cd_state == 2);\r
+ if (ret != 0) {\r
+ sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
+ printf("%s\n", menuErrorMsg);\r
+ return 0;\r
+ }\r
+ }\r
\r
// emu_ReadConfig() might have messed currentConfig.lastRomFile\r
strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);\r
if(movie_data[0x14] == '6')\r
PicoOpt |= 0x20; // 6 button pad\r
else PicoOpt &= ~0x20;\r
+ PicoOpt |= 0x40; // accurate timing\r
if(movie_data[0xF] >= 'A') {\r
- //Pico.m.pal = movie_data[0x16] >> 7;\r
+ if(movie_data[0x16] & 0x80) {\r
+ PicoRegionOverride = 8;\r
+ } else {\r
+ PicoRegionOverride = 4;\r
+ }\r
+ PicoReset(0);\r
// TODO: bits 6 & 5\r
}\r
- strcpy(noticeMsg, "MOVIE LOADED");\r
+ movie_data[0x18+30] = 0;\r
+ sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]);\r
}\r
else\r
{\r
}\r
}\r
gettimeofday(¬iceMsgTime, 0);\r
-\r
+printf("PicoMCD: %x\n", PicoMCD);\r
// load SRAM for this ROM\r
if(currentConfig.EmuOpt & 1)\r
emu_SaveLoadGame(1, 1);\r
\r
- frame_count = 0;\r
-\r
return 1;\r
}\r
\r
// set default config\r
memset(¤tConfig, 0, sizeof(currentConfig));\r
currentConfig.lastRomFile[0] = 0;\r
- currentConfig.EmuOpt = 0x1f;\r
- currentConfig.PicoOpt = 0x0f;\r
- currentConfig.PsndRate = 22050;\r
+ currentConfig.EmuOpt = 0x1f | 0xc00; // | cd_leds | cd_cdda\r
+ currentConfig.PicoOpt = 0x0f | 0x200; // | use_940\r
+ currentConfig.PsndRate = 44100;\r
currentConfig.PicoRegion = 0; // auto\r
+ currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
currentConfig.Frameskip = -1; // auto\r
currentConfig.CPUclock = 200;\r
currentConfig.volume = 50;\r
PicoOpt = currentConfig.PicoOpt;\r
PsndRate = currentConfig.PsndRate;\r
PicoRegionOverride = currentConfig.PicoRegion;\r
+ PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;\r
if (PicoOpt & 0x20) {\r
actionNames[ 8] = "Z"; actionNames[ 9] = "Y";\r
actionNames[10] = "X"; actionNames[11] = "MODE";\r
currentConfig.PicoOpt = PicoOpt;\r
currentConfig.PsndRate = PsndRate;\r
currentConfig.PicoRegion = PicoRegionOverride;\r
+ currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;\r
bwrite = fwrite(¤tConfig, 1, sizeof(currentConfig), f);\r
fflush(f);\r
fclose(f);\r
int len = strlen(text)*8;\r
\r
if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
- int *p, i, h, black, white;\r
- if (PicoOpt&0x10) {\r
- black = 0x40404040; white = 0x41;\r
- } else {\r
- black = 0xe0e0e0e0; white = 0xf0;\r
- }\r
+ int *p, i, h;\r
x &= ~3; // align x\r
len = (len+3) >> 2;\r
for (h = 0; h < 8; h++) {\r
p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));\r
- for (i = len; i; i--, p++) *p = black;\r
+ for (i = len; i; i--, p++) *p = 0xe0e0e0e0;\r
}\r
- gp2x_text_out8_2(x, y, text, white);\r
+ gp2x_text_out8_2(x, y, text, 0xf0);\r
} else {\r
int *p, i, h;\r
x &= ~1; // align x\r
}\r
}\r
\r
+static void cd_leds(void)\r
+{\r
+ // mmu problems?\r
+// static\r
+ int old_reg;\r
+// if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change\r
+ old_reg = Pico_mcd->s68k_regs[0];\r
+\r
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+ // 8-bit modes\r
+ unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
+ unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
+ *(unsigned int *)((char *)gp2x_screen + 320*2+306) =\r
+ *(unsigned int *)((char *)gp2x_screen + 320*3+306) =\r
+ *(unsigned int *)((char *)gp2x_screen + 320*4+306) = col_g;\r
+ *(unsigned int *)((char *)gp2x_screen + 320*2+312) =\r
+ *(unsigned int *)((char *)gp2x_screen + 320*3+312) =\r
+ *(unsigned int *)((char *)gp2x_screen + 320*4+312) = col_r;\r
+ } else {\r
+ // 16-bit modes\r
+ unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+306);\r
+ unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;\r
+ unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;\r
+ *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
+ *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
+ *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
+ }\r
+}\r
+\r
static int EmuScan16(unsigned int num, void *sdata)\r
{\r
if (!(Pico.video.reg[1]&8)) num += 8;\r
\r
static void blit(char *fps, char *notice)\r
{\r
+ int emu_opt = currentConfig.EmuOpt;\r
+\r
if (PicoOpt&0x10) {\r
// 8bit fast renderer\r
if (Pico.m.dirtyPal) {\r
gp2x_video_setpalette(localPal, 0x40);\r
}\r
vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
- } else if (!(currentConfig.EmuOpt&0x80)) {\r
+ } else if (!(emu_opt&0x80)) {\r
// 8bit accurate renderer\r
if (Pico.m.dirtyPal) {\r
Pico.m.dirtyPal = 0;\r
vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);\r
vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);\r
blockcpy(localPal+0xc0, localPal+0x40, 0x40*4);\r
+ localPal[0xc0] = 0x0000c000;\r
+ localPal[0xd0] = 0x00c00000;\r
localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
localPal[0xf0] = 0x00ffffff;\r
gp2x_video_setpalette(localPal, 0x100);\r
}\r
\r
if (notice) osd_text(4, 232, notice);\r
- if (currentConfig.EmuOpt & 2)\r
+ if (emu_opt & 2)\r
osd_text(osd_fps_x, 232, fps);\r
+ if ((emu_opt & 0x400) && (PicoMCD & 1))\r
+ cd_leds();\r
\r
//gp2x_video_wait_vsync();\r
gp2x_video_flip();\r
// clears whole screen or just the notice area (in all buffers)\r
static void clearArea(int full)\r
{\r
- if (PicoOpt&0x10) {\r
- // 8bit fast renderer\r
- if (full) gp2x_memset_all_buffers(0, 0x40, 320*240);\r
- else gp2x_memset_all_buffers(320*232, 0x40, 320*8);\r
- } else if (currentConfig.EmuOpt&0x80) {\r
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+ // 8-bit renderers\r
+ if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+ else gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
+ } else {\r
// 16bit accurate renderer\r
if (full) gp2x_memset_all_buffers(0, 0, 320*240*2);\r
else gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);\r
- } else {\r
- // 8bit accurate renderer\r
- if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
- else gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
}\r
}\r
\r
static void vidResetMode(void)\r
{\r
if (PicoOpt&0x10) {\r
- localPal[0x40] = 0;\r
- localPal[0x41] = 0x00ffffff;\r
gp2x_video_changemode(8);\r
- gp2x_video_setpalette(localPal, 0x42);\r
- gp2x_memset_all_buffers(0, 0x40, 320*240);\r
- gp2x_video_flip();\r
} else if (currentConfig.EmuOpt&0x80) {\r
gp2x_video_changemode(15);\r
PicoDrawSetColorFormat(1);\r
PicoScan = EmuScan16;\r
PicoScan(0, 0);\r
} else {\r
+ gp2x_video_changemode(8);\r
+ PicoDrawSetColorFormat(2);\r
+ PicoScan = EmuScan8;\r
+ PicoScan(0, 0);\r
+ }\r
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+ // setup pal for 8-bit modes\r
+ localPal[0xc0] = 0x0000c000; // MCD LEDs\r
+ localPal[0xd0] = 0x00c00000;\r
localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
localPal[0xf0] = 0x00ffffff;\r
- gp2x_video_changemode(8);\r
gp2x_video_setpalette(localPal, 0x100);\r
gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
gp2x_video_flip();\r
- PicoDrawSetColorFormat(2);\r
- PicoScan = EmuScan8;\r
- PicoScan(0, 0);\r
}\r
Pico.m.dirtyPal = 1;\r
// reset scaling\r
}\r
\r
\r
+static void updateMovie(void)\r
+{\r
+ int offs = Pico.m.frame_count*3 + 0x40;\r
+ if (offs+3 > movie_size) {\r
+ free(movie_data);\r
+ movie_data = 0;\r
+ strcpy(noticeMsg, "END OF MOVIE.");\r
+ printf("END OF MOVIE.\n");\r
+ gettimeofday(¬iceMsgTime, 0);\r
+ } else {\r
+ // MXYZ SACB RLDU\r
+ PicoPad[0] = ~movie_data[offs] & 0x8f; // ! SCBA RLDU\r
+ if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // A\r
+ if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // B\r
+ if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // A\r
+ PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU\r
+ if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A\r
+ if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B\r
+ if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A\r
+ PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX\r
+ if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X\r
+ if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z\r
+ PicoPad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX\r
+ if(!(movie_data[offs+2] & 0x10)) PicoPad[1] |= 0x0400; // X\r
+ if(!(movie_data[offs+2] & 0x40)) PicoPad[1] |= 0x0100; // Z\r
+ }\r
+}\r
+\r
+\r
static void updateKeys(void)\r
{\r
unsigned long keys, allActions[2] = { 0, 0 }, events;\r
}\r
}\r
\r
- if(movie_data)\r
- {\r
- int offs = frame_count*3 + 0x40;\r
- if (offs+3 > movie_size) {\r
- free(movie_data);\r
- movie_data = 0;\r
- strcpy(noticeMsg, "END OF MOVIE.");\r
- printf("END OF MOVIE.\n");\r
- gettimeofday(¬iceMsgTime, 0);\r
- } else {\r
- // MXYZ SACB RLDU\r
- PicoPad[0] = ~movie_data[offs] & 0x8f; // ! SCBA RLDU\r
- if(!(movie_data[offs] & 0x10)) PicoPad[0] |= 0x40; // A\r
- if(!(movie_data[offs] & 0x20)) PicoPad[0] |= 0x10; // B\r
- if(!(movie_data[offs] & 0x40)) PicoPad[0] |= 0x20; // A\r
- PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU\r
- if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A\r
- if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B\r
- if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A\r
- PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX\r
- if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X\r
- if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z\r
- PicoPad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX\r
- if(!(movie_data[offs+2] & 0x10)) PicoPad[1] |= 0x0400; // X\r
- if(!(movie_data[offs+2] & 0x40)) PicoPad[1] |= 0x0100; // Z\r
- if ((PicoPad[0] & 0x80) || (PicoPad[1] & 0x80))\r
- printf("%d: start\n", frame_count);\r
- }\r
- }\r
- else\r
- {\r
- PicoPad[0] = (unsigned short) allActions[0];\r
- PicoPad[1] = (unsigned short) allActions[1];\r
- }\r
- frame_count++;\r
+ PicoPad[0] = (unsigned short) allActions[0];\r
+ PicoPad[1] = (unsigned short) allActions[1];\r
\r
events = (allActions[0] | allActions[1]) >> 16;\r
\r
\r
events &= ~prevEvents;\r
if (events) RunEvents(events);\r
+ if (movie_data) updateMovie();\r
\r
prevEvents = (allActions[0] | allActions[1]) >> 16;\r
}\r
if(PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || crashed_940) {\r
/* if 940 is turned off, we need it to be put back to sleep */\r
if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {\r
- Reset940(1);\r
+ Reset940(1, 2);\r
Pause940(1);\r
}\r
sound_rerate();\r
updateKeys();\r
PicoFrame();\r
\r
+#if 0\r
+if (Pico.m.frame_count == 31563) {\r
+ FILE *f;\r
+ f = fopen("ram_p.bin", "wb");\r
+ if (!f) { printf("!f\n"); exit(1); }\r
+ fwrite(Pico.ram, 1, 0x10000, f);\r
+ fclose(f);\r
+ exit(0);\r
+}\r
+#endif\r
+#if 0\r
+ // debug\r
+ {\r
+ #define BYTE unsigned char\r
+ #define WORD unsigned short\r
+ struct\r
+ {\r
+ BYTE IDLength; /* 00h Size of Image ID field */\r
+ BYTE ColorMapType; /* 01h Color map type */\r
+ BYTE ImageType; /* 02h Image type code */\r
+ WORD CMapStart; /* 03h Color map origin */\r
+ WORD CMapLength; /* 05h Color map length */\r
+ BYTE CMapDepth; /* 07h Depth of color map entries */\r
+ WORD XOffset; /* 08h X origin of image */\r
+ WORD YOffset; /* 0Ah Y origin of image */\r
+ WORD Width; /* 0Ch Width of image */\r
+ WORD Height; /* 0Eh Height of image */\r
+ BYTE PixelDepth; /* 10h Image pixel size */\r
+ BYTE ImageDescriptor; /* 11h Image descriptor byte */\r
+ } __attribute__((packed)) TGAHEAD;\r
+ static unsigned short oldscr[320*240];\r
+ FILE *f; char name[128]; int i;\r
+\r
+ memset(&TGAHEAD, 0, sizeof(TGAHEAD));\r
+ TGAHEAD.ImageType = 2;\r
+ TGAHEAD.Width = 320;\r
+ TGAHEAD.Height = 240;\r
+ TGAHEAD.PixelDepth = 16;\r
+ TGAHEAD.ImageDescriptor = 2<<4; // image starts at top-left\r
+\r
+ #define CONV(X) (((X>>1)&0x7fe0)|(X&0x1f)) // 555?\r
+\r
+ for (i = 0; i < 320*240; i++)\r
+ if(oldscr[i] != CONV(((unsigned short *)gp2x_screen)[i])) break;\r
+ if (i < 320*240)\r
+ {\r
+ for (i = 0; i < 320*240; i++)\r
+ oldscr[i] = CONV(((unsigned short *)gp2x_screen)[i]);\r
+ sprintf(name, "%05i.tga", Pico.m.frame_count);\r
+ f = fopen(name, "wb");\r
+ if (!f) { printf("!f\n"); exit(1); }\r
+ fwrite(&TGAHEAD, 1, sizeof(TGAHEAD), f);\r
+ fwrite(oldscr, 1, 320*240*2, f);\r
+ fclose(f);\r
+ }\r
+ }\r
+#endif\r
+\r
// check time\r
gettimeofday(&tval, 0);\r
if(thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
\r
// save SRAM\r
if((currentConfig.EmuOpt & 1) && SRam.changed) {\r
+ blit("", "Writing SRAM/BRAM..");\r
emu_SaveLoadGame(0, 1);\r
SRam.changed = 0;\r
}\r
\r
// make save filename\r
romfname_ext(saveFname, "");\r
- if(sram) strcat(saveFname, ".srm");\r
+ if(sram) strcat(saveFname, (PicoMCD&1) ? ".brm" : ".srm");\r
else {\r
if(state_slot > 0 && state_slot < 10) sprintf(saveFname, "%s.%i", saveFname, state_slot);\r
strcat(saveFname, ".mds");\r
\r
if(sram) {\r
FILE *sramFile;\r
- int sram_size = SRam.end-SRam.start+1;\r
- if(SRam.reg_back & 4) sram_size=0x2000;\r
- if(!SRam.data) return 0; // SRam forcefully disabled for this game\r
+ int sram_size;\r
+ unsigned char *sram_data;\r
+ if (PicoMCD&1) {\r
+ sram_size = 0x2000;\r
+ sram_data = Pico_mcd->bram;\r
+ } else {\r
+ sram_size = SRam.end-SRam.start+1;\r
+ if(SRam.reg_back & 4) sram_size=0x2000;\r
+ sram_data = SRam.data;\r
+ }\r
+ if(!sram_data) return 0; // SRam forcefully disabled for this game\r
+\r
if(load) {\r
sramFile = fopen(saveFname, "rb");\r
if(!sramFile) return -1;\r
- fread(SRam.data, 1, sram_size, sramFile);\r
+ fread(sram_data, 1, sram_size, sramFile);\r
fclose(sramFile);\r
} else {\r
// sram save needs some special processing\r
// see if we have anything to save\r
for(; sram_size > 0; sram_size--)\r
- if(SRam.data[sram_size-1]) break;\r
+ if(sram_data[sram_size-1]) break;\r
\r
if(sram_size) {\r
sramFile = fopen(saveFname, "wb");\r
- ret = fwrite(SRam.data, 1, sram_size, sramFile);\r
+ ret = fwrite(sram_data, 1, sram_size, sramFile);\r
ret = (ret != sram_size) ? -1 : 0;\r
fclose(sramFile);\r
sync();\r
}\r
}\r
return ret;\r
- } else {\r
+ }\r
+ else\r
+ {\r
void *PmovFile = NULL;\r
// try gzip first\r
if(currentConfig.EmuOpt & 8) {\r
if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
areaRead = gzRead2;\r
areaWrite = gzWrite2;\r
+ areaEof = (areaeof *) gzeof;\r
if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
} else\r
saveFname[strlen(saveFname)-3] = 0;\r
}\r
if(!PmovFile) { // gzip failed or was disabled\r
if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {\r
- areaRead = (STATE_SL_FUNC) fread;\r
- areaWrite = (STATE_SL_FUNC) fwrite;\r
+ areaRead = (arearw *) fread;\r
+ areaWrite = (arearw *) fwrite;\r
+ areaEof = (areaeof *) feof;\r
}\r
}\r
if(PmovFile) {\r
notaz.gp2x.de / picodrive.git / blobdiff