\r
// ------------ adv options menu ------------\r
\r
-// TODO FIXME fix if and mv\r
-static const char *mgn_aopt_sqhack(menu_id id, int *offs)\r
-{\r
- *offs = -10;\r
- sprintf(static_buff, "%s, %s", 111 ? " active" : "inactive",\r
- (currentConfig.EmuOpt & 0x10) ? "ON" : "OFF");\r
- return static_buff;\r
-}\r
-\r
static menu_entry e_menu_adv_options[] =\r
{\r
mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_USE_SRAM),\r
mee_onoff ("Emulate SN76496 (PSG)", MA_OPT2_ENABLE_SN76496,PicoOpt, POPT_EN_PSG),\r
mee_onoff ("gzip savestates", MA_OPT2_GZIP_STATES, currentConfig.EmuOpt, EOPT_GZIP_SAVES),\r
mee_onoff ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM, currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),\r
- mee_label ("- needs restart -"),\r
- mee_onoff ("craigix's RAM timings", MA_OPT2_RAMTIMINGS, currentConfig.EmuOpt, 0x0100),\r
- mee_onoff_cust("Squidgehack", MA_OPT2_SQUIDGEHACK, currentConfig.EmuOpt, 0x0010, mgn_aopt_sqhack),\r
+ mee_onoff ("RAM overclock", MA_OPT2_RAMTIMINGS, currentConfig.EmuOpt, EOPT_RAM_TIMINGS),\r
+ mee_onoff ("MMU hack", MA_OPT2_SQUIDGEHACK, currentConfig.EmuOpt, EOPT_MMUHACK),\r
mee_onoff ("SVP dynarec", MA_OPT2_SVP_DYNAREC, PicoOpt, POPT_EN_SVP_DRC),\r
mee_onoff ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),\r
mee_end,\r
\r
static const char *mgn_opt_scaling(menu_id id, int *offs)\r
{\r
- *offs = -12;\r
+ *offs = -13;\r
switch (currentConfig.scaling) {\r
- default: return " OFF";\r
- case 1: return "hw horizontal";\r
- case 2: return "hw horiz. + vert.";\r
- case 3: return "sw horizontal";\r
+ default: return " OFF";\r
+ case EOPT_SCALE_HW_H: return " hw horizontal";\r
+ case EOPT_SCALE_HW_HV: return "hw horiz. + vert";\r
+ case EOPT_SCALE_SW_H: return " sw horizontal";\r
}\r
}\r
\r
{\r
mee_range_cust("Scaling", MA_OPT_SCALING, currentConfig.scaling, 0, 3, mgn_opt_scaling),\r
mee_range_cust("Gamma correction", MA_OPT2_GAMMA, currentConfig.gamma, 1, 300, mgn_aopt_gamma),\r
- mee_onoff ("A_SN's gamma curve", MA_OPT2_A_SN_GAMMA, currentConfig.EmuOpt, 0x1000),\r
- mee_onoff ("Perfect vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, 0x2000),\r
+ mee_onoff ("A_SN's gamma curve", MA_OPT2_A_SN_GAMMA, currentConfig.EmuOpt, EOPT_A_SN_GAMMA),\r
+ mee_onoff ("Perfect vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, EOPT_PSYNC),\r
mee_end,\r
};\r
\r
mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, 0x004),\r
mee_cust ("Sound Quality", MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),\r
mee_cust ("Confirm savestate", MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),\r
-#if defined(__GP2X__)\r
- mee_range ("GP2X CPU clocks", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 400),\r
-#elif defined(PSP)\r
- mee_range ("PSP CPU clock", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, )\r
-#endif\r
+ mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
mee_handler ("[Display options]", menu_loop_gfx_options),\r
mee_handler ("[Advanced options]", menu_loop_adv_options),\r
mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options),\r
\r
// ------------ util ------------\r
\r
+/* wiz for now, probably extend later */\r
+void menu_plat_setup(int is_wiz)\r
+{\r
+ int i;\r
+\r
+ if (!is_wiz)\r
+ return;\r
+\r
+ me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);\r
+ me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);\r
+ me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);\r
+\r
+ i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);\r
+ e_menu_gfx_options[i].max = 1; /* only off and sw */\r
+}\r
+\r
/* TODO: rename */\r
void menu_darken_bg(void *dst, int pixels, int darker)\r
{\r