read-ahead turn off, cfg file, minor adjustments

[picodrive.git] / platform / gizmondo / menu.c

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index b1d3b14..7e753df 100644 (file)
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -687,9 +687,7 @@ static int count_bound_keys(int action, int pl_idx)
        return keys;\r
 }\r
 \r
-typedef struct { char *name; int mask; } bind_action_t;\r
-\r
-static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_idx, int sel)\r
+static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx, int sel)\r
 {\r
        int x, y, tl_y = 40, i;\r
 \r
@@ -723,7 +721,7 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i
        menu_draw_end();\r
 }\r
 \r
-static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_idx)\r
+static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx)\r
 {\r
        int sel = 0, menu_sel_max = opt_cnt, prev_select = 0, i;\r
        unsigned long inp = 0;\r
@@ -777,27 +775,10 @@ static void draw_kc_sel(int menu_sel)
 }\r
 \r
 \r
-// PicoPad[] format: MXYZ SACB RLDU\r
-static bind_action_t ctrl_actions[] =\r
-{\r
-       { "UP     ", 0x001 },\r
-       { "DOWN   ", 0x002 },\r
-       { "LEFT   ", 0x004 },\r
-       { "RIGHT  ", 0x008 },\r
-       { "A      ", 0x040 },\r
-       { "B      ", 0x010 },\r
-       { "C      ", 0x020 },\r
-       { "START  ", 0x080 },\r
-       { "MODE   ", 0x800 },\r
-       { "X      ", 0x400 },\r
-       { "Y      ", 0x200 },\r
-       { "Z      ", 0x100 },\r
-};\r
-\r
 // player2_flag, ?, ?, ?, ?, ?, ?, menu\r
 // "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",\r
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
-static bind_action_t emuctrl_actions[] =\r
+me_bind_action emuctrl_actions[] =\r
 {\r
        { "Load State     ", 1<<28 },\r
        { "Save State     ", 1<<27 },\r
@@ -806,6 +787,7 @@ static bind_action_t emuctrl_actions[] =
        { "Switch Renderer", 1<<26 },\r
        { "Volume Down    ", 1<<30 },\r
        { "Volume Up      ", 1<<29 },\r
+       { NULL,              0     }\r
 };\r
 \r
 static void kc_sel_loop(void)\r
@@ -822,10 +804,10 @@ static void kc_sel_loop(void)
                if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
                if (inp & BTN_PLAY) {\r
                        switch (menu_sel) {\r
-                               case 0: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 0); return;\r
-                               case 1: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 1); return;\r
+                               case 0: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 0); return;\r
+                               case 1: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 1); return;\r
                                case 2: key_config_loop(emuctrl_actions,\r
-                                               sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]), -1); return;\r
+                                               sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;\r
                                case 3: if (!rom_loaded) emu_WriteConfig(0); return;\r
                                default: return;\r
                        }\r
@@ -939,9 +921,9 @@ static void cd_menu_loop_options(void)
                            selected_id == MA_CDOPT_READAHEAD) {\r
                                if (inp & BTN_LEFT) {\r
                                        PicoCDBuffers >>= 1;\r
-                                       if (PicoCDBuffers < 64) PicoCDBuffers = 0;\r
+                                       if (PicoCDBuffers < 2) PicoCDBuffers = 0;\r
                                } else {\r
-                                       if (PicoCDBuffers < 64) PicoCDBuffers = 64;\r
+                                       if (PicoCDBuffers < 2) PicoCDBuffers = 2;\r
                                        else PicoCDBuffers <<= 1;\r
                                        if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M\r
                                }\r
@@ -1080,29 +1062,6 @@ menu_entry opt_entries[] =
 #define OPT_ENTRY_COUNT (sizeof(opt_entries) / sizeof(opt_entries[0]))\r
 \r
 \r
-static const char *region_name(unsigned int code)\r
-{\r
-       static const char *names[] = { "Auto", "      Japan NTSC", "      Japan PAL", "      USA", "      Europe" };\r
-       static const char *names_short[] = { "", " JP", " JP", " US", " EU" };\r
-       int u, i = 0;\r
-       if (code) {\r
-               code <<= 1;\r
-               while((code >>= 1)) i++;\r
-               if (i > 4) return "unknown";\r
-               return names[i];\r
-       } else {\r
-               static char name[24];\r
-               strcpy(name, "Auto:");\r
-               for (u = 0; u < 3; u++) {\r
-                       i = 0; code = ((PicoAutoRgnOrder >> u*4) & 0xf) << 1;\r
-                       while((code >>= 1)) i++;\r
-                       strcat(name, names_short[i]);\r
-               }\r
-               return name;\r
-       }\r
-}\r
-\r
-\r
 static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
 {\r
        char *str, str24[24];\r
@@ -1129,7 +1088,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
                        text_out16(x, y, "Sound Quality:     %5iHz %s", currentConfig.PsndRate, str);\r
                        break;\r
                case MA_OPT_REGION:\r
-                       text_out16(x, y, "Region:              %s", region_name(currentConfig.PicoRegion));\r
+                       text_out16(x, y, "Region:              %s", me_region_name(PicoRegionOverride, PicoAutoRgnOrder));\r
                        break;\r
                case MA_OPT_CONFIRM_STATES:\r
                        switch ((currentConfig.EmuOpt >> 9) & 5) {\r
@@ -1188,21 +1147,21 @@ static void region_prevnext(int right)
        static int rgn_orders[] = { 0x148, 0x184, 0x814, 0x418, 0x841, 0x481 };\r
        int i;\r
        if (right) {\r
-               if (!currentConfig.PicoRegion) {\r
+               if (!PicoRegionOverride) {\r
                        for (i = 0; i < 6; i++)\r
                                if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
                        if (i < 5) PicoAutoRgnOrder = rgn_orders[i+1];\r
-                       else currentConfig.PicoRegion=1;\r
+                       else PicoRegionOverride=1;\r
                }\r
-               else currentConfig.PicoRegion<<=1;\r
-               if (currentConfig.PicoRegion > 8) currentConfig.PicoRegion = 8;\r
+               else PicoRegionOverride<<=1;\r
+               if (PicoRegionOverride > 8) PicoRegionOverride = 8;\r
        } else {\r
-               if (!currentConfig.PicoRegion) {\r
+               if (!PicoRegionOverride) {\r
                        for (i = 0; i < 6; i++)\r
                                if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
                        if (i > 0) PicoAutoRgnOrder = rgn_orders[i-1];\r
                }\r
-               else currentConfig.PicoRegion>>=1;\r
+               else PicoRegionOverride>>=1;\r
        }\r
 }\r
 \r
@@ -1210,7 +1169,6 @@ static void menu_options_save(void)
 {\r
        PicoOpt = currentConfig.PicoOpt;\r
        PsndRate = currentConfig.PsndRate;\r
-       PicoRegionOverride = currentConfig.PicoRegion;\r
        if (PicoRegionOverride) {\r
                // force setting possibly changed..\r
                Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
@@ -1230,7 +1188,6 @@ static int menu_loop_options(void)
 \r
        currentConfig.PicoOpt = PicoOpt;\r
        currentConfig.PsndRate = PsndRate;\r
-       currentConfig.PicoRegion = PicoRegionOverride;\r
 \r
        me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_SAVECFG_GAME, rom_loaded);\r
        me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_LOADCFG, config_slot != config_slot_current);\r