X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=7d680b8b97fe09f254dd06240ff2ec841110a4f4;hb=9934732a09e9249757fb683e5d323d64e54ed543;hp=f86526c4e678ffd44d42e0db464f716d8ceb7a42;hpb=5ff8efa9e5947664c2b6a5a195e375362818e05e;p=libpicofe.git
diff --git a/common/emu.c b/common/emu.c
index f86526c..7d680b8 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -92,6 +92,36 @@ static void get_ext(const char *file, char *ext)
strlwr_(ext);
}
+static void fname_ext(char *dst, int dstlen, const char *prefix, const char *ext, const char *fname)
+{
+ int prefix_len = 0;
+ const char *p;
+
+ *dst = 0;
+ if (prefix) {
+ int len = plat_get_root_dir(dst, dstlen);
+ strcpy(dst + len, prefix);
+ prefix_len = len + strlen(prefix);
+ }
+
+ p = fname + strlen(fname) - 1;
+ for (; p >= fname && *p != PATH_SEP_C; p--)
+ ;
+ p++;
+ strncpy(dst + prefix_len, p, dstlen - prefix_len - 1);
+
+ dst[dstlen - 8] = 0;
+ if (dst[strlen(dst) - 4] == '.')
+ dst[strlen(dst) - 4] = 0;
+ if (ext)
+ strcat(dst, ext);
+}
+
+static void romfname_ext(char *dst, int dstlen, const char *prefix, const char *ext)
+{
+ fname_ext(dst, dstlen, prefix, ext, rom_fname_loaded);
+}
+
void emu_status_msg(const char *format, ...)
{
va_list vl;
@@ -365,7 +395,7 @@ static int extract_text(char *dest, const unsigned char *src, int len, int swab)
return p - dest;
}
-static char *emu_make_rom_id(void)
+static char *emu_make_rom_id(const char *fname)
{
static char id_string[3+0xe*3+0x3*3+0x30*3+3];
int pos, swab = 1;
@@ -374,15 +404,25 @@ static char *emu_make_rom_id(void)
strcpy(id_string, "CD|");
swab = 0;
}
- else strcpy(id_string, "MD|");
+ else if (PicoAHW & PAHW_SMS)
+ strcpy(id_string, "MS|");
+ else strcpy(id_string, "MD|");
pos = 3;
- pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial
- id_string[pos] = '|'; pos++;
- pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region
- id_string[pos] = '|'; pos++;
- pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name
- id_string[pos] = 0;
+ if (!(PicoAHW & PAHW_SMS)) {
+ pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial
+ id_string[pos] = '|'; pos++;
+ pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region
+ id_string[pos] = '|'; pos++;
+ pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name
+ id_string[pos] = 0;
+ if (pos > 5)
+ return id_string;
+ pos = 3;
+ }
+
+ // can't find name in ROM, use filename
+ fname_ext(id_string + 3, sizeof(id_string) - 3, NULL, NULL, fname);
return id_string;
}
@@ -413,11 +453,14 @@ static void shutdown_MCD(void)
static void system_announce(void)
{
- const char *sys_name, *tv_standard;
+ const char *sys_name, *tv_standard, *extra = "";
int fps;
if (PicoAHW & PAHW_SMS) {
sys_name = "Master System";
+#ifdef NO_SMS
+ extra = " [no support]";
+#endif
} else if (PicoAHW & PAHW_PICO) {
sys_name = "Pico";
} else if (PicoAHW & PAHW_MCD) {
@@ -434,7 +477,7 @@ static void system_announce(void)
tv_standard = Pico.m.pal ? "PAL" : "NTSC";
fps = Pico.m.pal ? 50 : 60;
- emu_status_msg("%s %s / %dFPS", tv_standard, sys_name, fps);
+ emu_status_msg("%s %s / %dFPS%s", tv_standard, sys_name, fps, extra);
}
// note: this function might mangle rom_fname
@@ -454,11 +497,13 @@ int emu_reload_rom(char *rom_fname)
get_ext(rom_fname, ext);
- // check for movie file
+ // early cleanup
+ PicoPatchUnload();
if (movie_data) {
free(movie_data);
movie_data = 0;
}
+
if (!strcmp(ext, ".gmv"))
{
// check for both gmv and rom
@@ -515,7 +560,6 @@ int emu_reload_rom(char *rom_fname)
}
shutdown_MCD();
- PicoPatchUnload();
PicoCartUnload();
rom_loaded = 0;
@@ -530,8 +574,8 @@ int emu_reload_rom(char *rom_fname)
// valid CD image, check for BIOS..
// we need to have config loaded at this point
- ret = emu_read_config(1, 0);
- if (!ret) emu_read_config(0, 0);
+ ret = emu_read_config(rom_fname, 0);
+ if (!ret) emu_read_config(NULL, 0);
cfg_loaded = 1;
if (PicoRegionOverride) {
@@ -593,8 +637,8 @@ int emu_reload_rom(char *rom_fname)
if (!(PicoAHW & PAHW_MCD))
memcpy(id_header, rom_data + 0x100, sizeof(id_header));
if (!cfg_loaded) {
- ret = emu_read_config(1, 0);
- if (!ret) emu_read_config(0, 0);
+ ret = emu_read_config(rom_fname, 0);
+ if (!ret) emu_read_config(NULL, 0);
}
emu_make_path(static_buff, "carthw.cfg", sizeof(static_buff));
@@ -681,29 +725,6 @@ int emu_swap_cd(const char *fname)
return 1;
}
-static void romfname_ext(char *dst, const char *prefix, const char *ext)
-{
- char *p;
- int prefix_len = 0;
-
- // make save filename
- p = rom_fname_loaded + strlen(rom_fname_loaded) - 1;
- for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++;
- *dst = 0;
- if (prefix) {
- int len = plat_get_root_dir(dst, 512);
- strcpy(dst + len, prefix);
- prefix_len = len + strlen(prefix);
- }
-#ifdef UIQ3
- else p = rom_fname_loaded; // backward compatibility
-#endif
- strncpy(dst + prefix_len, p, 511-prefix_len);
- dst[511-8] = 0;
- if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
- if (ext) strcat(dst, ext);
-}
-
//
void emu_make_path(char *buff, const char *end, int size)
{
@@ -733,7 +754,7 @@ static void make_config_cfg(char *cfg_buff_512)
void emu_prep_defconfig(void)
{
memset(&defaultConfig, 0, sizeof(defaultConfig));
- defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_CONFIRM_SAVE|EOPT_EN_CD_LEDS;
+ defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_EN_CD_LEDS;
defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |
POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES |
POPT_EN_32X|POPT_EN_PWM;
@@ -741,6 +762,7 @@ void emu_prep_defconfig(void)
defaultConfig.s_PicoRegion = 0; // auto
defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
defaultConfig.s_PicoCDBuffers = 0;
+ defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;
defaultConfig.Frameskip = -1; // auto
defaultConfig.volume = 50;
defaultConfig.gamma = 100;
@@ -759,9 +781,11 @@ void emu_set_defconfig(void)
PicoRegionOverride = currentConfig.s_PicoRegion;
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
PicoCDBuffers = currentConfig.s_PicoCDBuffers;
+ p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;
+ p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;
}
-int emu_read_config(int game, int no_defaults)
+int emu_read_config(const char *rom_fname, int no_defaults)
{
char cfg[512];
int ret;
@@ -769,16 +793,16 @@ int emu_read_config(int game, int no_defaults)
if (!no_defaults)
emu_set_defconfig();
- if (!game)
+ if (rom_fname == NULL)
{
+ // global config
make_config_cfg(cfg);
ret = config_readsect(cfg, NULL);
}
else
{
- char *sect = emu_make_rom_id();
+ char *sect = emu_make_rom_id(rom_fname);
- // try new .cfg way
if (config_slot != 0)
sprintf(cfg, "game.%i.cfg", config_slot);
else strcpy(cfg, "game.cfg");
@@ -839,7 +863,7 @@ int emu_write_config(int is_game)
if (config_slot != 0)
sprintf(cfg, "game.%i.cfg", config_slot);
else strcpy(cfg, "game.cfg");
- game_sect = emu_make_rom_id();
+ game_sect = emu_make_rom_id(rom_fname_loaded);
lprintf("emu_write_config: sect \"%s\"\n", game_sect);
}
@@ -939,14 +963,15 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
if (is_sram)
{
strcpy(ext, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");
- romfname_ext(saveFname, (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);
+ romfname_ext(saveFname, sizeof(static_buff),
+ (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);
if (!load)
return saveFname;
if (try_ropen_file(saveFname))
return saveFname;
- romfname_ext(saveFname, NULL, ext);
+ romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
if (try_ropen_file(saveFname))
return saveFname;
}
@@ -960,15 +985,15 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
strcat(ext, ext_main);
if (!load) {
- romfname_ext(saveFname, "mds" PATH_SEP, ext);
+ romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);
return saveFname;
}
else {
- romfname_ext(saveFname, "mds" PATH_SEP, ext);
+ romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);
if (try_ropen_file(saveFname))
return saveFname;
- romfname_ext(saveFname, NULL, ext);
+ romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
if (try_ropen_file(saveFname))
return saveFname;
@@ -978,7 +1003,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
sprintf(ext, ".%i", slot);
strcat(ext, ext_othr);
- romfname_ext(saveFname, "mds"PATH_SEP, ext);
+ romfname_ext(saveFname, sizeof(static_buff), "mds"PATH_SEP, ext);
if (try_ropen_file(saveFname))
return saveFname;
}
@@ -987,7 +1012,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
return NULL;
}
-int emu_check_save_file(int slot)
+int emu_check_save_file(int slot, int *time)
{
return emu_get_save_fname(1, 0, slot) ? 1 : 0;
}
@@ -1116,8 +1141,11 @@ static void emu_tray_close(void)
void emu_32x_startup(void)
{
- plat_video_toggle_renderer(0, 1, 0);
+ plat_video_toggle_renderer(0, 0); // HACK
system_announce();
+
+ // force mode change event
+ rendstatus_old = -1;
}
void emu_reset_game(void)
@@ -1211,9 +1239,9 @@ static void run_events_ui(unsigned int which)
if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE))
{
int do_it = 1;
- if ( emu_check_save_file(state_slot) &&
- (((which & PEV_STATE_LOAD) && (currentConfig.EmuOpt & EOPT_CONFIRM_LOAD)) ||
- ((which & PEV_STATE_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) )
+ if ( emu_check_save_file(state_slot, NULL) &&
+ (((which & PEV_STATE_LOAD) && (currentConfig.confirm_save & EOPT_CONFIRM_LOAD)) ||
+ ((which & PEV_STATE_SAVE) && (currentConfig.confirm_save & EOPT_CONFIRM_SAVE))) )
{
const char *nm;
char tmp[64];
@@ -1229,16 +1257,16 @@ static void run_events_ui(unsigned int which)
plat_status_msg_busy_first(tmp);
- in_set_blocking(1);
- while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))
+ in_set_config_int(0, IN_CFG_BLOCKING, 1);
+ while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
;
- while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) )
+ while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MA3|PBTN_MBACK)) )
;
if (keys & PBTN_MBACK)
do_it = 0;
- while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))
+ while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
;
- in_set_blocking(0);
+ in_set_config_int(0, IN_CFG_BLOCKING, 0);
}
if (do_it) {
plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING STATE" : "SAVING STATE");
@@ -1247,9 +1275,9 @@ static void run_events_ui(unsigned int which)
PicoStateProgressCB = NULL;
}
}
- if ((which & PEV_SWITCH_RND) && !(PicoAHW & PAHW_32X))
+ if (which & PEV_SWITCH_RND)
{
- plat_video_toggle_renderer(1, 0, 0);
+ plat_video_toggle_renderer(1, 0);
}
if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT))
{
@@ -1264,7 +1292,7 @@ static void run_events_ui(unsigned int which)
}
emu_status_msg("SAVE SLOT %i [%s]", state_slot,
- emu_check_save_file(state_slot) ? "USED" : "FREE");
+ emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");
}
if (which & PEV_MENU)
engineState = PGS_Menu;
@@ -1323,6 +1351,27 @@ static void mkdir_path(char *path_with_reserve, int pos, const char *name)
lprintf("failed to create: %s\n", path_with_reserve);
}
+void emu_cmn_forced_frame(int no_scale, int do_emu)
+{
+ int po_old = PicoOpt;
+
+ memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
+
+ PicoOpt &= ~POPT_ALT_RENDERER;
+ PicoOpt |= POPT_ACC_SPRITES;
+ if (!no_scale)
+ PicoOpt |= POPT_EN_SOFTSCALE;
+
+ PicoDrawSetOutFormat(PDF_RGB555, 1);
+ Pico.m.dirtyPal = 1;
+ if (do_emu)
+ PicoFrame();
+ else
+ PicoFrameDrawOnly();
+
+ PicoOpt = po_old;
+}
+
void emu_init(void)
{
char path[512];
@@ -1407,6 +1456,14 @@ void emu_loop(void)
Pico.m.dirtyPal = 1;
rendstatus_old = -1;
+ PicoLoopPrepare();
+
+ // prepare CD buffer
+ if (PicoAHW & PAHW_MCD)
+ PicoCDBufferInit();
+
+ pemu_loop_prep();
+
/* number of ticks per frame */
if (Pico.m.pal) {
target_fps = 50;
@@ -1416,13 +1473,6 @@ void emu_loop(void)
target_frametime = ms_to_ticks(1000) / 60 + 1;
}
- // prepare CD buffer
- if (PicoAHW & PAHW_MCD)
- PicoCDBufferInit();
- PicoLoopPrepare();
-
- pemu_loop_prep();
-
timestamp_fps = get_ticks();
reset_timing = 1;
@@ -1476,6 +1526,7 @@ void emu_loop(void)
}
bench_fps += frames_shown;
sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
+ printf("%s\n", fpsbuff);
#else
if (currentConfig.EmuOpt & EOPT_SHOW_FPS) {
sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
@@ -1493,17 +1544,15 @@ void emu_loop(void)
{
if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && currentConfig.Frameskip >= 0)
pframes_done = 0;
- else {
+ else
pframes_done -= target_fps;
- /* don't allow it to drift during heavy slowdowns */
- if (pframes_done < -5) {
- reset_timing = 1;
- continue;
- }
- if (pframes_done < -2)
- pframes_done = -2;
+ if (pframes_done < -2) {
+ /* don't drag more than 2 frames behind */
+ pframes_done = -2;
+ timestamp_base = timestamp - 2 * target_frametime;
}
- timestamp_base += ms_to_ticks(1000);
+ else
+ timestamp_base += ms_to_ticks(1000);
}
diff = timestamp - timestamp_base;
@@ -1528,15 +1577,13 @@ void emu_loop(void)
else if (diff > diff_lim)
{
/* no time left for this frame - skip */
- if (diff - diff_lim >= ms_to_ticks(200)) {
- /* if too much behind, reset instead */
- reset_timing = 1;
+ /* limit auto frameskip to 8 */
+ if (frames_done / 8 <= frames_shown) {
+ emu_update_input();
+ skip_frame(diff < diff_lim + target_frametime * 16);
+ pframes_done++; frames_done++;
continue;
}
- emu_update_input();
- skip_frame(diff < diff_lim + target_frametime * 2);
- pframes_done++; frames_done++;
- continue;
}
emu_update_input();