static short sndBuffer[2*44100/50];\r
static char noticeMsg[64]; // notice msg to draw\r
static struct timeval noticeMsgTime = { 0, 0 }; // when started showing\r
-static int reset_timing, osd_fps_x;\r
+static int osd_fps_x;\r
static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos\r
static int gp2x_old_gamma = 100;\r
static unsigned char *movie_data = NULL;\r
static int movie_size = 0;\r
unsigned char *framebuff = 0; // temporary buffer for alt renderer\r
int state_slot = 0;\r
+int reset_timing = 0;\r
\r
/*\r
// tmp\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
+static int cd_check(char **bios_file)\r
{\r
unsigned char buf[32];\r
- FILE *cd_f;\r
+ pm_file *cd_f;\r
int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe\r
\r
- cd_f = fopen(romFileName, "rb");\r
+ cd_f = pm_open(romFileName);\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
+ if (pm_read(buf, 32, cd_f) != 32) {\r
+ pm_close(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
+ pm_close(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
+ pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
+ pm_read(buf, 1, cd_f);\r
+ pm_close(cd_f);\r
\r
if (buf[0] == 0x64) region = 8; // EU\r
if (buf[0] == 0xa1) region = 1; // JAP\r
unsigned int rom_size = 0;\r
char *used_rom_name = romFileName;\r
char ext[5];\r
- FILE *rom;\r
+ pm_file *rom;\r
int ret, cd_state;\r
\r
printf("emu_ReloadRom(%s)\n", romFileName);\r
}\r
\r
// check for MegaCD image\r
- cd_state = cd_check(ext, &used_rom_name);\r
+ cd_state = cd_check(&used_rom_name);\r
if (cd_state > 0) {\r
PicoMCD |= 1;\r
get_ext(used_rom_name, ext);\r
PicoMCD &= ~1;\r
}\r
\r
- rom = fopen(used_rom_name, "rb");\r
+ rom = pm_open(used_rom_name);\r
if(!rom) {\r
sprintf(menuErrorMsg, "Failed to open rom.");\r
return 0;\r
rom_size = 0;\r
}\r
\r
- // zipfile support\r
- if(!strcasecmp(ext, ".zip")) {\r
- fclose(rom);\r
- ret = CartLoadZip(used_rom_name, &rom_data, &rom_size);\r
- if(ret) {\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
- }\r
- } else {\r
- if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
- sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
- printf("%s\n", menuErrorMsg);\r
- fclose(rom);\r
- return 0;\r
- }\r
- fclose(rom);\r
+ if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
+ sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
+ printf("%s\n", menuErrorMsg);\r
+ pm_close(rom);\r
+ return 0;\r
}\r
+ pm_close(rom);\r
\r
// detect wrong files (Pico crashes on very small files), also see if ROM EP is good\r
if(rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r
}\r
\r
\r
+static void emu_msg_cb(const char *msg);\r
+\r
void emu_Init(void)\r
{\r
// make temp buffer for alt renderer\r
mkdir("cfg", 0777);\r
\r
PicoInit();\r
+ PicoMessage = emu_msg_cb;\r
\r
// logf = fopen("log.txt", "w");\r
}\r
currentConfig.KeyBinds[23] = 1<<29; // vol up\r
currentConfig.KeyBinds[22] = 1<<30; // vol down\r
currentConfig.gamma = 100;\r
+ currentConfig.PicoCDBuffers = 64;\r
strncpy(cfg, PicoConfigFile, 511);\r
cfg[511] = 0;\r
} else {\r
PsndRate = currentConfig.PsndRate;\r
PicoRegionOverride = currentConfig.PicoRegion;\r
PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;\r
+ PicoCDBuffers = currentConfig.PicoCDBuffers;\r
if (PicoOpt & 0x20) {\r
actionNames[ 8] = "Z"; actionNames[ 9] = "Y";\r
actionNames[10] = "X"; actionNames[11] = "MODE";\r
strncpy(cfg, PicoConfigFile, 511);\r
cfg[511] = 0;\r
} else {\r
- romfname_ext(cfg, "cfg", ".pbcfg");\r
+ romfname_ext(cfg, "cfg/", ".pbcfg");\r
}\r
\r
printf("emu_WriteConfig: %s ", cfg);\r
currentConfig.PsndRate = PsndRate;\r
currentConfig.PicoRegion = PicoRegionOverride;\r
currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;\r
+ currentConfig.PicoCDBuffers = PicoCDBuffers;\r
bwrite = fwrite(¤tConfig, 1, sizeof(currentConfig), f);\r
fflush(f);\r
fclose(f);\r
}\r
\r
\r
+static void emu_msg_cb(const char *msg)\r
+{\r
+ if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
+ // 8-bit renderers\r
+ gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
+ osd_text(4, 232, msg);\r
+ gp2x_memcpy_all_buffers((char *)gp2x_screen+320*232, 320*232, 320*8);\r
+ } else {\r
+ // 16bit accurate renderer\r
+ gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);\r
+ osd_text(4, 232, msg);\r
+ gp2x_memcpy_all_buffers((char *)gp2x_screen+320*232*2, 320*232*2, 320*8*2);\r
+ }\r
+ gettimeofday(¬iceMsgTime, 0);\r
+ noticeMsgTime.tv_sec -= 2;\r
+}\r
+\r
static void emu_state_cb(const char *str)\r
{\r
clearArea(0);\r
{\r
if (PicoOpt&8) len<<=1;\r
\r
- gp2x_sound_write(PsndOut, len<<1);\r
+ /* avoid writing audio when lagging behind to prevent audio lag */\r
+ if (PicoSkipFrame != 2)\r
+ gp2x_sound_write(PsndOut, len<<1);\r
}\r
\r
\r
-static void SkipFrame(int do_sound)\r
+static void SkipFrame(int do_audio)\r
{\r
- void *sndbuff_tmp = 0;\r
- if (PsndOut && !do_sound) {\r
- sndbuff_tmp = PsndOut;\r
- PsndOut = 0;\r
- }\r
-\r
- PicoSkipFrame=1;\r
+ PicoSkipFrame=do_audio ? 1 : 2;\r
PicoFrame();\r
PicoSkipFrame=0;\r
-\r
- if (sndbuff_tmp && !do_sound) {\r
- PsndOut = sndbuff_tmp;\r
- }\r
}\r
\r
\r
\r
PicoOpt |= 0x10;\r
PicoFrameFull();\r
- PicoOpt = po_old;\r
\r
if (!(Pico.video.reg[12]&1)) {\r
vidCpyM2 = vidCpyM2_32col;\r
vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
gp2x_video_setpalette(localPal, 0x40);\r
+\r
+ PicoOpt = po_old;\r
}\r
\r
static void simpleWait(int thissec, int lim_time)\r
PsndOut = 0;\r
}\r
\r
+ // prepare CD buffer\r
+ if (PicoMCD & 1) PicoCDBufferInit();\r
+\r
// loop?\r
while (engineState == PGS_Running)\r
{\r
}\r
} else if(tval.tv_usec > lim_time) { // auto frameskip\r
// no time left for this frame - skip\r
+ if (tval.tv_usec - lim_time >= 0x300000) {\r
+ /* something caused a slowdown for us (disk access? cache flush?)\r
+ * try to recover by resetting timing... */\r
+ reset_timing = 1;\r
+ continue;\r
+ }\r
updateKeys();\r
- SkipFrame(tval.tv_usec < lim_time+target_frametime); frames_done++;\r
+ SkipFrame(tval.tv_usec < lim_time+target_frametime*2); frames_done++;\r
continue;\r
}\r
\r
\r
// check time\r
gettimeofday(&tval, 0);\r
- if(thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
+ if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
\r
- // sleep if we are still too fast\r
- if(PsndOut != 0 || currentConfig.Frameskip < 0)\r
+ if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 0x300000) // slowdown detection\r
+ reset_timing = 1;\r
+ else if (PsndOut != NULL || currentConfig.Frameskip < 0)\r
{\r
+ // sleep if we are still too fast\r
// usleep sleeps for ~20ms minimum, so it is not a solution here\r
- gettimeofday(&tval, 0);\r
- if(thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
if(tval.tv_usec < lim_time)\r
{\r
// we are too fast\r
frames_done++; frames_shown++;\r
}\r
\r
+\r
+ if (PicoMCD & 1) PicoCDBufferFree();\r
+\r
// save SRAM\r
if((currentConfig.EmuOpt & 1) && SRam.changed) {\r
osd_text(4, 232, "Writing SRAM/BRAM..");\r