X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=f2a24fd6c91fae63ccf3f76fd23f9e76ec8eab27;hp=bb2a893544d8787662f5439b6ce4da8816495101;hb=bce6b05695beb988b607eb1dd82c27c1ed841faa;hpb=cd6e8d0f6f7596fc25c30b352d4785e74af3edf6 diff --git a/frontend/menu.c b/frontend/menu.c index bb2a8935..f2a24fd6 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -1,5 +1,5 @@ /* - * (C) Gražvydas "notaz" Ignotas, 2010 + * (C) Gražvydas "notaz" Ignotas, 2010-2011 * * This work is licensed under the terms of any of these licenses * (at your option): @@ -11,13 +11,16 @@ #include #include #include +#include +#include +#include "main.h" #include "menu.h" #include "config.h" +#include "plugin.h" #include "plugin_lib.h" #include "omap.h" #include "common/plat.h" -#include "../gui/Linux.h" #include "../libpcsxcore/misc.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "revision.h" @@ -33,6 +36,7 @@ typedef enum MA_MAIN_LOAD_STATE, MA_MAIN_RESET_GAME, MA_MAIN_LOAD_ROM, + MA_MAIN_RUN_BIOS, MA_MAIN_CONTROLS, MA_MAIN_CREDITS, MA_MAIN_EXIT, @@ -55,10 +59,8 @@ enum { SCALE_CUSTOM, }; -extern int ready_to_go; -static int game_config_loaded; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, state_slot, cpu_clock; +static int scaling, filter, state_slot, cpu_clock, cpu_clock_st; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; int g_opts; @@ -67,6 +69,8 @@ int g_opts; extern int iUseDither; extern int UseFrameSkip; extern uint32_t dwActFixes; +extern float fFrameRateHz; +extern int dwFrameRateTicks; // sound plugin extern int iUseReverb; @@ -75,6 +79,11 @@ extern int iXAPitch; extern int iSPUIRQWait; extern int iUseTimer; +static const char *bioses[24]; +static const char *gpu_plugins[16]; +static const char *spu_plugins[16]; +static int bios_sel, gpu_plugsel, spu_plugsel; + static int min(int x, int y) { return x < y ? x : y; } static int max(int x, int y) { return x > y ? x : y; } @@ -93,42 +102,45 @@ void emu_make_path(char *buff, const char *end, int size) static int emu_check_save_file(int slot) { - char *fname; + char fname[MAXPATHLEN]; int ret; - fname = get_state_filename(slot); - if (fname == NULL) + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) return 0; ret = CheckState(fname); - free(fname); return ret == 0 ? 1 : 0; } static int emu_save_load_game(int load, int sram) { - char *fname; + char fname[MAXPATHLEN]; int ret; - fname = get_state_filename(state_slot); - if (fname == NULL) + ret = get_state_filename(fname, sizeof(fname), state_slot); + if (ret != 0) return 0; - if (load) + if (load) { ret = LoadState(fname); + + // reflect hle/bios mode from savestate + if (Config.HLE) + bios_sel = 0; + else if (bios_sel == 0 && bioses[1] != NULL) + // XXX: maybe find the right bios instead + bios_sel = 1; + } else ret = SaveState(fname); - free(fname); return ret; } -static void draw_savestate_bg(int slot) -{ -} - static void menu_set_defconfig(void) { + g_opts = 0; scaling = SCALE_4_3; Config.Xa = Config.Cdda = Config.Sio = @@ -207,9 +219,9 @@ static void make_cfg_fname(char *buf, size_t size, int is_game) trimlabel[j] = 0; if (is_game) - snprintf(cfgfile, sizeof(cfgfile), "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", trimlabel, CdromId); + snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", trimlabel, CdromId); else - snprintf(cfgfile, sizeof(cfgfile), "." PCSX_DOT_DIR "%s", cfgfile_basename); + snprintf(buf, size, "." PCSX_DOT_DIR "%s", cfgfile_basename); } static int menu_write_config(int is_game) @@ -221,7 +233,7 @@ static int menu_write_config(int is_game) make_cfg_fname(cfgfile, sizeof(cfgfile), is_game); f = fopen(cfgfile, "w"); if (f == NULL) { - printf("failed to open: %s\n", cfgfile); + printf("menu_write_config: failed to open: %s\n", cfgfile); return -1; } @@ -277,7 +289,7 @@ static int menu_load_config(int is_game) make_cfg_fname(cfgfile, sizeof(cfgfile), is_game); f = fopen(cfgfile, "r"); if (f == NULL) { - printf("failed to open: %s\n", cfgfile); + printf("menu_load_config: failed to open: %s\n", cfgfile); return -1; } @@ -346,6 +358,20 @@ static int menu_load_config(int is_game) } } + // sync plugins + for (i = bios_sel = 0; bioses[i] != NULL; i++) + if (strcmp(Config.Bios, bioses[i]) == 0) + { bios_sel = i; break; } + + for (i = gpu_plugsel = 0; gpu_plugins[i] != NULL; i++) + if (strcmp(Config.Gpu, gpu_plugins[i]) == 0) + { gpu_plugsel = i; break; } + + for (i = spu_plugsel = 0; spu_plugins[i] != NULL; i++) + if (strcmp(Config.Spu, spu_plugins[i]) == 0) + { spu_plugsel = i; break; } + + ret = 0; fail_read: free(cfg); fail: @@ -372,11 +398,80 @@ static unsigned short fname2color(const char *fname) return 0xffff; } +static void draw_savestate_bg(int slot); + #define MENU_ALIGN_LEFT #define menu_init menu_init_common #include "common/menu.c" #undef menu_init +// a bit of black magic here +static void draw_savestate_bg(int slot) +{ + extern void bgr555_to_rgb565(void *dst, void *src, int bytes); + static const int psx_widths[8] = { 256, 368, 320, 384, 512, 512, 640, 640 }; + int x, y, w, h; + char fname[MAXPATHLEN]; + GPUFreeze_t *gpu; + u16 *s, *d; + gzFile f; + int ret; + u32 tmp; + + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) + return; + + f = gzopen(fname, "rb"); + if (f == NULL) + return; + + if (gzseek(f, 0x29933d, SEEK_SET) != 0x29933d) { + fprintf(stderr, "gzseek failed\n"); + gzclose(f); + return; + } + + gpu = malloc(sizeof(*gpu)); + if (gpu == NULL) { + gzclose(f); + return; + } + + ret = gzread(f, gpu, sizeof(*gpu)); + gzclose(f); + if (ret != sizeof(*gpu)) { + fprintf(stderr, "gzread failed\n"); + goto out; + } + + memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); + + if ((gpu->ulStatus & 0x800000) || (gpu->ulStatus & 0x200000)) + goto out; // disabled || 24bpp (NYET) + + x = gpu->ulControl[5] & 0x3ff; + y = (gpu->ulControl[5] >> 10) & 0x1ff; + s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~3); + w = psx_widths[(gpu->ulStatus >> 16) & 7]; + tmp = gpu->ulControl[7]; + h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff); + if (gpu->ulStatus & 0x80000) // doubleheight + h *= 2; + + x = max(0, g_menuscreen_w - w) & ~3; + y = max(0, g_menuscreen_h / 2 - h / 2); + w = min(g_menuscreen_w, w); + h = min(g_menuscreen_h, h); + d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; + + for (; h > 0; h--, d += g_menuscreen_w, s += 1024) + bgr555_to_rgb565(d, s, w * 2); + +out: + free(gpu); +} + // ---------- pandora specific ----------- static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts"; @@ -436,7 +531,7 @@ static void pnd_menu_init(void) char buff[64], *p; DIR *dir; - cpu_clock = get_cpu_clock(); + cpu_clock_st = cpu_clock = get_cpu_clock(); dir = opendir("/etc/pandora/conf/dss_fir"); if (dir == NULL) { @@ -489,6 +584,12 @@ static void pnd_menu_init(void) pnd_filter_list = mfilters; } +void menu_finish(void) +{ + cpu_clock = cpu_clock_st; + apply_cpu_clock(); +} + // -------------- key config -------------- me_bind_action me_ctrl_actions[] = @@ -596,7 +697,7 @@ static int menu_loop_keyconfig(int id, int keys) { static int sel = 0; -// me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go); +// me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]); me_loop(e_menu_keyconfig, &sel, NULL); return 0; } @@ -615,13 +716,13 @@ static int menu_loop_cscaler(int id, int keys) scaling = SCALE_CUSTOM; omap_enable_layer(1); - //pnd_restore_layer_data(); for (;;) { menu_draw_begin(0); - memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2); - text_out16(2, 480 - 18, "%dx%d | d-pad to resize, R+d-pad to move", g_layer_w, g_layer_h); + memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2); + text_out16(2, 2, "%d,%d", g_layer_x, g_layer_y); + text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: move", g_layer_w, g_layer_h); menu_draw_end(); inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_R|PBTN_MOK|PBTN_MBACK, 40); @@ -679,8 +780,6 @@ static int menu_loop_gfx_options(int id, int keys) // ------------ bios/plugins ------------ static const char *men_gpu_dithering[] = { "None", "Game dependant", "Always", NULL }; -static const char h_gpu[] = "Configure built-in P.E.Op.S. SoftGL Driver V1.17\n" - "Coded by Pete Bernert and the P.E.Op.S. team"; static const char h_gpu_0[] = "Needed for Chrono Cross"; static const char h_gpu_1[] = "Capcom fighting games"; static const char h_gpu_2[] = "Black screens in Lunar"; @@ -715,8 +814,6 @@ static int menu_loop_plugin_gpu(int id, int keys) static const char *men_spu_reverb[] = { "Off", "Fake", "On", NULL }; static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL }; -static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7\n" - "Coded by Pete Bernert and the P.E.Op.S. team"; static const char h_spu_irq_wait[] = "Wait for CPU; only useful for some games, may cause glitches"; static const char h_spu_thread[] = "Run sound emulation in separate thread"; @@ -737,22 +834,44 @@ static int menu_loop_plugin_spu(int id, int keys) return 0; } +static const char h_bios[] = "HLE is simulated BIOS. BIOS is saved in savestates.\n" + "Must save config and reload the game\n" + "for change to take effect"; +static const char h_plugin_xpu[] = "Must save config and reload the game\n" + "for plugin change to take effect"; +static const char h_gpu[] = "Configure built-in P.E.Op.S. SoftGL Driver V1.17"; +static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7"; + static menu_entry e_menu_plugin_options[] = { + mee_enum_h ("BIOS", 0, bios_sel, bioses, h_bios), + mee_enum_h ("GPU plugin", 0, gpu_plugsel, gpu_plugins, h_plugin_xpu), + mee_enum_h ("SPU plugin", 0, spu_plugsel, spu_plugins, h_plugin_xpu), mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu, h_gpu), mee_handler_h ("Configure built-in SPU plugin", menu_loop_plugin_spu, h_spu), mee_end, }; +static menu_entry e_menu_main[]; + static int menu_loop_plugin_options(int id, int keys) { static int sel = 0; me_loop(e_menu_plugin_options, &sel, NULL); + + // sync BIOS/plugins + snprintf(Config.Bios, sizeof(Config.Bios), "%s", bioses[bios_sel]); + snprintf(Config.Gpu, sizeof(Config.Gpu), "%s", gpu_plugins[gpu_plugsel]); + snprintf(Config.Spu, sizeof(Config.Spu), "%s", spu_plugins[spu_plugsel]); + me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0); + return 0; } // ------------ adv options menu ------------ +static const char h_cfg_cpul[] = "Shows CPU usage in %%"; +static const char h_cfg_fl[] = "Keeps the game from running too fast"; static const char h_cfg_xa[] = "Disables XA sound, which can sometimes improve performance"; static const char h_cfg_cdda[] = "Disable CD Audio for a performance boost\n" "(proper .cue/.bin dump is needed otherwise)"; @@ -760,16 +879,20 @@ static const char h_cfg_sio[] = "This should be enabled for certain memcards/ static const char h_cfg_spuirq[] = "Compatibility tweak; should probably be left off"; static const char h_cfg_rcnt1[] = "Parasite Eve 2, Vandal Hearts 1/2 Fix"; static const char h_cfg_rcnt2[] = "InuYasha Sengoku Battle Fix"; +static const char h_cfg_nodrc[] = "Disable dynamic recompiler and use interpreter\n" + "Might be useful to overcome some dynarec bugs"; static menu_entry e_menu_adv_options[] = { - mee_onoff ("Show CPU load", 0, g_opts, OPT_SHOWCPU), + mee_onoff_h ("Show CPU load", 0, g_opts, OPT_SHOWCPU, h_cfg_cpul), + mee_onoff_h ("Disable Frame Limiter", 0, g_opts, OPT_NO_FRAMELIM, h_cfg_fl), mee_onoff_h ("Disable XA Decoding", 0, Config.Xa, 1, h_cfg_xa), mee_onoff_h ("Disable CD Audio", 0, Config.Cdda, 1, h_cfg_cdda), mee_onoff_h ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio), mee_onoff_h ("SPU IRQ Always Enabled", 0, Config.SpuIrq, 1, h_cfg_spuirq), mee_onoff_h ("Rootcounter hack", 0, Config.RCntFix, 1, h_cfg_rcnt1), mee_onoff_h ("Rootcounter hack 2", 0, Config.VSyncWA, 1, h_cfg_rcnt2), + mee_onoff_h ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc), mee_end, }; @@ -822,7 +945,7 @@ static int menu_loop_options(int id, int keys) i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS); e_menu_options[i].enabled = cpu_clock != 0 ? 1 : 0; - me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go); + me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]); me_loop(e_menu_options, &sel, NULL); @@ -865,57 +988,123 @@ const char *plat_get_credits(void) "(C) 2009-2010 PCSX-Reloaded Team\n\n" "GPU and SPU code by Pete Bernert\n" " and the P.E.Op.S. team\n" - "ARM recompiler (C) 2009-2010 Ari64\n\n" + "ARM recompiler (C) 2009-2010 Ari64\n" + "PCSX4ALL plugins by PCSX4ALL team\n" + " Chui, Franxis, Unai\n\n" "integration, optimization and\n" - " frontend (C) 2010 notaz\n"; + " frontend (C) 2010-2011 notaz\n"; } -static char *romsel_run(void) +static int reset_game(void) { - extern void set_cd_image(const char *fname); - char *ret; + // sanity check + if (bios_sel == 0 && !Config.HLE) + return -1; + + ClosePlugins(); + OpenPlugins(); + SysReset(); + if (CheckCdrom() != -1) { + LoadCdrom(); + } + return 0; +} - ret = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname)); - if (ret == NULL) - return NULL; +static int run_bios(void) +{ + if (bios_sel == 0) + return -1; - lprintf("selected file: %s\n", ret); ready_to_go = 0; + pl_fbdev_buf = NULL; - set_cd_image(ret); + ClosePlugins(); + set_cd_image(NULL); LoadPlugins(); NetOpened = 0; if (OpenPlugins() == -1) { me_update_msg("failed to open plugins"); - return NULL; + return -1; } + plugin_call_rearmed_cbs(); + + CdromId[0] = '\0'; + CdromLabel[0] = '\0'; SysReset(); + ready_to_go = 1; + return 0; +} + +static int run_cd_image(const char *fname) +{ + ready_to_go = 0; + pl_fbdev_buf = NULL; + + ClosePlugins(); + set_cd_image(fname); + LoadPlugins(); + NetOpened = 0; + if (OpenPlugins() == -1) { + me_update_msg("failed to open plugins"); + return -1; + } + plugin_call_rearmed_cbs(); + if (CheckCdrom() == -1) { // Only check the CD if we are starting the console with a CD ClosePlugins(); me_update_msg("unsupported/invalid CD image"); - return NULL; + return -1; } + SysReset(); + // Read main executable directly from CDRom and start it if (LoadCdrom() == -1) { ClosePlugins(); me_update_msg("failed to load CD image"); - return NULL; + return -1; } - strcpy(last_selected_fname, rom_fname_reload); - game_config_loaded = 0; ready_to_go = 1; - return ret; + return 0; } -static int main_menu_handler(int id, int keys) +static int romsel_run(void) { - char *ret_name; + int prev_gpu, prev_spu; + char *fname; + + fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname)); + if (fname == NULL) + return -1; + printf("selected file: %s\n", fname); + + if (run_cd_image(fname) != 0) + return -1; + + prev_gpu = gpu_plugsel; + prev_spu = spu_plugsel; + if (menu_load_config(1) != 0) + menu_load_config(0); + + // check for plugin changes, have to repeat + // loading if game config changed plugins to reload them + if (prev_gpu != gpu_plugsel || prev_spu != spu_plugsel) { + printf("plugin change detected, reloading plugins..\n"); + if (run_cd_image(fname) != 0) + return -1; + } + + strcpy(last_selected_fname, rom_fname_reload); + return 0; +} + +static int main_menu_handler(int id, int keys) +{ switch (id) { case MA_MAIN_RESUME_GAME: @@ -931,18 +1120,15 @@ static int main_menu_handler(int id, int keys) return menu_loop_savestate(1); break; case MA_MAIN_RESET_GAME: - if (ready_to_go) { - OpenPlugins(); - SysReset(); - if (CheckCdrom() != -1) { - LoadCdrom(); - } + if (ready_to_go && reset_game() == 0) return 1; - } break; case MA_MAIN_LOAD_ROM: - ret_name = romsel_run(); - if (ret_name != NULL) + if (romsel_run() == 0) + return 1; + break; + case MA_MAIN_RUN_BIOS: + if (run_bios() == 0) return 1; break; case MA_MAIN_CREDITS: @@ -969,6 +1155,7 @@ static menu_entry e_menu_main[] = mee_handler_id("Load State", MA_MAIN_LOAD_STATE, main_menu_handler), mee_handler_id("Reset game", MA_MAIN_RESET_GAME, main_menu_handler), mee_handler_id("Load CD image", MA_MAIN_LOAD_ROM, main_menu_handler), + mee_handler_id("Run BIOS", MA_MAIN_RUN_BIOS, main_menu_handler), mee_handler ("Options", menu_loop_options), mee_handler ("Controls", menu_loop_keyconfig), mee_handler_id("Credits", MA_MAIN_CREDITS, main_menu_handler), @@ -987,11 +1174,11 @@ void menu_loop(void) menu_leave_emu(); me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go); - me_enable(e_menu_main, MA_MAIN_SAVE_STATE, ready_to_go); - me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go); + me_enable(e_menu_main, MA_MAIN_SAVE_STATE, ready_to_go && CdromId[0]); + me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go && CdromId[0]); me_enable(e_menu_main, MA_MAIN_RESET_GAME, ready_to_go); + me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0); -// menu_enter(ready_to_go); in_set_config_int(0, IN_CFG_BLOCKING, 1); do { @@ -1004,17 +1191,119 @@ void menu_loop(void) in_set_config_int(0, IN_CFG_BLOCKING, 0); - memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2); - menu_draw_end(); menu_prepare_emu(); } +static void scan_bios_plugins(void) +{ + char fname[MAXPATHLEN]; + struct dirent *ent; + int bios_i, gpu_i, spu_i; + char *p; + DIR *dir; + + bioses[0] = "HLE"; + gpu_plugins[0] = "builtin_gpu"; + spu_plugins[0] = "builtin_spu"; + bios_i = gpu_i = spu_i = 1; + + snprintf(fname, sizeof(fname), "%s/", Config.BiosDir); + dir = opendir(fname); + if (dir == NULL) { + perror("scan_bios_plugins bios opendir"); + goto do_plugins; + } + + while (1) { + struct stat st; + + errno = 0; + ent = readdir(dir); + if (ent == NULL) { + if (errno != 0) + perror("readdir"); + break; + } + + if (ent->d_type != DT_REG && ent->d_type != DT_LNK) + continue; + + snprintf(fname, sizeof(fname), "%s/%s", Config.BiosDir, ent->d_name); + if (stat(fname, &st) != 0 || st.st_size != 512*1024) { + printf("bad BIOS file: %s\n", ent->d_name); + continue; + } + + if (bios_i < ARRAY_SIZE(bioses) - 1) { + bioses[bios_i++] = strdup(ent->d_name); + continue; + } + + printf("too many BIOSes, dropping \"%s\"\n", ent->d_name); + } + + closedir(dir); + +do_plugins: + snprintf(fname, sizeof(fname), "%s/", Config.PluginsDir); + dir = opendir(fname); + if (dir == NULL) { + perror("scan_bios_plugins opendir"); + return; + } + + while (1) { + void *h, *tmp; + + errno = 0; + ent = readdir(dir); + if (ent == NULL) { + if (errno != 0) + perror("readdir"); + break; + } + p = strstr(ent->d_name, ".so"); + if (p == NULL) + continue; + + snprintf(fname, sizeof(fname), "%s/%s", Config.PluginsDir, ent->d_name); + h = dlopen(fname, RTLD_LAZY | RTLD_LOCAL); + if (h == NULL) { + fprintf(stderr, "%s\n", dlerror()); + continue; + } + + // now what do we have here? + tmp = dlsym(h, "GPUinit"); + if (tmp) { + dlclose(h); + if (gpu_i < ARRAY_SIZE(gpu_plugins) - 1) + gpu_plugins[gpu_i++] = strdup(ent->d_name); + continue; + } + + tmp = dlsym(h, "SPUinit"); + if (tmp) { + dlclose(h); + if (spu_i < ARRAY_SIZE(spu_plugins) - 1) + spu_plugins[spu_i++] = strdup(ent->d_name); + continue; + } + + fprintf(stderr, "ignoring unidentified plugin: %s\n", fname); + dlclose(h); + } + + closedir(dir); +} + void menu_init(void) { char buff[MAXPATHLEN]; strcpy(last_selected_fname, "/media"); + scan_bios_plugins(); pnd_menu_init(); menu_init_common(); @@ -1052,7 +1341,7 @@ static void menu_leave_emu(void) } memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); - if (ready_to_go && last_psx_bpp == 16) { + if (pl_fbdev_buf != NULL && ready_to_go && last_psx_bpp == 16) { int x = max(0, g_menuscreen_w - last_psx_w); int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2); int w = min(g_menuscreen_w, last_psx_w); @@ -1063,15 +1352,15 @@ static void menu_leave_emu(void) for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w) menu_darken_bg(d, s, w, 0); } + + plat_video_menu_enter(ready_to_go); } void menu_prepare_emu(void) { - if (!game_config_loaded) { - menu_set_defconfig(); - menu_load_config(1); - game_config_loaded = 1; - } + R3000Acpu *prev_cpu = psxCpu; + + plat_video_menu_leave(); switch (scaling) { case SCALE_1_1: @@ -1092,13 +1381,19 @@ void menu_prepare_emu(void) apply_cpu_clock(); stop = 0; + psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec; + if (psxCpu != prev_cpu) + // note that this does not really reset, just clears drc caches + psxCpu->Reset(); + // core doesn't care about Config.Cdda changes, // so handle them manually here if (Config.Cdda) CDR_stop(); + pl_frame_interval = Config.PsxType ? 20000 : 16667; + if (GPU_open != NULL) { - extern unsigned long gpuDisp; int ret = GPU_open(&gpuDisp, "PCSX", NULL); if (ret) fprintf(stderr, "Warning: GPU_open returned %d\n", ret);