adjustments for CPU core changes

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 881ea98..2275279 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -772,8 +772,9 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
        gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4\r
        gp2x_text_out8(tl_x, (y+=10), "PCM audio                  %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5\r
        gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer      %s", ra_buff); // 6\r
-       gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow)       %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 7\r
-       gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 8\r
+       gp2x_text_out8(tl_x, (y+=10), "SaveRAM cart               %s", (currentConfig.PicoOpt&0x8000)?"ON":"OFF"); // 7\r
+       gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow)       %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 8\r
+       gp2x_text_out8(tl_x, (y+=10), "Better sync (slow)         %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 9\r
        gp2x_text_out8(tl_x, (y+=10), "Done");\r
 \r
        // draw cursor\r
@@ -789,7 +790,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
 \r
 static void cd_menu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 9;\r
+       int menu_sel = 0, menu_sel_max = 10;\r
        unsigned long inp = 0;\r
        char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;\r
 \r
@@ -829,9 +830,10 @@ static void cd_menu_loop_options(void)
                                                if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M\r
                                        }\r
                                        break;\r
-                               case  7: currentConfig.PicoOpt^=0x1000; break;\r
-                               case  8: currentConfig.PicoOpt^=0x2000; break;\r
-                               case  9: return;\r
+                               case  7: currentConfig.PicoOpt^=0x8000; break;\r
+                               case  8: currentConfig.PicoOpt^=0x1000; break;\r
+                               case  9: currentConfig.PicoOpt^=0x2000; break;\r
+                               case 10: return;\r
                        }\r
                }\r
                if(inp & (GP2X_X|GP2X_A)) return;\r
@@ -956,7 +958,7 @@ static const char *region_name(unsigned int code)
 static void draw_menu_options(int menu_sel)\r
 {\r
        int tl_x = 25, tl_y = 32, y;\r
-       char monostereo[8], strframeskip[8], *strrend, *strscaling;\r
+       char monostereo[8], strframeskip[8], *strrend, *strscaling, *strssconfirm;\r
 \r
        strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");\r
        if (currentConfig.Frameskip < 0)\r
@@ -975,6 +977,12 @@ static void draw_menu_options(int menu_sel)
                case 2:  strscaling = "hw horiz. + vert."; break;\r
                case 3:  strscaling = "sw horizontal";     break;\r
        }\r
+       switch ((currentConfig.EmuOpt >> 9) & 5) {\r
+               default: strssconfirm = "OFF";    break;\r
+               case 1:  strssconfirm = "writes"; break;\r
+               case 4:  strssconfirm = "loads";  break;\r
+               case 5:  strssconfirm = "both";   break;\r
+       }\r
 \r
        y = tl_y;\r
        //memset(gp2x_screen, 0, 320*240);\r
@@ -990,9 +998,9 @@ static void draw_menu_options(int menu_sel)
        gp2x_text_out8(tl_x, (y+=10), "Sound Quality:     %5iHz %s",   currentConfig.PsndRate, monostereo);\r
        gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound  %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 8\r
        gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9\r
-       gp2x_text_out8(tl_x, (y+=10), "Genesis Region:      %s",       region_name(currentConfig.PicoRegion));\r
+       gp2x_text_out8(tl_x, (y+=10), "Region:              %s",       region_name(currentConfig.PicoRegion));\r
        gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates   %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11\r
-       gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites    %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 12\r
+       gp2x_text_out8(tl_x, (y+=10), "Confirm savestate          %s", strssconfirm); // 12\r
        gp2x_text_out8(tl_x, (y+=10), "Save slot                  %i", state_slot); // 13\r
        gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks            %iMhz", currentConfig.CPUclock);\r
        gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");\r
@@ -1083,7 +1091,6 @@ static int menu_loop_options(void)
                                case  8: currentConfig.PicoOpt^=0x200; break;\r
                                case  9: currentConfig.PicoOpt^=0x020; break;\r
                                case 11: currentConfig.EmuOpt ^=0x001; break;\r
-                               case 12: currentConfig.EmuOpt ^=0x200; break;\r
                                case 15: cd_menu_loop_options();\r
                                        if (engineState == PGS_ReloadRom)\r
                                                return 0; // test BIOS\r
@@ -1138,6 +1145,15 @@ static int menu_loop_options(void)
                                case 10:\r
                                        region_prevnext(inp & GP2X_RIGHT);\r
                                        break;\r
+                               case 12: {\r
+                                       int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);\r
+                                       n += (inp & GP2X_LEFT) ? -1 : 1;\r
+                                       if (n < 0) n = 0; else if (n > 3) n = 3;\r
+                                       n |= n << 1; n &= ~2;\r
+                                       currentConfig.EmuOpt &= ~0xa00;\r
+                                       currentConfig.EmuOpt |= n << 9;\r
+                                       break;\r
+                               }\r
                                case 13:\r
                                        if (inp & GP2X_RIGHT) {\r
                                                state_slot++; if (state_slot > 9) state_slot = 0;\r