-#ifdef __GP2X__
-
#include <time.h>
#include "soc.h"
+#include "plat_gp2x.h"
static void menu_main_plat_draw(void)
{
// ------------ gfx options menu ------------
-static const char *mgn_opt_renderer(menu_id id, int *offs)
-{
- *offs = -11;
- if (PicoOpt & POPT_ALT_RENDERER)
- return " 8bit fast";
- else if (currentConfig.EmuOpt & EOPT_16BPP)
- return "16bit accurate";
- else
- return " 8bit accurate";
-}
-
-static const char *mgn_opt_scaling(menu_id id, int *offs)
-{
- *offs = -13;
- switch (currentConfig.scaling) {
- default: return " OFF";
- case EOPT_SCALE_HW_H: return " hw horizontal";
- case EOPT_SCALE_HW_HV: return "hw horiz. + vert";
- case EOPT_SCALE_SW_H: return " sw horizontal";
- }
-}
-
static const char *mgn_aopt_gamma(menu_id id, int *offs)
{
- sprintf(static_buff, "%i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100);
+ sprintf(static_buff, "%i.%02i", currentConfig.gamma / 100, currentConfig.gamma % 100);
return static_buff;
}
-#define MENU_GP2X_OPTIONS_GFX \
- mee_range_cust("Scaling", MA_OPT_SCALING, currentConfig.scaling, 0, 3, mgn_opt_scaling), \
+const char *men_scaling_opts[] = { "OFF", "software", "hardware", NULL };
+
+#define MENU_OPTIONS_GFX \
+ mee_enum ("Horizontal scaling", MA_OPT_SCALING, currentConfig.scaling, men_scaling_opts), \
+ mee_enum ("Vertical scaling", MA_OPT_VSCALING, currentConfig.vscaling, men_scaling_opts), \
mee_onoff ("Tearing Fix", MA_OPT_TEARING_FIX, currentConfig.EmuOpt, EOPT_WIZ_TEAR_FIX), \
mee_range_cust("Gamma correction", MA_OPT2_GAMMA, currentConfig.gamma, 1, 300, mgn_aopt_gamma), \
mee_onoff ("A_SN's gamma curve", MA_OPT2_A_SN_GAMMA, currentConfig.EmuOpt, EOPT_A_SN_GAMMA), \
mee_onoff ("Vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, EOPT_VSYNC),
-#define MENU_GP2X_OPTIONS_ADV \
+#define MENU_OPTIONS_ADV \
mee_onoff ("Use second CPU for sound", MA_OPT_ARM940_SOUND, PicoOpt, POPT_EXT_FM), \
mee_onoff ("RAM overclock", MA_OPT2_RAMTIMINGS, currentConfig.EmuOpt, EOPT_RAM_TIMINGS), \
mee_onoff ("MMU hack", MA_OPT2_SQUIDGEHACK, currentConfig.EmuOpt, EOPT_MMUHACK), \
mee_onoff ("SVP dynarec", MA_OPT2_SVP_DYNAREC, PicoOpt, POPT_EN_SVP_DRC), \
- mee_onoff ("Status line in main menu", MA_OPT2_STATUS_LINE, currentConfig.EmuOpt, EOPT_SHOW_RTC ),
+ mee_onoff ("Status line in main menu", MA_OPT2_STATUS_LINE, currentConfig.EmuOpt, EOPT_SHOW_RTC),
+
+
+static menu_entry e_menu_adv_options[];
+static menu_entry e_menu_gfx_options[];
+static menu_entry e_menu_options[];
+static menu_entry e_menu_keyconfig[];
+
+void gp2x_menu_init(void)
+{
+ static menu_entry *cpu_clk_ent;
+ int i;
+
+ i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
+ cpu_clk_ent = &e_menu_options[i];
+
+ /* disable by default.. */
+ me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);
+ me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);
+ me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);
+ me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);
+
+ switch (gp2x_dev_id) {
+ case GP2X_DEV_GP2X:
+ me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 1);
+ me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 1);
+ me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 1);
+ cpu_clk_ent->name = "GP2X CPU clocks";
+ break;
+ case GP2X_DEV_WIZ:
+ me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 1);
+ cpu_clk_ent->name = "Wiz/Caanoo CPU clock";
+ break;
+ case GP2X_DEV_CAANOO:
+ cpu_clk_ent->name = "Wiz/Caanoo CPU clock";
+ break;
+ default:
+ break;
+ }
-#else
+ if (gp2x_set_cpuclk == NULL)
+ cpu_clk_ent->name = "";
-#define MENU_GP2X_OPTIONS_GFX
-#define MENU_GP2X_OPTIONS_ADV
-#define mgn_opt_renderer NULL /* TODO */
-#define menu_main_plat_draw NULL
+ if (gp2x_dev_id != GP2X_DEV_GP2X)
+ men_scaling_opts[2] = NULL; /* leave only off and sw */
+
+ if (gp2x_dev_id != GP2X_DEV_CAANOO)
+ me_enable(e_menu_keyconfig, MA_CTRL_DEADZONE, 0);
+}
-#endif