X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=19ad86fdc2a7a3bc0a4dcea10aa8409cddfa3dc6;hp=75c51e835afd263e2945524b2132ed219e891e98;hb=201c21e2ad6be25a4b843d1434eabb432ce72884;hpb=bd6267e616cc4966fadf971019fe15db2469e97d diff --git a/frontend/menu.c b/frontend/menu.c index 75c51e83..19ad86fd 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,9 +11,11 @@ #include #include #include +#include #include "menu.h" #include "config.h" +#include "plugin.h" #include "plugin_lib.h" #include "omap.h" #include "common/plat.h" @@ -56,10 +58,8 @@ enum { }; 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 state_slot; +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,7 +67,10 @@ int g_opts; // from softgpu plugin extern int iUseDither; extern int UseFrameSkip; +extern int UseFrameLimit; extern uint32_t dwActFixes; +extern float fFrameRateHz; +extern int dwFrameRateTicks; // sound plugin extern int iUseReverb; @@ -76,6 +79,10 @@ extern int iXAPitch; extern int iSPUIRQWait; extern int iUseTimer; +static const char *gpu_plugins[16]; +static const char *spu_plugins[16]; +static int 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; } @@ -136,6 +143,7 @@ static void menu_set_defconfig(void) Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0; iUseDither = UseFrameSkip = 0; + UseFrameLimit = 1; dwActFixes = 1<<7; iUseReverb = 2; @@ -144,14 +152,225 @@ static void menu_set_defconfig(void) iUseTimer = 2; } +#define CE_CONFIG_STR(val) \ + { #val, 0, Config.val } + +#define CE_CONFIG_VAL(val) \ + { #val, sizeof(Config.val), &Config.val } + +#define CE_STR(val) \ + { #val, 0, val } + +#define CE_INTVAL(val) \ + { #val, sizeof(val), &val } + +static const struct { + const char *name; + size_t len; + void *val; +} config_data[] = { + CE_CONFIG_STR(Bios), + CE_CONFIG_STR(Gpu), + CE_CONFIG_STR(Spu), + CE_CONFIG_STR(Cdr), + CE_CONFIG_VAL(Xa), + CE_CONFIG_VAL(Sio), + CE_CONFIG_VAL(Mdec), + CE_CONFIG_VAL(PsxAuto), + CE_CONFIG_VAL(Cdda), + CE_CONFIG_VAL(Debug), + CE_CONFIG_VAL(PsxOut), + CE_CONFIG_VAL(SpuIrq), + CE_CONFIG_VAL(RCntFix), + CE_CONFIG_VAL(VSyncWA), + CE_CONFIG_VAL(Cpu), + CE_CONFIG_VAL(PsxType), + CE_INTVAL(scaling), + CE_INTVAL(g_layer_x), + CE_INTVAL(g_layer_y), + CE_INTVAL(g_layer_w), + CE_INTVAL(g_layer_h), + CE_INTVAL(filter), + CE_INTVAL(state_slot), + CE_INTVAL(cpu_clock), + CE_INTVAL(g_opts), + CE_INTVAL(iUseDither), + CE_INTVAL(UseFrameSkip), + CE_INTVAL(UseFrameLimit), + CE_INTVAL(dwActFixes), + CE_INTVAL(iUseReverb), + CE_INTVAL(iUseInterpolation), + CE_INTVAL(iXAPitch), + CE_INTVAL(iSPUIRQWait), + CE_INTVAL(iUseTimer), +}; + +static void make_cfg_fname(char *buf, size_t size, int is_game) +{ + char trimlabel[33]; + int j; + + strncpy(trimlabel, CdromLabel, 32); + trimlabel[32] = 0; + for (j = 31; j >= 0; j--) + if (trimlabel[j] == ' ') + trimlabel[j] = 0; + + if (is_game) + snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", trimlabel, CdromId); + else + snprintf(buf, size, "." PCSX_DOT_DIR "%s", cfgfile_basename); +} + static int menu_write_config(int is_game) { - return -1; + char cfgfile[MAXPATHLEN]; + FILE *f; + int i; + + make_cfg_fname(cfgfile, sizeof(cfgfile), is_game); + f = fopen(cfgfile, "w"); + if (f == NULL) { + printf("menu_write_config: failed to open: %s\n", cfgfile); + return -1; + } + + for (i = 0; i < ARRAY_SIZE(config_data); i++) { + fprintf(f, "%s = ", config_data[i].name); + switch (config_data[i].len) { + case 0: + fprintf(f, "%s\n", (char *)config_data[i].val); + break; + case 1: + fprintf(f, "%x\n", *(u8 *)config_data[i].val); + break; + case 2: + fprintf(f, "%x\n", *(u16 *)config_data[i].val); + break; + case 4: + fprintf(f, "%x\n", *(u32 *)config_data[i].val); + break; + default: + printf("menu_write_config: unhandled len %d for %s\n", + config_data[i].len, config_data[i].name); + break; + } + } + + if (!is_game) + fprintf(f, "lastcdimg = %s\n", last_selected_fname); + + fclose(f); + return 0; +} + +static void parse_str_val(char *cval, const char *src) +{ + char *tmp; + strncpy(cval, src, MAXPATHLEN); + cval[MAXPATHLEN - 1] = 0; + tmp = strchr(cval, '\n'); + if (tmp == NULL) + tmp = strchr(cval, '\r'); + if (tmp != NULL) + *tmp = 0; } static int menu_load_config(int is_game) { - return 0; + char cfgfile[MAXPATHLEN]; + int i, ret = -1; + long size; + char *cfg; + FILE *f; + + make_cfg_fname(cfgfile, sizeof(cfgfile), is_game); + f = fopen(cfgfile, "r"); + if (f == NULL) { + printf("menu_load_config: failed to open: %s\n", cfgfile); + return -1; + } + + fseek(f, 0, SEEK_END); + size = ftell(f); + if (size <= 0) { + printf("bad size %ld: %s\n", size, cfgfile); + goto fail; + } + + cfg = malloc(size + 1); + if (cfg == NULL) + goto fail; + + fseek(f, 0, SEEK_SET); + if (fread(cfg, 1, size, f) != size) { + printf("failed to read: %s\n", cfgfile); + goto fail_read; + } + cfg[size] = 0; + + for (i = 0; i < ARRAY_SIZE(config_data); i++) { + char *tmp, *tmp2; + u32 val; + + tmp = strstr(cfg, config_data[i].name); + if (tmp == NULL) + continue; + tmp += strlen(config_data[i].name); + if (strncmp(tmp, " = ", 3) != 0) + continue; + tmp += 3; + + if (config_data[i].len == 0) { + parse_str_val(config_data[i].val, tmp); + continue; + } + + tmp2 = NULL; + val = strtoul(tmp, &tmp2, 16); + if (tmp2 == NULL || tmp == tmp2) + continue; // parse failed + + switch (config_data[i].len) { + case 1: + *(u8 *)config_data[i].val = val; + break; + case 2: + *(u16 *)config_data[i].val = val; + break; + case 4: + *(u32 *)config_data[i].val = val; + break; + default: + printf("menu_load_config: unhandled len %d for %s\n", + config_data[i].len, config_data[i].name); + break; + } + } + + if (!is_game) { + char *tmp = strstr(cfg, "lastcdimg = "); + if (tmp != NULL) { + tmp += 12; + parse_str_val(last_selected_fname, tmp); + } + } + + // sync plugins + 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: + fclose(f); + return ret; } // rrrr rggg gggb bbbb @@ -208,10 +427,11 @@ static void apply_cpu_clock(void) static void apply_filter(int which) { + static int old = -1; char buf[128]; int i; - if (pnd_filter_list == NULL) + if (pnd_filter_list == NULL || which == old) return; for (i = 0; i < which; i++) @@ -223,6 +443,7 @@ static void apply_filter(int which) snprintf(buf, sizeof(buf), "%s/op_videofir.sh %s", pnd_script_base, pnd_filter_list[i]); system(buf); + old = which; } static menu_entry e_menu_gfx_options[]; @@ -235,7 +456,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) { @@ -288,6 +509,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[] = @@ -297,7 +524,7 @@ me_bind_action me_ctrl_actions[] = { "LEFT ", 1 << DKEY_LEFT }, { "RIGHT ", 1 << DKEY_RIGHT }, { "TRIANGLE", 1 << DKEY_TRIANGLE }, - { "CIRCLE ", 1 << DKEY_SQUARE }, + { "CIRCLE ", 1 << DKEY_CIRCLE }, { "CROSS ", 1 << DKEY_CROSS }, { "SQUARE ", 1 << DKEY_SQUARE }, { "L1 ", 1 << DKEY_L1 }, @@ -362,19 +589,12 @@ static const char *mgn_saveloadcfg(int id, int *offs) return ""; } -static int mh_saveloadcfg(int id, int keys) +static int mh_savecfg(int id, int keys) { - switch (id) { - case MA_OPT_SAVECFG: - case MA_OPT_SAVECFG_GAME: - if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0) - me_update_msg("config saved"); - else - me_update_msg("failed to write config"); - break; - default: - return 0; - } + if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0) + me_update_msg("config saved"); + else + me_update_msg("failed to write config"); return 1; } @@ -384,8 +604,8 @@ static menu_entry e_menu_keyconfig[] = mee_handler_id("Player 1", MA_CTRL_PLAYER1, key_config_loop_wrap), mee_handler_id("Player 2", MA_CTRL_PLAYER2, key_config_loop_wrap), mee_handler_id("Emulator controls", MA_CTRL_EMU, key_config_loop_wrap), - mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg), - mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg), +// mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg), +// mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg), mee_label (""), mee_label ("Input devices:"), mee_label_mk (MA_CTRL_DEV_FIRST, mgn_dev_name), @@ -402,7 +622,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); me_loop(e_menu_keyconfig, &sel, NULL); return 0; } @@ -421,13 +641,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); @@ -485,8 +705,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"; @@ -521,8 +739,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"; @@ -543,8 +759,15 @@ static int menu_loop_plugin_spu(int id, int keys) return 0; } +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 const char h_plugin_xpu[] = "Must save config and reload the game\n" + "for plugin change to take effect"; + static menu_entry e_menu_plugin_options[] = { + 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, @@ -554,11 +777,18 @@ static int menu_loop_plugin_options(int id, int keys) { static int sel = 0; me_loop(e_menu_plugin_options, &sel, NULL); + + // sync plugins + snprintf(Config.Gpu, sizeof(Config.Gpu), "%s", gpu_plugins[gpu_plugsel]); + snprintf(Config.Spu, sizeof(Config.Spu), "%s", spu_plugins[spu_plugsel]); + 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)"; @@ -569,7 +799,8 @@ static const char h_cfg_rcnt2[] = "InuYasha Sengoku Battle Fix"; 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 ("Frame Limiter", 0, UseFrameLimit, 1, 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), @@ -615,8 +846,8 @@ static menu_entry e_menu_options[] = mee_handler ("[Display]", menu_loop_gfx_options), mee_handler ("[BIOS/Plugins]", menu_loop_plugin_options), mee_handler ("[Advanced]", menu_loop_adv_options), -// mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg), -// mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg), + mee_cust_nosave("Save global config", MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg), + mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg), mee_handler_h ("Restore default config", mh_restore_defaults, h_restore_def), mee_end, }; @@ -673,55 +904,78 @@ const char *plat_get_credits(void) " and the P.E.Op.S. team\n" "ARM recompiler (C) 2009-2010 Ari64\n\n" "integration, optimization and\n" - " frontend (C) 2010 notaz\n"; + " frontend (C) 2010-2011 notaz\n"; } -static char *romsel_run(void) +static int run_cd_image(const char *fname) { extern void set_cd_image(const char *fname); - char *ret; - - ret = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname)); - if (ret == NULL) - return NULL; - - lprintf("selected file: %s\n", ret); ready_to_go = 0; + pl_fbdev_buf = NULL; - set_cd_image(ret); + ClosePlugins(); + set_cd_image(fname); LoadPlugins(); NetOpened = 0; if (OpenPlugins() == -1) { me_update_msg("failed to open plugins"); - return NULL; + return -1; } - - SysReset(); + 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: @@ -738,6 +992,7 @@ static int main_menu_handler(int id, int keys) break; case MA_MAIN_RESET_GAME: if (ready_to_go) { + ClosePlugins(); OpenPlugins(); SysReset(); if (CheckCdrom() != -1) { @@ -747,8 +1002,7 @@ static int main_menu_handler(int id, int keys) } break; case MA_MAIN_LOAD_ROM: - ret_name = romsel_run(); - if (ret_name != NULL) + if (romsel_run() == 0) return 1; break; case MA_MAIN_CREDITS: @@ -797,7 +1051,7 @@ void menu_loop(void) me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go); me_enable(e_menu_main, MA_MAIN_RESET_GAME, ready_to_go); - menu_enter(ready_to_go); +// menu_enter(ready_to_go); in_set_config_int(0, IN_CFG_BLOCKING, 1); do { @@ -810,23 +1064,94 @@ 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_plugins(void) +{ + char fname[MAXPATHLEN]; + struct dirent *ent; + int gpu_i, spu_i; + char *p; + DIR *dir; + + gpu_plugins[0] = "builtin_gpu"; + spu_plugins[0] = "builtin_spu"; + gpu_i = spu_i = 1; + + snprintf(fname, sizeof(fname), "%s/", Config.PluginsDir); + dir = opendir(fname); + if (dir == NULL) { + perror("scan_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_plugins(); + pnd_menu_init(); + menu_init_common(); + menu_set_defconfig(); menu_load_config(0); - menu_init_common(); - pnd_menu_init(); last_psx_w = 320; last_psx_h = 240; last_psx_bpp = 16; - strcpy(last_selected_fname, "/media"); - //strcpy(last_selected_fname, "/mnt/ntz/stuff/psx"); + g_menubg_src_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1); + if (g_menubg_src_ptr == NULL) + exit(1); + emu_make_path(buff, "skin/background.png", sizeof(buff)); + readpng(g_menubg_src_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h); } void menu_notify_mode_change(int w, int h, int bpp) @@ -838,34 +1163,36 @@ void menu_notify_mode_change(int w, int h, int bpp) if (scaling == SCALE_1_1) { g_layer_x = 800/2 - w/2; g_layer_y = 480/2 - h/2; g_layer_w = w; g_layer_h = h; - omap_enable_layer(1); } } static void menu_leave_emu(void) { - omap_enable_layer(0); + if (GPU_close != NULL) { + int ret = GPU_close(); + if (ret) + fprintf(stderr, "Warning: GPU_close returned %d\n", ret); + } - if (ready_to_go && last_psx_bpp == 16) { + memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); + 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); int h = min(g_menuscreen_h, last_psx_h); - u16 *d = (u16 *)g_menubg_src_ptr + g_menuscreen_w * y + x; + u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; u16 *s = pl_fbdev_buf; for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w) - memcpy(d, s, w * 2); + 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; - } + plat_video_menu_leave(); switch (scaling) { case SCALE_1_1: @@ -882,7 +1209,6 @@ void menu_prepare_emu(void) case SCALE_CUSTOM: break; } - omap_enable_layer(1); apply_filter(filter); apply_cpu_clock(); stop = 0; @@ -891,6 +1217,19 @@ void menu_prepare_emu(void) // so handle them manually here if (Config.Cdda) CDR_stop(); + + // HACK to set up the frame limiter if softgpu is not used.. + if (gpu_plugsel != 0) { + fFrameRateHz = Config.PsxType ? 50.0f : 59.94f; + dwFrameRateTicks = (100000*100 / (unsigned long)(fFrameRateHz*100)); + } + + 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); + } } void me_update_msg(const char *msg)