newstyle key config, code940.bin -> pico940.bin

[libpicofe.git] / gp2x / emu.c

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 27e9d13..cb924c3 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -32,14 +32,6 @@
 #define OSD_FPS_X 260\r
 #endif\r
 \r
-// PicoPad[] format: SACB RLDU\r
-char *actionNames[] = {\r
-       "UP", "DOWN", "LEFT", "RIGHT", "B", "C", "A", "START",\r
-       0, 0, 0, 0, 0, 0, 0, 0, // Z, Y, X, MODE (enabled only when needed), ?, ?, ?, ?\r
-       0, 0, 0, 0, 0, 0, 0, "ENTER MENU", // player2_flag, ?, ?, ?, ?, ?, ?, menu\r
-       "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",\r
-       "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
-};\r
 \r
 int engineState;\r
 int select_exits = 0;\r
@@ -319,9 +311,9 @@ int emu_ReloadRom(void)
        }\r
 \r
        // load config for this ROM (do this before insert to get correct region)\r
-       ret = emu_ReadConfig(1);\r
+       ret = emu_ReadConfig(1, 1);\r
        if (!ret)\r
-               emu_ReadConfig(0);\r
+               emu_ReadConfig(0, 1);\r
 \r
        printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
        if(PicoCartInsert(rom_data, rom_size)) {\r
@@ -472,7 +464,7 @@ void scaling_update(void)
 }\r
 \r
 \r
-int emu_ReadConfig(int game)\r
+int emu_ReadConfig(int game, int no_defaults)\r
 {\r
        FILE *f;\r
        char cfg[512], extbuf[16];\r
@@ -480,33 +472,36 @@ int emu_ReadConfig(int game)
 \r
        if (!game)\r
        {\r
-               // set default config\r
-               memset(&currentConfig, 0, sizeof(currentConfig));\r
-               currentConfig.lastRomFile[0] = 0;\r
-               currentConfig.EmuOpt  = 0x1f | 0x600; // | confirm_save, cd_leds\r
-               currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940, cd_pcm, cd_cdda\r
-               currentConfig.PsndRate = 22050; // 44100;\r
-               currentConfig.PicoRegion = 0; // auto\r
-               currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
-               currentConfig.Frameskip = -1; // auto\r
-               currentConfig.CPUclock = 200;\r
-               currentConfig.volume = 50;\r
-               currentConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU\r
-               currentConfig.KeyBinds[ 4] = 1<<1;\r
-               currentConfig.KeyBinds[ 2] = 1<<2;\r
-               currentConfig.KeyBinds[ 6] = 1<<3;\r
-               currentConfig.KeyBinds[14] = 1<<4;\r
-               currentConfig.KeyBinds[13] = 1<<5;\r
-               currentConfig.KeyBinds[12] = 1<<6;\r
-               currentConfig.KeyBinds[ 8] = 1<<7;\r
-               currentConfig.KeyBinds[15] = 1<<26; // switch rend\r
-               currentConfig.KeyBinds[10] = 1<<27; // save state\r
-               currentConfig.KeyBinds[11] = 1<<28; // load state\r
-               currentConfig.KeyBinds[23] = 1<<29; // vol up\r
-               currentConfig.KeyBinds[22] = 1<<30; // vol down\r
-               currentConfig.gamma = 100;\r
-               currentConfig.PicoCDBuffers = 64;\r
-               currentConfig.scaling = 0;\r
+               if (!no_defaults)\r
+               {\r
+                       // set default config\r
+                       memset(&currentConfig, 0, sizeof(currentConfig));\r
+                       currentConfig.lastRomFile[0] = 0;\r
+                       currentConfig.EmuOpt  = 0x1f | 0x600; // | confirm_save, cd_leds\r
+                       currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940, cd_pcm, cd_cdda\r
+                       currentConfig.PsndRate = 22050; // 44100;\r
+                       currentConfig.PicoRegion = 0; // auto\r
+                       currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
+                       currentConfig.Frameskip = -1; // auto\r
+                       currentConfig.CPUclock = 200;\r
+                       currentConfig.volume = 50;\r
+                       currentConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU\r
+                       currentConfig.KeyBinds[ 4] = 1<<1;\r
+                       currentConfig.KeyBinds[ 2] = 1<<2;\r
+                       currentConfig.KeyBinds[ 6] = 1<<3;\r
+                       currentConfig.KeyBinds[14] = 1<<4;\r
+                       currentConfig.KeyBinds[13] = 1<<5;\r
+                       currentConfig.KeyBinds[12] = 1<<6;\r
+                       currentConfig.KeyBinds[ 8] = 1<<7;\r
+                       currentConfig.KeyBinds[15] = 1<<26; // switch rend\r
+                       currentConfig.KeyBinds[10] = 1<<27; // save state\r
+                       currentConfig.KeyBinds[11] = 1<<28; // load state\r
+                       currentConfig.KeyBinds[23] = 1<<29; // vol up\r
+                       currentConfig.KeyBinds[22] = 1<<30; // vol down\r
+                       currentConfig.gamma = 100;\r
+                       currentConfig.PicoCDBuffers = 64;\r
+                       currentConfig.scaling = 0;\r
+               }\r
                strncpy(cfg, PicoConfigFile, 511);\r
                if (config_slot != 0)\r
                {\r
@@ -539,10 +534,6 @@ int emu_ReadConfig(int game)
        PicoRegionOverride = currentConfig.PicoRegion;\r
        PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;\r
        PicoCDBuffers = currentConfig.PicoCDBuffers;\r
-       if (PicoOpt & 0x20) {\r
-               actionNames[ 8] = "Z"; actionNames[ 9] = "Y";\r
-               actionNames[10] = "X"; actionNames[11] = "MODE";\r
-       }\r
        scaling_update();\r
        // some sanity checks\r
        if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;\r