int g_screen_width = 320;\r
int g_screen_height = 240;\r
\r
-char *PicoConfigFile = "config.cfg";\r
+const char *PicoConfigFile = "config2.cfg";\r
currentConfig_t currentConfig, defaultConfig;\r
int state_slot = 0;\r
int config_slot = 0, config_slot_current = 0;\r
int pico_pen_x = 320/2, pico_pen_y = 240/2;\r
-int pico_inp_mode = 0;\r
+int pico_inp_mode;\r
+int flip_after_sync;\r
int engineState = PGS_Menu;\r
\r
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
break;\r
}\r
\r
+ // make quirks visible in UI\r
+ if (PicoQuirks & PQUIRK_FORCE_6BTN)\r
+ currentConfig.input_dev0 = PICO_INPUT_PAD_6BTN;\r
+\r
menu_romload_end();\r
menu_romload_started = 0;\r
\r
// additional movie stuff\r
if (movie_data)\r
{\r
- if (movie_data[0x14] == '6')\r
- PicoOpt |= POPT_6BTN_PAD; // 6 button pad\r
- else PicoOpt &= ~POPT_6BTN_PAD;\r
+ enum input_device indev = (movie_data[0x14] == '6') ?\r
+ PICO_INPUT_PAD_6BTN : PICO_INPUT_PAD_3BTN;\r
+ PicoSetInputDevice(0, indev);\r
+ PicoSetInputDevice(1, indev);\r
+\r
PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing\r
if (movie_data[0xF] >= 'A') {\r
if (movie_data[0x16] & 0x80) {\r
if (currentConfig.EmuOpt & EOPT_EN_SRAM)\r
emu_save_load_game(1, 1);\r
\r
+ // state autoload?\r
+ if (g_autostateld_opt) {\r
+ int time, newest = 0, newest_slot = -1;\r
+ int slot;\r
+\r
+ for (slot = 0; slot < 10; slot++) {\r
+ if (emu_check_save_file(slot, &time)) {\r
+ if (time > newest) {\r
+ newest = time;\r
+ newest_slot = slot;\r
+ }\r
+ }\r
+ }\r
+\r
+ if (newest_slot >= 0) {\r
+ lprintf("autoload slot %d\n", newest_slot);\r
+ state_slot = newest_slot;\r
+ emu_save_load_game(1, 0);\r
+ }\r
+ else {\r
+ lprintf("no save to autoload.\n");\r
+ }\r
+ }\r
+\r
retval = 1;\r
out:\r
if (menu_romload_started)\r
void emu_prep_defconfig(void)\r
{\r
memset(&defaultConfig, 0, sizeof(defaultConfig));\r
- defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_EN_CD_LEDS;\r
+ defaultConfig.EmuOpt = 0x9d | EOPT_EN_CD_LEDS;\r
defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |\r
POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX |\r
POPT_EN_SVP_DRC|POPT_ACC_SPRITES |\r
defaultConfig.s_PicoCDBuffers = 0;\r
defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;\r
defaultConfig.Frameskip = -1; // auto\r
+ defaultConfig.input_dev0 = PICO_INPUT_PAD_3BTN;\r
+ defaultConfig.input_dev1 = PICO_INPUT_PAD_3BTN;\r
defaultConfig.volume = 50;\r
defaultConfig.gamma = 100;\r
defaultConfig.scaling = 0;\r
}\r
}\r
\r
-static int try_ropen_file(const char *fname)\r
+static int try_ropen_file(const char *fname, int *time)\r
{\r
+ struct stat st;\r
FILE *f;\r
\r
f = fopen(fname, "rb");\r
if (f) {\r
+ if (time != NULL) {\r
+ *time = 0;\r
+ if (fstat(fileno(f), &st) == 0)\r
+ *time = (int)st.st_mtime;\r
+ }\r
fclose(f);\r
return 1;\r
}\r
return 0;\r
}\r
\r
-char *emu_get_save_fname(int load, int is_sram, int slot)\r
+char *emu_get_save_fname(int load, int is_sram, int slot, int *time)\r
{\r
char *saveFname = static_buff;\r
char ext[16];\r
if (!load)\r
return saveFname;\r
\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
\r
romfname_ext(saveFname, sizeof(static_buff), NULL, ext);\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
}\r
else\r
}\r
else {\r
romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
\r
romfname_ext(saveFname, sizeof(static_buff), NULL, ext);\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
\r
// try the other ext\r
strcat(ext, ext_othr);\r
\r
romfname_ext(saveFname, sizeof(static_buff), "mds"PATH_SEP, ext);\r
- if (try_ropen_file(saveFname))\r
+ if (try_ropen_file(saveFname, time))\r
return saveFname;\r
}\r
}\r
\r
int emu_check_save_file(int slot, int *time)\r
{\r
- return emu_get_save_fname(1, 0, slot) ? 1 : 0;\r
+ return emu_get_save_fname(1, 0, slot, time) ? 1 : 0;\r
}\r
\r
int emu_save_load_game(int load, int sram)\r
char *saveFname;\r
\r
// make save filename\r
- saveFname = emu_get_save_fname(load, sram, state_slot);\r
+ saveFname = emu_get_save_fname(load, sram, state_slot, NULL);\r
if (saveFname == NULL) {\r
if (!sram)\r
emu_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED");\r
filter_old = currentConfig.filter;\r
}\r
\r
+printf("-- gamma %d\n", currentConfig.gamma);\r
plat_target_gamma_set(currentConfig.gamma, 0);\r
\r
pemu_loop_prep();\r
}\r
\r
-static void skip_frame(int do_audio)\r
-{\r
- PicoSkipFrame = do_audio ? 1 : 2;\r
- PicoFrame();\r
- PicoSkipFrame = 0;\r
-}\r
-\r
/* our tick here is 1 us right now */\r
#define ms_to_ticks(x) (unsigned int)(x * 1000)\r
#define get_ticks() plat_get_ticks_us()\r
\r
void emu_loop(void)\r
{\r
- int pframes_done; /* "period" frames, used for sync */\r
int frames_done, frames_shown; /* actual frames for fps counter */\r
- int target_fps, target_frametime;\r
- unsigned int timestamp_base = 0, timestamp_fps;\r
+ int target_frametime_x3;\r
+ unsigned int timestamp_x3 = 0;\r
+ unsigned int timestamp_aim_x3 = 0;\r
+ unsigned int timestamp_fps_x3 = 0;\r
char *notice_msg = NULL;\r
char fpsbuff[24];\r
- int i;\r
+ int fskip_cnt = 0;\r
\r
fpsbuff[0] = 0;\r
\r
pemu_sound_start();\r
\r
/* number of ticks per frame */\r
- if (Pico.m.pal) {\r
- target_fps = 50;\r
- target_frametime = ms_to_ticks(1000) / 50;\r
- } else {\r
- target_fps = 60;\r
- target_frametime = ms_to_ticks(1000) / 60 + 1;\r
- }\r
+ if (Pico.m.pal)\r
+ target_frametime_x3 = 3 * ms_to_ticks(1000) / 50;\r
+ else\r
+ target_frametime_x3 = 3 * ms_to_ticks(1000) / 60;\r
\r
- timestamp_fps = get_ticks();\r
reset_timing = 1;\r
-\r
- frames_done = frames_shown = pframes_done = 0;\r
-\r
- plat_video_wait_vsync();\r
+ frames_done = frames_shown = 0;\r
\r
/* loop with resync every 1 sec. */\r
while (engineState == PGS_Running)\r
{\r
- unsigned int timestamp;\r
- int diff, diff_lim;\r
+ int skip = 0;\r
+ int diff;\r
\r
pprof_start(main);\r
\r
- timestamp = get_ticks();\r
if (reset_timing) {\r
reset_timing = 0;\r
- timestamp_base = timestamp;\r
- pframes_done = 0;\r
+ plat_video_wait_vsync();\r
+ timestamp_aim_x3 = get_ticks() * 3;\r
+ timestamp_fps_x3 = timestamp_aim_x3;\r
+ fskip_cnt = 0;\r
}\r
+ else if (currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) {\r
+ timestamp_aim_x3 = get_ticks() * 3;\r
+ }\r
+\r
+ timestamp_x3 = get_ticks() * 3;\r
\r
// show notice_msg message?\r
if (notice_msg_time != 0)\r
{\r
static int noticeMsgSum;\r
- if (timestamp - ms_to_ticks(notice_msg_time) > ms_to_ticks(STATUS_MSG_TIMEOUT)) {\r
+ if (timestamp_x3 - ms_to_ticks(notice_msg_time) * 3\r
+ > ms_to_ticks(STATUS_MSG_TIMEOUT) * 3)\r
+ {\r
notice_msg_time = 0;\r
plat_status_msg_clear();\r
notice_msg = NULL;\r
- } else {\r
+ }\r
+ else {\r
int sum = noticeMsg[0] + noticeMsg[1] + noticeMsg[2];\r
if (sum != noticeMsgSum) {\r
plat_status_msg_clear();\r
}\r
\r
// second changed?\r
- if (timestamp - timestamp_fps >= ms_to_ticks(1000))\r
+ if (timestamp_x3 - timestamp_fps_x3 >= ms_to_ticks(1000) * 3)\r
{\r
#ifdef BENCHMARK\r
static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];\r
sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
printf("%s\n", fpsbuff);\r
#else\r
- if (currentConfig.EmuOpt & EOPT_SHOW_FPS) {\r
- sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
- if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
- }\r
+ if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
+ sprintf(fpsbuff, "%02i/%02i ", frames_shown, frames_done);\r
#endif\r
frames_shown = frames_done = 0;\r
- timestamp_fps += ms_to_ticks(1000);\r
+ timestamp_fps_x3 += ms_to_ticks(1000) * 3;\r
}\r
#ifdef PFRAMES\r
sprintf(fpsbuff, "%i", Pico.m.frame_count);\r
#endif\r
\r
- if (timestamp - timestamp_base >= ms_to_ticks(1000))\r
- {\r
- if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && currentConfig.Frameskip >= 0)\r
- pframes_done = 0;\r
- else\r
- pframes_done -= target_fps;\r
- if (pframes_done < -2) {\r
- /* don't drag more than 2 frames behind */\r
- pframes_done = -2;\r
- timestamp_base = timestamp - 2 * target_frametime;\r
- }\r
- else\r
- timestamp_base += ms_to_ticks(1000);\r
- }\r
+ diff = timestamp_aim_x3 - timestamp_x3;\r
\r
- diff = timestamp - timestamp_base;\r
- diff_lim = (pframes_done + 1) * target_frametime;\r
-\r
- if (currentConfig.Frameskip >= 0) // frameskip enabled\r
+ if (currentConfig.Frameskip >= 0) // frameskip enabled (or 0)\r
{\r
- for (i = 0; i < currentConfig.Frameskip; i++) {\r
- emu_update_input();\r
- skip_frame(1);\r
- pframes_done++; frames_done++;\r
- diff_lim += target_frametime;\r
-\r
- if (!(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT))) {\r
- timestamp = get_ticks();\r
- diff = timestamp - timestamp_base;\r
- if (!reset_timing && diff < diff_lim) // we are too fast\r
- plat_wait_till_us(timestamp_base + diff_lim);\r
- }\r
+ if (fskip_cnt < currentConfig.Frameskip) {\r
+ fskip_cnt++;\r
+ skip = 1;\r
+ }\r
+ else {\r
+ fskip_cnt = 0;\r
}\r
}\r
- else if (diff > diff_lim)\r
+ else if (diff < -target_frametime_x3)\r
{\r
/* no time left for this frame - skip */\r
/* limit auto frameskip to 8 */\r
- if (frames_done / 8 <= frames_shown) {\r
- emu_update_input();\r
- skip_frame(diff < diff_lim + target_frametime * 16);\r
- pframes_done++; frames_done++;\r
- continue;\r
- }\r
+ if (frames_done / 8 <= frames_shown)\r
+ skip = 1;\r
+ }\r
+\r
+ // don't go in debt too much\r
+ while (diff < -target_frametime_x3 * 3) {\r
+ timestamp_aim_x3 += target_frametime_x3;\r
+ diff = timestamp_aim_x3 - timestamp_x3;\r
}\r
\r
emu_update_input();\r
- PicoFrame();\r
- pemu_finalize_frame(fpsbuff, notice_msg);\r
+ if (skip) {\r
+ int do_audio = diff > -target_frametime_x3 * 2;\r
+ PicoSkipFrame = do_audio ? 1 : 2;\r
+ PicoFrame();\r
+ PicoSkipFrame = 0;\r
+ }\r
+ else {\r
+ PicoFrame();\r
+ pemu_finalize_frame(fpsbuff, notice_msg);\r
+ frames_shown++;\r
+ }\r
+ frames_done++;\r
+ timestamp_aim_x3 += target_frametime_x3;\r
\r
- // plat_video_flip();\r
+ if (!skip && !flip_after_sync)\r
+ plat_video_flip();\r
\r
/* frame limiter */\r
- if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))\r
+ if (!skip && !reset_timing\r
+ && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))\r
{\r
- timestamp = get_ticks();\r
- diff = timestamp - timestamp_base;\r
+ unsigned int timestamp = get_ticks();\r
+ diff = timestamp_aim_x3 - timestamp * 3;\r
\r
// sleep or vsync if we are still too fast\r
- if (diff < diff_lim)\r
- {\r
+ if (diff > target_frametime_x3 && (currentConfig.EmuOpt & EOPT_VSYNC)) {\r
// we are too fast\r
- plat_wait_till_us(timestamp_base + diff_lim - target_frametime / 4);\r
- if (currentConfig.EmuOpt & EOPT_VSYNC)\r
- plat_video_wait_vsync();\r
+ plat_video_wait_vsync();\r
+ timestamp = get_ticks();\r
+ diff = timestamp * 3 - timestamp_aim_x3;\r
+ }\r
+ if (diff > target_frametime_x3) {\r
+ // still too fast\r
+ plat_wait_till_us(timestamp + (diff - target_frametime_x3) / 3);\r
}\r
}\r
\r
- // XXX: for some plats it might be better to flip before vsync\r
- // (due to shadow registers in display hw)\r
- plat_video_flip();\r
-\r
- pframes_done++; frames_done++; frames_shown++;\r
+ if (!skip && flip_after_sync)\r
+ plat_video_flip();\r
\r
pprof_end(main);\r
}\r