gp2x->common menu migration finished, gp2x now only uses input fwk
authornotaz <notasas@gmail.com>
Thu, 14 May 2009 13:41:48 +0000 (13:41 +0000)
committernotaz <notasas@gmail.com>
Thu, 14 May 2009 13:41:48 +0000 (13:41 +0000)
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@692 be3aeb3a-fb24-0410-a615-afba39da0efa

24 files changed:
platform/common/common.h [deleted file]
platform/common/emu.c
platform/common/emu.h
platform/common/input.c
platform/common/input.h
platform/common/menu.c
platform/gizmondo/port_config.h
platform/gp2x/940ctl.c
platform/gp2x/emu.c
platform/gp2x/gp2x.c
platform/gp2x/gp2x.h
platform/gp2x/in_gp2x.c
platform/gp2x/main.c
platform/gp2x/menu.c [deleted file]
platform/gp2x/menu.h [deleted file]
platform/gp2x/port_config.h
platform/linux/940ctl_ym2612.c
platform/linux/gp2x.c
platform/linux/in_evdev.c
platform/linux/port_config.h
platform/pandora/emu.c
platform/pandora/port_config.h
platform/psp/port_config.h
platform/uiq3/port_config.h

diff --git a/platform/common/common.h b/platform/common/common.h
deleted file mode 100644 (file)
index c84583a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* random common definitions */
-
-#define PBTN_UP    (1 <<  0)
-#define PBTN_DOWN  (1 <<  1)
-#define PBTN_LEFT  (1 <<  2)
-#define PBTN_RIGHT (1 <<  3)
-
-#define PBTN_MOK   (1 <<  4)
-#define PBTN_MBACK (1 <<  5)
-#define PBTN_MA2   (1 <<  6)   /* menu action 2 */
-#define PBTN_MA3   (1 <<  7)
-
-#define PBTN_L     (1 <<  8)
-#define PBTN_R     (1 <<  9)
-
-#define PBTN_MENU  (1 << 10)
-
index a1c461a..542abf5 100644 (file)
@@ -15,7 +15,6 @@
 #include "fonts.h"\r
 #include "lprintf.h"\r
 #include "config.h"\r
-#include "common.h"\r
 #include "plat.h"\r
 \r
 #include <pico/pico_int.h>\r
@@ -631,13 +630,7 @@ int emu_ReadConfig(int game, int no_defaults)
        if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;\r
 #endif\r
        if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;\r
-#ifdef __GP2X__\r
-       // if volume keys are unbound, bind them to volume control\r
-       if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {\r
-               currentConfig.KeyBinds[23] = 1<<29; // vol up\r
-               currentConfig.KeyBinds[22] = 1<<30; // vol down\r
-       }\r
-#endif\r
+\r
        if (ret == 0) config_slot_current = config_slot;\r
        return (ret == 0);\r
 }\r
index b9bedff..412022d 100644 (file)
@@ -40,12 +40,8 @@ typedef struct _currentConfig_t {
        int s_PicoCDBuffers;
        int Frameskip;
        int CPUclock;
-       int KeyBinds[PLAT_MAX_KEYS];
        int volume;
        int gamma;
-#if PLAT_HAVE_JOY
-       int JoyBinds[4][32];
-#endif
        int scaling;  // gp2x: 0=center, 1=hscale, 2=hvscale, 3=hsoftscale; psp: bilinear filtering
        int rotation; // for UIQ
        float scale; // psp: screen scale
index 1416acb..920d11d 100644 (file)
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "common.h"
 #include "input.h"
 #include "plat.h"
 #include "../linux/in_evdev.h"
@@ -23,6 +22,8 @@ static in_drv_t in_drivers[IN_DRVID_COUNT];
 static in_dev_t in_devices[IN_MAX_DEVS];
 static int in_dev_count = 0;
 static int in_have_async_devs = 0;
+static int menu_key_state = 0;
+static int menu_last_used_dev = 0;
 
 #define DRV(id) in_drivers[(unsigned)(id) < IN_DRVID_COUNT ? (id) : 0]
 
@@ -259,8 +260,6 @@ int in_update(void)
        return result;
 }
 
-static int menu_key_state = 0;
-
 void in_set_blocking(int is_blocking)
 {
        int i, ret;
@@ -414,6 +413,7 @@ int in_menu_wait_any(int timeout_ms)
                        break;
                if (code < 0)
                        continue;
+               menu_last_used_dev = dev_id;
                if (keys_old != menu_key_state)
                        break;
        }
@@ -516,9 +516,15 @@ const char *in_get_key_name(int dev_id, int keycode)
        static char xname[16];
        const char *name;
 
+       if (dev_id < 0)         /* want last used dev? */
+               dev_id = menu_last_used_dev;
+
        if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
                return "Unkn0";
 
+       if (keycode < 0)        /* want name for menu key? */
+               keycode = DRV(in_devices[dev_id].drv_id).menu_translate(keycode);
+
        name = DRV(in_devices[dev_id].drv_id).get_key_name(keycode);
        if (name != NULL)
                return name;
index bcd94a5..14eb303 100644 (file)
@@ -1,5 +1,21 @@
 #define IN_MAX_DEVS 10
 
+/* unified menu keys */
+#define PBTN_UP    (1 <<  0)
+#define PBTN_DOWN  (1 <<  1)
+#define PBTN_LEFT  (1 <<  2)
+#define PBTN_RIGHT (1 <<  3)
+
+#define PBTN_MOK   (1 <<  4)
+#define PBTN_MBACK (1 <<  5)
+#define PBTN_MA2   (1 <<  6)   /* menu action 2 */
+#define PBTN_MA3   (1 <<  7)
+
+#define PBTN_L     (1 <<  8)
+#define PBTN_R     (1 <<  9)
+
+#define PBTN_MENU  (1 << 10)
+
 enum {
        IN_DRVID_UNKNOWN = 0,
        IN_DRVID_GP2X,
index 6f29f37..be1ed3a 100644 (file)
@@ -12,7 +12,6 @@
 #include "fonts.h"\r
 #include "readpng.h"\r
 #include "lprintf.h"\r
-#include "common.h"\r
 #include "input.h"\r
 #include "emu.h"\r
 #include "plat.h"\r
@@ -641,6 +640,44 @@ void menu_romload_end(void)
        plat_video_menu_end();\r
 }\r
 \r
+// -------------- del confirm ---------------\r
+\r
+static void do_delete(const char *fpath, const char *fname)\r
+{\r
+       int len, mid, inp;\r
+       const char *nm;\r
+       char tmp[64];\r
+\r
+       plat_video_menu_begin();\r
+\r
+       if (!rom_loaded)\r
+               menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
+\r
+       len = strlen(fname);\r
+       if (len > g_screen_width/6)\r
+               len = g_screen_width/6;\r
+\r
+       mid = g_screen_width / 2;\r
+       text_out16(mid - me_mfont_w * 15 / 2,  8 * me_mfont_h, "About to delete");\r
+       smalltext_out16(mid - len * me_sfont_w / 2, 9 * me_mfont_h + 5, fname, 0xbdff);\r
+       text_out16(mid - me_mfont_w * 13 / 2, 11 * me_mfont_h, "Are you sure?");\r
+\r
+       nm = in_get_key_name(-1, -PBTN_MA3);\r
+       snprintf(tmp, sizeof(tmp), "(%s - confirm, ", nm);\r
+       len = strlen(tmp);\r
+       nm = in_get_key_name(-1, -PBTN_MBACK);\r
+       snprintf(tmp + len, sizeof(tmp) - len, "%s - cancel)", nm);\r
+       len = strlen(tmp);\r
+\r
+       text_out16(mid - me_mfont_w * len / 2, 12 * me_mfont_h, tmp);\r
+       plat_video_menu_end();\r
+\r
+       while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MA2));\r
+       inp = in_menu_wait(PBTN_MA3|PBTN_MBACK, 100);\r
+       if (inp & PBTN_MA3)\r
+               remove(fpath);\r
+}\r
+\r
 // -------------- ROM selector --------------\r
 \r
 // rrrr rggg gggb bbbb\r
@@ -788,7 +825,7 @@ rescan:
                                        ret = rom_fname_reload;\r
                                        break;\r
                                }\r
-//                             do_delete(rom_fname_reload, namelist[sel+1]->d_name); // TODO\r
+                               do_delete(rom_fname_reload, namelist[sel+1]->d_name);\r
                                if (n > 0) {\r
                                        while (n--) free(namelist[n]);\r
                                        free(namelist);\r
index a9c8276..0f89e50 100644 (file)
@@ -29,8 +29,6 @@
 #define dprintf(x...)\r
 \r
 // platform\r
-#define PLAT_MAX_KEYS 32\r
-#define PLAT_HAVE_JOY 0\r
 #define PATH_SEP      "/" // because of cegcc\r
 #define PATH_SEP_C    '/'\r
 #define MENU_X2       0\r
index 77083c9..7d7a400 100644 (file)
@@ -13,7 +13,6 @@
 #include "code940/940shared.h"\r
 #include "gp2x.h"\r
 #include "emu.h"\r
-#include "menu.h"\r
 #include "../common/mp3.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/menu.h"\r
index 003f173..69a464e 100644 (file)
@@ -16,7 +16,7 @@
 \r
 #include "emu.h"\r
 #include "gp2x.h"\r
-#include "menu.h"\r
+#include "../common/menu.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/fonts.h"\r
 #include "../common/emu.h"\r
@@ -145,19 +145,6 @@ void emu_prepareDefaultConfig(void)
        defaultConfig.Frameskip = -1; // auto\r
        defaultConfig.CPUclock = 200;\r
        defaultConfig.volume = 50;\r
-       defaultConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU\r
-       defaultConfig.KeyBinds[ 4] = 1<<1;\r
-       defaultConfig.KeyBinds[ 2] = 1<<2;\r
-       defaultConfig.KeyBinds[ 6] = 1<<3;\r
-       defaultConfig.KeyBinds[14] = 1<<4;\r
-       defaultConfig.KeyBinds[13] = 1<<5;\r
-       defaultConfig.KeyBinds[12] = 1<<6;\r
-       defaultConfig.KeyBinds[ 8] = 1<<7;\r
-       defaultConfig.KeyBinds[15] = 1<<26; // switch rend\r
-       defaultConfig.KeyBinds[10] = 1<<27; // save state\r
-       defaultConfig.KeyBinds[11] = 1<<28; // load state\r
-       defaultConfig.KeyBinds[23] = 1<<29; // vol up\r
-       defaultConfig.KeyBinds[22] = 1<<30; // vol down\r
        defaultConfig.gamma = 100;\r
        defaultConfig.scaling = 0;\r
        defaultConfig.turbo_rate = 15;\r
@@ -415,7 +402,7 @@ static void emu_msg_tray_open(void)
        gettimeofday(&noticeMsgTime, 0);\r
 }\r
 \r
-static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)\r
+static void RunEventsPico(unsigned int events)\r
 {\r
        int ret, px, py, lim_x;\r
        static int pdown_frames = 0;\r
@@ -449,11 +436,11 @@ static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
                //      PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;\r
        }\r
 \r
+       if (PicoPad[0] & 1) pico_pen_y--;\r
+       if (PicoPad[0] & 2) pico_pen_y++;\r
+       if (PicoPad[0] & 4) pico_pen_x--;\r
+       if (PicoPad[0] & 8) pico_pen_x++;\r
        PicoPad[0] &= ~0x0f; // release UDLR\r
-       if (gp2x_keys & GP2X_UP)    pico_pen_y--;\r
-       if (gp2x_keys & GP2X_DOWN)  pico_pen_y++;\r
-       if (gp2x_keys & GP2X_LEFT)  pico_pen_x--;\r
-       if (gp2x_keys & GP2X_RIGHT) pico_pen_x++;\r
 \r
        lim_x = (Pico.video.reg[12]&1) ? 319 : 255;\r
        if (pico_pen_y < 8) pico_pen_y = 8;\r
@@ -507,15 +494,31 @@ static void RunEvents(unsigned int which)
        {\r
                int do_it = 1;\r
                if ( emu_checkSaveFile(state_slot) &&\r
-                               (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) ||   // load\r
-                                (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save\r
-                       unsigned long keys;\r
-                       blit("", (which & 0x1000) ? "LOAD STATE? (Y=yes, X=no)" : "OVERWRITE SAVE? (Y=yes, X=no)");\r
-                       while ( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )\r
-                               usleep(50*1024);\r
-                       if (keys & GP2X_X) do_it = 0;\r
-                       while ( gp2x_joystick_read(1) & (GP2X_X|GP2X_Y) ) // wait for release\r
-                               usleep(50*1024);\r
+                               (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load\r
+                                (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save\r
+               {\r
+                       const char *nm;\r
+                       char tmp[64];\r
+                       int keys, len;\r
+\r
+                       strcpy(tmp, (which & 0x1000) ? "LOAD STATE? " : "OVERWRITE SAVE? ");\r
+                       len = strlen(tmp);\r
+                       nm = in_get_key_name(-1, -PBTN_MA3);\r
+                       snprintf(tmp + len, sizeof(tmp) - len, "(%s=yes, ", nm);\r
+                       len = strlen(tmp);\r
+                       nm = in_get_key_name(-1, -PBTN_MBACK);\r
+                       snprintf(tmp + len, sizeof(tmp) - len, "%s=no)", nm);\r
+\r
+                       blit("", tmp);\r
+\r
+                       in_set_blocking(1);\r
+                       while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK));   // wait for release\r
+                       while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) ); // .. press\r
+                       if (keys & PBTN_MBACK)\r
+                               do_it = 0;\r
+                       while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK));   // .. release\r
+                       in_set_blocking(0);\r
+\r
                        clearArea(0);\r
                }\r
                if (do_it) {\r
@@ -544,7 +547,7 @@ static void RunEvents(unsigned int which)
                        strcpy(noticeMsg, " 8bit accurate renderer");\r
                }\r
 \r
-               gettimeofday(&noticeMsgTime, 0);\r
+               emu_noticeMsgUpdated();\r
        }\r
        if (which & 0x0300)\r
        {\r
@@ -556,7 +559,7 @@ static void RunEvents(unsigned int which)
                        if(state_slot > 9) state_slot = 0;\r
                }\r
                sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");\r
-               gettimeofday(&noticeMsgTime, 0);\r
+               emu_noticeMsgUpdated();\r
        }\r
        if (which & 0x0080) {\r
                engineState = PGS_Menu;\r
@@ -565,16 +568,9 @@ static void RunEvents(unsigned int which)
 \r
 static void updateKeys(void)\r
 {\r
-       unsigned int keys, keys2, allActions[2] = { 0, 0 }, events;\r
+       unsigned int allActions[2] = { 0, 0 }, events;\r
        static unsigned int prevEvents = 0;\r
 \r
-       keys = gp2x_joystick_read(0);\r
-       if (keys & GP2X_SELECT)\r
-               engineState = select_exits ? PGS_Quit : PGS_Menu;\r
-\r
-       keys &= CONFIGURABLE_KEYS;\r
-       keys2 = keys;\r
-\r
        /* FIXME: player2 */\r
        allActions[0] = in_update();\r
 \r
@@ -599,7 +595,7 @@ static void updateKeys(void)
        events &= ~prevEvents;\r
 \r
        if (PicoAHW == PAHW_PICO)\r
-               RunEventsPico(events, keys);\r
+               RunEventsPico(events);\r
        if (events) RunEvents(events);\r
        if (movie_data) emu_updateMovie();\r
 \r
index e433524..f350352 100644 (file)
@@ -195,18 +195,6 @@ void gp2x_pd_clone_buffer2(void)
 }\r
 \r
 \r
-unsigned long gp2x_joystick_read(int unused)\r
-{\r
-       unsigned long value=(gp2x_memregs[0x1198>>1] & 0x00FF); // GPIO M\r
-       if(value==0xFD) value=0xFA;\r
-       if(value==0xF7) value=0xEB;\r
-       if(value==0xDF) value=0xAF;\r
-       if(value==0x7F) value=0xBE;\r
-       value = ~((gp2x_memregs[0x1184>>1] & 0xFF00) | value | (gp2x_memregs[0x1186>>1] << 16)); // C D\r
-\r
-       return value;\r
-}\r
-\r
 typedef struct ucb1x00_ts_event\r
 {\r
        unsigned short pressure;\r
index 4636e93..5bebe74 100644 (file)
@@ -21,7 +21,6 @@ void gp2x_memset_all_buffers(int offset, int byte, int len);
 void gp2x_pd_clone_buffer2(void);\r
 \r
 /* input */\r
-unsigned long gp2x_joystick_read(int allow_usb_joy);\r
 int gp2x_touchpad_read(int *x, int *y);\r
 \r
 /* 940 core */\r
@@ -32,9 +31,4 @@ void Reset940(int yes, int bank);
 extern int memdev;\r
 \r
 \r
-enum  { GP2X_UP=0x1,       GP2X_LEFT=0x4,       GP2X_DOWN=0x10,  GP2X_RIGHT=0x40,\r
-        GP2X_START=1<<8,   GP2X_SELECT=1<<9,    GP2X_L=1<<10,    GP2X_R=1<<11,\r
-        GP2X_A=1<<12,      GP2X_B=1<<13,        GP2X_X=1<<14,    GP2X_Y=1<<15,\r
-        GP2X_VOL_UP=1<<23, GP2X_VOL_DOWN=1<<22, GP2X_PUSH=1<<27 };\r
-\r
 #endif\r
index 81681ff..213b3d4 100644 (file)
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../common/common.h"
 #include "../common/input.h"
 #include "in_gp2x.h"
 
@@ -102,20 +101,45 @@ int in_gp2x_update_keycode(void *data, int *is_down)
        return i;
 }
 
+static const struct {
+       short key;
+       short pbtn;
+} key_pbtn_map[] =
+{
+       { BTN_UP,       PBTN_UP },
+       { BTN_DOWN,     PBTN_DOWN },
+       { BTN_LEFT,     PBTN_LEFT },
+       { BTN_RIGHT,    PBTN_RIGHT },
+       { BTN_B,        PBTN_MOK },
+       { BTN_X,        PBTN_MBACK },
+       { BTN_A,        PBTN_MA2 },
+       { BTN_Y,        PBTN_MA3 },
+       { BTN_L,        PBTN_L },
+       { BTN_R,        PBTN_R },
+       { BTN_SELECT,   PBTN_MENU },
+};
+
+#define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
+
 static int in_gp2x_menu_translate(int keycode)
 {
-       switch (keycode) {
-               case BTN_UP:    return PBTN_UP;
-               case BTN_LEFT:  return PBTN_LEFT;
-               case BTN_DOWN:  return PBTN_DOWN;
-               case BTN_RIGHT: return PBTN_RIGHT;
-               case BTN_B:     return PBTN_MOK;
-               case BTN_X:     return PBTN_MBACK;
-               case BTN_SELECT:return PBTN_MENU;
-               case BTN_L:     return PBTN_L;
-               case BTN_R:     return PBTN_R;
-               default:        return 0;
+       int i;
+       if (keycode < 0)
+       {
+               /* menu -> kc */
+               keycode = -keycode;
+               for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
+                       if (key_pbtn_map[i].pbtn == keycode)
+                               return key_pbtn_map[i].key;
        }
+       else
+       {
+               for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
+                       if (key_pbtn_map[i].key == keycode)
+                               return key_pbtn_map[i].pbtn;
+       }
+
+       return 0;
 }
 
 static int in_gp2x_get_key_code(const char *key_name)
@@ -156,6 +180,12 @@ static const struct {
        { BTN_B,        5 },    /* C */
        { BTN_A,        6 },    /* A */
        { BTN_START,    7 },
+       { BTN_SELECT,   23 },   /* menu */
+       { BTN_Y,        26 },   /* switch rend */
+       { BTN_L,        27 },   /* save state */
+       { BTN_R,        28 },   /* load state */
+       { BTN_VOL_UP,   29 },   /* vol up */
+       { BTN_VOL_DOWN, 30 },   /* vol down */
 };
 
 #define DEF_BIND_COUNT (sizeof(in_gp2x_def_binds) / sizeof(in_gp2x_def_binds[0]))
@@ -171,15 +201,29 @@ static void in_gp2x_get_def_binds(int *binds)
 /* remove binds of missing keys, count remaining ones */
 static int in_gp2x_clean_binds(void *drv_data, int *binds)
 {
-       int i, count = 0;
+       int i, count = 0, have_vol = 0, have_menu = 0;
 
        for (i = 0; i < IN_GP2X_NBUTTONS; i++) {
                if (in_gp2x_keys[i] == NULL)
                        binds[i] = binds[i + IN_GP2X_NBUTTONS] = 0;
-               if (binds[i])
+               if (binds[i]) {
                        count++;
+                       if (binds[i] & ((1 << 29)|(1 << 30)))
+                               have_vol = 1;
+                       if (binds[i] & (1 << 23))
+                               have_menu = 1;
+               }
        }
 
+       /* autobind some important keys, if they are unbound */
+       if (!have_vol && binds[BTN_VOL_UP] == 0 && binds[BTN_VOL_DOWN] == 0) {
+               binds[BTN_VOL_UP]   = 1 << 29;
+               binds[BTN_VOL_DOWN] = 1 << 30;
+       }
+
+       if (!have_menu && binds[BTN_SELECT] == 0)
+               binds[BTN_SELECT] = 1 << 23;
+
        in_combos_find(binds, BTN_PUSH, &in_gp2x_combo_keys, &in_gp2x_combo_acts);
 
        return count;
index 1aad15c..0ea8e82 100644 (file)
@@ -11,7 +11,6 @@
 #include <linux/limits.h>\r
 \r
 #include "gp2x.h"\r
-#include "menu.h"\r
 #include "../common/menu.h"\r
 #include "../common/emu.h"\r
 #include "../common/config.h"\r
diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
deleted file mode 100644 (file)
index 5221543..0000000
+++ /dev/null
@@ -1,1608 +0,0 @@
-// (c) Copyright 2006,2007 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
-#include <stdio.h>\r
-#include <string.h>\r
-#include <stdlib.h>\r
-#include <stdarg.h>\r
-#include <unistd.h>\r
-#include <dirent.h>\r
-\r
-#include "gp2x.h"\r
-#include "emu.h"\r
-#include "menu.h"\r
-#include "../linux/usbjoy.h"\r
-#include "../common/emu.h"\r
-#include "../common/menu.h"\r
-#include "../common/arm_utils.h"\r
-#include "../common/readpng.h"\r
-#include "../common/common.h"\r
-#include "../common/input.h"\r
-#include "version.h"\r
-\r
-#include <pico/pico_int.h>\r
-#include <pico/patch.h>\r
-#include <zlib/zlib.h>\r
-\r
-#ifndef _DIRENT_HAVE_D_TYPE\r
-#error "need d_type for file browser"\r
-#endif\r
-\r
-extern int  mmuhack_status;\r
-\r
-void menu_darken_bg(void *dst, int pixels, int darker);\r
-static void menu_prepare_bg(int use_game_bg);\r
-\r
-void menu_flip(void)\r
-{\r
-       gp2x_video_flush_cache();\r
-       gp2x_video_flip2();\r
-}\r
-\r
-\r
-// --------- loading ROM screen ----------\r
-\r
-static int cdload_called = 0;\r
-\r
-static void load_progress_cb(int percent)\r
-{\r
-       int ln, len = percent * 320 / 100;\r
-       unsigned short *dst = (unsigned short *)gp2x_screen + 320*20;\r
-\r
-       if (len > 320) len = 320;\r
-       for (ln = 8; ln > 0; ln--, dst += 320)\r
-               memset(dst, 0xff, len*2);\r
-       menu_flip();\r
-}\r
-\r
-static void cdload_progress_cb(int percent)\r
-{\r
-       int ln, len = percent * 320 / 100;\r
-       unsigned short *dst = (unsigned short *)gp2x_screen + 320*20;\r
-\r
-       memset(dst, 0xff, 320*2*8);\r
-\r
-       smalltext_out16(1, 3*10, "Processing CD image / MP3s", 0xffff);\r
-       smalltext_out16_lim(1, 4*10, romFileName, 0xffff, 80);\r
-       dst += 320*30;\r
-\r
-       if (len > 320) len = 320;\r
-       for (ln = 8; ln > 0; ln--, dst += 320)\r
-               memset(dst, 0xff, len*2);\r
-       menu_flip();\r
-       cdload_called = 1;\r
-}\r
-\r
-void menu_romload_prepare(const char *rom_name)\r
-{\r
-       const char *p = rom_name + strlen(rom_name);\r
-       while (p > rom_name && *p != '/') p--;\r
-\r
-       if (rom_loaded) gp2x_pd_clone_buffer2();\r
-       else memset(gp2x_screen, 0, 320*240*2);\r
-\r
-       smalltext_out16(1, 1, "Loading", 0xffff);\r
-       smalltext_out16_lim(1, 10, p, 0xffff, 53);\r
-       gp2x_memcpy_buffers(3, gp2x_screen, 0, 320*240*2);\r
-       menu_flip();\r
-       PicoCartLoadProgressCB = load_progress_cb;\r
-       PicoCDLoadProgressCB = cdload_progress_cb;\r
-       cdload_called = 0;\r
-}\r
-\r
-void menu_romload_end(void)\r
-{\r
-       PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;\r
-       smalltext_out16(1, cdload_called ? 60 : 30, "Starting emulation...", 0xffff);\r
-       menu_flip();\r
-}\r
-\r
-// -------------- ROM selector --------------\r
-\r
-// rrrr rggg gggb bbbb\r
-static unsigned short file2color(const char *fname)\r
-{\r
-       const char *ext = fname + strlen(fname) - 3;\r
-       static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" };\r
-       static const char *other_exts[] = { "gmv", "pat" };\r
-       int i;\r
-\r
-       if (ext < fname) ext = fname;\r
-       for (i = 0; i < sizeof(rom_exts)/sizeof(rom_exts[0]); i++)\r
-               if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff;\r
-       for (i = 0; i < sizeof(other_exts)/sizeof(other_exts[0]); i++)\r
-               if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5;\r
-       return 0xffff;\r
-}\r
-\r
-static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
-{\r
-       int start, i, pos;\r
-\r
-       start = 12 - sel;\r
-       n--; // exclude current dir (".")\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       if (!rom_loaded) {\r
-               menu_darken_bg(gp2x_screen, 320*240, 0);\r
-       }\r
-\r
-       menu_darken_bg((char *)gp2x_screen + 320*120*2, 320*8, 0);\r
-\r
-       if(start - 2 >= 0)\r
-               smalltext_out16_lim(14, (start - 2)*10, curdir, 0xffff, 53-2);\r
-       for (i = 0; i < n; i++) {\r
-               pos = start + i;\r
-               if (pos < 0)  continue;\r
-               if (pos > 23) break;\r
-               if (namelist[i+1]->d_type == DT_DIR) {\r
-                       smalltext_out16_lim(14,   pos*10, "/", 0xfff6, 1);\r
-                       smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xfff6, 53-3);\r
-               } else {\r
-                       unsigned short color = file2color(namelist[i+1]->d_name);\r
-                       smalltext_out16_lim(14,   pos*10, namelist[i+1]->d_name, color, 53-2);\r
-               }\r
-       }\r
-       text_out16(5, 120, ">");\r
-       menu_flip();\r
-}\r
-\r
-static int scandir_cmp(const void *p1, const void *p2)\r
-{\r
-       struct dirent **d1 = (struct dirent **)p1, **d2 = (struct dirent **)p2;\r
-       if ((*d1)->d_type == (*d2)->d_type) return alphasort(d1, d2);\r
-       if ((*d1)->d_type == DT_DIR) return -1; // put before\r
-       if ((*d2)->d_type == DT_DIR) return  1;\r
-       return alphasort(d1, d2);\r
-}\r
-\r
-static char *filter_exts[] = {\r
-       ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
-       ".jpg", ".gpe"\r
-};\r
-\r
-static int scandir_filter(const struct dirent *ent)\r
-{\r
-       const char *p;\r
-       int i;\r
-\r
-       if (ent == NULL || ent->d_name == NULL) return 0;\r
-       if (strlen(ent->d_name) < 5) return 1;\r
-\r
-       p = ent->d_name + strlen(ent->d_name) - 4;\r
-\r
-       for (i = 0; i < sizeof(filter_exts)/sizeof(filter_exts[0]); i++)\r
-       {\r
-               if (strcmp(p, filter_exts[i]) == 0) return 0;\r
-       }\r
-\r
-       return 1;\r
-}\r
-\r
-static void do_delete(const char *fpath, const char *fname)\r
-{\r
-       int len, inp;\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       if (!rom_loaded)\r
-               menu_darken_bg(gp2x_screen, 320*240, 0);\r
-\r
-       len = strlen(fname);\r
-       if (len > 320/6) len = 320/6;\r
-\r
-       text_out16(320/2 - 15*8/2,  80, "About to delete");\r
-       smalltext_out16_lim(320/2 - len*6/2, 95, fname, 0xbdff, len);\r
-       text_out16(320/2 - 13*8/2, 110, "Are you sure?");\r
-       text_out16(320/2 - 25*8/2, 120, "(Y - confirm, X - cancel)");\r
-       menu_flip();\r
-\r
-\r
-       while (in_menu_wait_any(50) & (PBTN_WEST|PBTN_MENU));\r
-       inp = in_menu_wait(GP2X_Y|PBTN_MBACK);  /* FIXME */\r
-       if (inp & GP2X_Y)\r
-               remove(fpath);\r
-}\r
-\r
-static char *romsel_loop(char *curr_path)\r
-{\r
-       struct dirent **namelist;\r
-       DIR *dir;\r
-       int n, sel = 0;\r
-       unsigned long inp = 0;\r
-       char *ret = NULL, *fname = NULL;\r
-\r
-rescan:\r
-       // is this a dir or a full path?\r
-       if ((dir = opendir(curr_path))) {\r
-               closedir(dir);\r
-       } else {\r
-               char *p;\r
-               for (p = curr_path + strlen(curr_path) - 1; p > curr_path && *p != '/'; p--);\r
-               *p = 0;\r
-               fname = p+1;\r
-       }\r
-\r
-       n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);\r
-       if (n < 0) {\r
-               // try root\r
-               n = scandir("/", &namelist, scandir_filter, scandir_cmp);\r
-               if (n < 0) {\r
-                       // oops, we failed\r
-                       printf("dir: %s\n", curr_path);\r
-                       perror("scandir");\r
-                       return NULL;\r
-               }\r
-       }\r
-\r
-       // try to find sel\r
-       if (fname != NULL) {\r
-               int i;\r
-               for (i = 1; i < n; i++) {\r
-                       if (strcmp(namelist[i]->d_name, fname) == 0) {\r
-                               sel = i - 1;\r
-                               break;\r
-                       }\r
-               }\r
-       }\r
-\r
-       for (;;)\r
-       {\r
-               draw_dirlist(curr_path, namelist, n, sel);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R|PBTN_WEST|PBTN_MOK|PBTN_MBACK|PBTN_MENU);\r
-               if(inp & PBTN_UP  )  { sel--;   if (sel < 0)   sel = n-2; }\r
-               if(inp & PBTN_DOWN)  { sel++;   if (sel > n-2) sel = 0; }\r
-               if(inp & PBTN_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }\r
-               if(inp & PBTN_L)     { sel-=24; if (sel < 0)   sel = 0; }\r
-               if(inp & PBTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\r
-               if(inp & PBTN_R)     { sel+=24; if (sel > n-2) sel = n-2; }\r
-               if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_WEST)) == (PBTN_MENU|PBTN_WEST)) // enter dir/select || delete\r
-               {\r
-                       again:\r
-                       if (namelist[sel+1]->d_type == DT_REG)\r
-                       {\r
-                               strcpy(romFileName, curr_path);\r
-                               strcat(romFileName, "/");\r
-                               strcat(romFileName, namelist[sel+1]->d_name);\r
-                               if (inp & PBTN_MOK) { // return sel\r
-                                       ret = romFileName;\r
-                                       break;\r
-                               }\r
-                               do_delete(romFileName, namelist[sel+1]->d_name);\r
-                               if (n > 0) {\r
-                                       while (n--) free(namelist[n]);\r
-                                       free(namelist);\r
-                               }\r
-                               goto rescan;\r
-                       }\r
-                       else if (namelist[sel+1]->d_type == DT_DIR)\r
-                       {\r
-                               int newlen;\r
-                               char *p, *newdir;\r
-                               if (!(inp & PBTN_MOK)) continue;\r
-                               newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;\r
-                               newdir = malloc(newlen);\r
-                               if (strcmp(namelist[sel+1]->d_name, "..") == 0) {\r
-                                       char *start = curr_path;\r
-                                       p = start + strlen(start) - 1;\r
-                                       while (*p == '/' && p > start) p--;\r
-                                       while (*p != '/' && p > start) p--;\r
-                                       if (p <= start) strcpy(newdir, "/");\r
-                                       else { strncpy(newdir, start, p-start); newdir[p-start] = 0; }\r
-                               } else {\r
-                                       strcpy(newdir, curr_path);\r
-                                       p = newdir + strlen(newdir) - 1;\r
-                                       while (*p == '/' && p >= newdir) *p-- = 0;\r
-                                       strcat(newdir, "/");\r
-                                       strcat(newdir, namelist[sel+1]->d_name);\r
-                               }\r
-                               ret = romsel_loop(newdir);\r
-                               free(newdir);\r
-                               break;\r
-                       }\r
-                       else\r
-                       {\r
-                               // unknown file type, happens on NTFS mounts. Try to guess.\r
-                               FILE *tstf; int tmp;\r
-                               strcpy(romFileName, curr_path);\r
-                               strcat(romFileName, "/");\r
-                               strcat(romFileName, namelist[sel+1]->d_name);\r
-                               tstf = fopen(romFileName, "rb");\r
-                               if (tstf != NULL)\r
-                               {\r
-                                       if (fread(&tmp, 1, 1, tstf) > 0 || ferror(tstf) == 0)\r
-                                               namelist[sel+1]->d_type = DT_REG;\r
-                                       else    namelist[sel+1]->d_type = DT_DIR;\r
-                                       fclose(tstf);\r
-                                       goto again;\r
-                               }\r
-                       }\r
-               }\r
-               if(inp & PBTN_MBACK) break; // cancel\r
-       }\r
-\r
-       if (n > 0) {\r
-               while (n--) free(namelist[n]);\r
-               free(namelist);\r
-       }\r
-\r
-       return ret;\r
-}\r
-\r
-// ------------ patch/gg menu ------------\r
-\r
-static void draw_patchlist(int sel)\r
-{\r
-       int start, i, pos, active;\r
-\r
-       start = 12 - sel;\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       for (i = 0; i < PicoPatchCount; i++) {\r
-               pos = start + i;\r
-               if (pos < 0)  continue;\r
-               if (pos > 23) break;\r
-               active = PicoPatches[i].active;\r
-               smalltext_out16_lim(14,     pos*10, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff, 3);\r
-               smalltext_out16_lim(14+6*4, pos*10, PicoPatches[i].name, active ? 0xfff6 : 0xffff, 53-6);\r
-       }\r
-       pos = start + i;\r
-       if (pos < 24) smalltext_out16_lim(14, pos*10, "done", 0xffff, 4);\r
-\r
-       text_out16(5, 120, ">");\r
-       menu_flip();\r
-}\r
-\r
-\r
-static void patches_menu_loop(void)\r
-{\r
-       int menu_sel = 0;\r
-       unsigned long inp = 0;\r
-\r
-       for(;;)\r
-       {\r
-               draw_patchlist(menu_sel);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R|PBTN_MOK|PBTN_MBACK);\r
-               if(inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }\r
-               if(inp & PBTN_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }\r
-               if(inp &(PBTN_LEFT|PBTN_L))  { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }\r
-               if(inp &(PBTN_RIGHT|PBTN_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }\r
-               if(inp & PBTN_MOK) { // action\r
-                       if (menu_sel < PicoPatchCount)\r
-                               PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;\r
-                       else    return;\r
-               }\r
-               if(inp & PBTN_MBACK) return;\r
-       }\r
-\r
-}\r
-\r
-// ------------ savestate loader ------------\r
-\r
-static int state_slot_flags = 0;\r
-\r
-static void state_check_slots(void)\r
-{\r
-       int slot;\r
-\r
-       state_slot_flags = 0;\r
-\r
-       for (slot = 0; slot < 10; slot++)\r
-       {\r
-               if (emu_checkSaveFile(slot))\r
-               {\r
-                       state_slot_flags |= 1 << slot;\r
-               }\r
-       }\r
-}\r
-\r
-static void draw_savestate_bg(int slot)\r
-{\r
-       struct PicoVideo tmp_pv;\r
-       unsigned short tmp_cram[0x40];\r
-       unsigned short tmp_vsram[0x40];\r
-       void *tmp_vram, *file;\r
-       char *fname;\r
-\r
-       fname = emu_GetSaveFName(1, 0, slot);\r
-       if (!fname) return;\r
-\r
-       tmp_vram = malloc(sizeof(Pico.vram));\r
-       if (tmp_vram == NULL) return;\r
-\r
-       memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram));\r
-       memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram));\r
-       memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));\r
-       memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));\r
-\r
-       if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {\r
-               file = gzopen(fname, "rb");\r
-               emu_setSaveStateCbs(1);\r
-       } else {\r
-               file = fopen(fname, "rb");\r
-               emu_setSaveStateCbs(0);\r
-       }\r
-\r
-       if (file) {\r
-               if (PicoAHW & PAHW_MCD) {\r
-                       PicoCdLoadStateGfx(file);\r
-               } else {\r
-                       areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file\r
-                       areaRead(Pico.vram, 1, sizeof(Pico.vram), file);\r
-                       areaSeek(file, 0x2000, SEEK_CUR);\r
-                       areaRead(Pico.cram, 1, sizeof(Pico.cram), file);\r
-                       areaRead(Pico.vsram, 1, sizeof(Pico.vsram), file);\r
-                       areaSeek(file, 0x221a0, SEEK_SET);\r
-                       areaRead(&Pico.video, 1, sizeof(Pico.video), file);\r
-               }\r
-               areaClose(file);\r
-       }\r
-\r
-       emu_forcedFrame(POPT_EN_SOFTSCALE);\r
-       menu_prepare_bg(1);\r
-\r
-       memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
-       memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));\r
-       memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram));\r
-       memcpy(&Pico.video, &tmp_pv,  sizeof(Pico.video));\r
-       free(tmp_vram);\r
-}\r
-\r
-static void draw_savestate_menu(int menu_sel, int is_loading)\r
-{\r
-       int tl_x = 25, tl_y = 60, y, i;\r
-\r
-       if (state_slot_flags & (1 << menu_sel))\r
-               draw_savestate_bg(menu_sel);\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       text_out16(tl_x, 30, is_loading ? "Load state" : "Save state");\r
-\r
-       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 108);\r
-\r
-       /* draw all 10 slots */\r
-       y = tl_y;\r
-       for (i = 0; i < 10; i++, y+=10)\r
-       {\r
-               text_out16(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");\r
-       }\r
-       text_out16(tl_x, y, "back");\r
-\r
-       menu_flip();\r
-}\r
-\r
-static int savestate_menu_loop(int is_loading)\r
-{\r
-       static int menu_sel = 10;\r
-       int menu_sel_max = 10;\r
-       unsigned long inp = 0;\r
-\r
-       state_check_slots();\r
-\r
-       for(;;)\r
-       {\r
-               draw_savestate_menu(menu_sel, is_loading);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK);\r
-               if(inp & PBTN_UP  ) {\r
-                       do {\r
-                               menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max;\r
-                       } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
-               }\r
-               if(inp & PBTN_DOWN) {\r
-                       do {\r
-                               menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0;\r
-                       } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
-               }\r
-               if(inp & PBTN_MOK) { // save/load\r
-                       if (menu_sel < 10) {\r
-                               state_slot = menu_sel;\r
-                               if (emu_SaveLoadGame(is_loading, 0)) {\r
-                                       strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed");\r
-                                       return 1;\r
-                               }\r
-                               return 0;\r
-                       } else  return 1;\r
-               }\r
-               if(inp & PBTN_MBACK) return 1;\r
-       }\r
-}\r
-\r
-// -------------- key config --------------\r
-\r
-static char *action_binds(int player_idx, int action_mask)\r
-{\r
-       static char strkeys[32];\r
-       int d, k, d_prev = -1;\r
-\r
-       strkeys[0] = 0;\r
-\r
-       for (d = 0; d < IN_MAX_DEVS; d++)\r
-       {\r
-               const int *binds;\r
-               int count;\r
-\r
-               binds = in_get_dev_binds(d);\r
-               if (binds == NULL)\r
-                       continue;\r
-\r
-               count = in_get_dev_bind_count(d);\r
-               for (k = 0; k < count; k++)\r
-               {\r
-                       const char *xname;\r
-                       char prefix[16];\r
-                       if (!(binds[k] & action_mask))\r
-                               continue;\r
-\r
-                       if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx)\r
-                               continue;\r
-\r
-                       xname = in_get_key_name(d, k);\r
-                       if (strkeys[0])\r
-                               strncat(strkeys, d == d_prev ? " + " : ", ", sizeof(strkeys));\r
-                       if (d) sprintf(prefix, "%d: ", d);\r
-                       if (d) strncat(strkeys, prefix, sizeof(strkeys));\r
-                       strncat(strkeys, xname, sizeof(strkeys));\r
-                       d_prev = d;\r
-               }\r
-       }\r
-\r
-       // limit..\r
-       strkeys[20] = 0;\r
-\r
-       return strkeys;\r
-}\r
-\r
-static void unbind_action(int action, int pl_idx, int joy)\r
-{\r
-       int i, u;\r
-\r
-       if (joy <= 0)\r
-       {\r
-               for (i = 0; i < 32; i++) {\r
-                       if (pl_idx >= 0 && (currentConfig.KeyBinds[i]&0x30000) != (pl_idx<<16)) continue;\r
-                       currentConfig.KeyBinds[i] &= ~action;\r
-               }\r
-       }\r
-       if (joy < 0)\r
-       {\r
-               for (u = 0; u < 4; u++)\r
-                       for (i = 0; i < 32; i++) {\r
-                               if (pl_idx >= 0 && (currentConfig.JoyBinds[u][i]&0x30000) != (pl_idx<<16)) continue;\r
-                               currentConfig.JoyBinds[u][i] &= ~action;\r
-                       }\r
-       }\r
-       else if (joy > 0)\r
-       {\r
-               for (i = 0; i < 32; i++) {\r
-                       if (pl_idx >= 0 && (currentConfig.JoyBinds[joy-1][i]&0x30000) != (pl_idx<<16)) continue;\r
-                       currentConfig.JoyBinds[joy-1][i] &= ~action;\r
-               }\r
-       }\r
-}\r
-\r
-static int count_bound_keys(int dev_id, int action_mask, int player_idx)\r
-{\r
-       const int *binds;\r
-       int k, keys = 0;\r
-       int count;\r
-\r
-       binds = in_get_dev_binds(dev_id);\r
-       if (binds == NULL)\r
-               return 0;\r
-\r
-       count = in_get_dev_bind_count(dev_id);\r
-       for (k = 0; k < count; k++)\r
-       {\r
-               if (!(binds[k] & action_mask))\r
-                       continue;\r
-\r
-               if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx)\r
-                       continue;\r
-\r
-               keys++;\r
-       }\r
-\r
-       return keys;\r
-}\r
-\r
-static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx,\r
-               int sel, int is_bind)\r
-{\r
-       int x, y, tl_y = 30, i;\r
-\r
-       gp2x_pd_clone_buffer2();\r
-       if (player_idx >= 0) {\r
-               text_out16(80, 10, "Player %i controls", player_idx + 1);\r
-               x = 80;\r
-       } else {\r
-               text_out16(80, 10, "Emulator controls");\r
-               x = 40;\r
-       }\r
-\r
-       menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 140);\r
-\r
-       y = tl_y;\r
-       for (i = 0; i < opt_cnt; i++, y+=10)\r
-               text_out16(x, y, "%s : %s", opts[i].name, action_binds(player_idx, opts[i].mask));\r
-\r
-       text_out16(x, y, "Done");\r
-\r
-       if (sel < opt_cnt) {\r
-               text_out16(30, 205, is_bind ? "Press a button to bind/unbind" : "Press B to define");\r
-               text_out16(30, 225, "Select \"Done\" to exit");\r
-       } else {\r
-               text_out16(30, 205, "Use Options -> Save cfg");\r
-               text_out16(30, 215, "to save controls");\r
-               text_out16(30, 225, "Press B or X to exit");\r
-       }\r
-       menu_flip();\r
-}\r
-\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;\r
-       int kc, dev_id, is_down, mkey, unbind;\r
-\r
-       for (;;)\r
-       {\r
-               draw_key_config(opts, opt_cnt, player_idx, sel, 0);\r
-               mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MBACK|PBTN_MOK);\r
-               switch (mkey) {\r
-                       case PBTN_UP:   sel--; if (sel < 0) sel = menu_sel_max; continue;\r
-                       case PBTN_DOWN: sel++; if (sel > menu_sel_max) sel = 0; continue;\r
-                       case PBTN_MBACK: return;\r
-                       case PBTN_MOK:\r
-                               if (sel >= opt_cnt)\r
-                                       return;\r
-                               while (in_menu_wait_any(30) & PBTN_MOK);\r
-                               break;\r
-                       default:continue;\r
-               }\r
-\r
-               draw_key_config(opts, opt_cnt, player_idx, sel, 1);\r
-\r
-               /* wait for some up event */\r
-               for (is_down = 1; is_down; ) {\r
-                       kc = in_update_keycode(&dev_id, &is_down, -1);\r
-               }\r
-\r
-               unbind = count_bound_keys(dev_id, opts[sel].mask, player_idx) >= 2;\r
-\r
-               in_bind_key(dev_id, kc, opts[sel].mask, unbind);\r
-               if (player_idx >= 0) {\r
-                       /* FIXME */\r
-                       in_bind_key(dev_id, kc, 3 << 16, 1);\r
-                       in_bind_key(dev_id, kc, player_idx << 16, 0);\r
-               }\r
-       }\r
-}\r
-\r
-\r
-menu_entry ctrlopt_entries[] =\r
-{\r
-       { "Player 1",                  MB_NONE,  MA_CTRL_PLAYER1,       NULL, 0, 0, 0, 1, 0 },\r
-       { "Player 2",                  MB_NONE,  MA_CTRL_PLAYER2,       NULL, 0, 0, 0, 1, 0 },\r
-       { "Emulator controls",         MB_NONE,  MA_CTRL_EMU,           NULL, 0, 0, 0, 1, 0 },\r
-       { "6 button pad",              MB_ONOFF, MA_OPT_6BUTTON_PAD,   &PicoOpt, 0x020, 0, 0, 1, 1 },\r
-       { "Turbo rate",                MB_RANGE, MA_CTRL_TURBO_RATE,   &currentConfig.turbo_rate, 0, 1, 30, 1, 1 },\r
-       { "Done",                      MB_NONE,  MA_CTRL_DONE,          NULL, 0, 0, 0, 1, 0 },\r
-};\r
-\r
-#define CTRLOPT_ENTRY_COUNT (sizeof(ctrlopt_entries) / sizeof(ctrlopt_entries[0]))\r
-const int ctrlopt_entry_count = CTRLOPT_ENTRY_COUNT;\r
-\r
-\r
-static void draw_kc_sel(int menu_sel)\r
-{\r
-       int tl_x = 25+40, tl_y = 60, y, i;\r
-       char joyname[36];\r
-\r
-       y = tl_y;\r
-       gp2x_pd_clone_buffer2();\r
-       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);\r
-\r
-       me_draw(ctrlopt_entries, ctrlopt_entry_count, tl_x, tl_y, NULL, NULL);\r
-\r
-       tl_x = 25;\r
-       text_out16(tl_x, (y=130), "Input devices:");\r
-       for (i = 0; i < IN_MAX_DEVS && y < 230; i++) {\r
-               const char *tmp, *name = in_get_dev_name(i, 1);\r
-               if (name == NULL)\r
-                       continue;\r
-               tmp = strchr(name, ':');\r
-               if (tmp != NULL)\r
-                       name = tmp + 1;\r
-               strncpy(joyname, name, 33); joyname[33] = 0;\r
-               text_out16(tl_x, (y+=10), "%i: %s", i, joyname);\r
-       }\r
-\r
-       menu_flip();\r
-}\r
-\r
-\r
-// player2_flag, reserved, ?, ?,\r
-// ?, ?, fast forward, menu\r
-// "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",\r
-// "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
-me_bind_action emuctrl_actions[] =\r
-{\r
-       { "Load State       ", 1<<28 },\r
-       { "Save State       ", 1<<27 },\r
-       { "Prev Save Slot   ", 1<<25 },\r
-       { "Next Save Slot   ", 1<<24 },\r
-       { "Switch Renderer  ", 1<<26 },\r
-       { "Volume Down      ", 1<<30 },\r
-       { "Volume Up        ", 1<<29 },\r
-       { "Fast forward     ", 1<<22 },\r
-       { "Enter Menu       ", 1<<23 },\r
-       { "Pico Next page   ", 1<<21 },\r
-       { "Pico Prev page   ", 1<<20 },\r
-       { "Pico Switch input", 1<<19 },\r
-       { NULL,                0     }\r
-};\r
-\r
-static void kc_sel_loop(void)\r
-{\r
-       int menu_sel = 5, menu_sel_max = 5;\r
-       unsigned long inp = 0;\r
-       menu_id selected_id;\r
-\r
-       while (1)\r
-       {\r
-               draw_kc_sel(menu_sel);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_RIGHT|PBTN_LEFT|PBTN_MOK|PBTN_MBACK);\r
-               selected_id = me_index2id(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, menu_sel);\r
-               if (inp & (PBTN_LEFT|PBTN_RIGHT)) // multi choise\r
-                       me_process(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, selected_id, (inp&PBTN_RIGHT) ? 1 : 0);\r
-               if (inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
-               if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
-               if (inp & PBTN_MOK) {\r
-                       int is_6button = PicoOpt & POPT_6BTN_PAD;\r
-                       switch (selected_id) {\r
-                               case MA_CTRL_PLAYER1: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 0); return;\r
-                               case MA_CTRL_PLAYER2: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 1); return;\r
-                               case MA_CTRL_EMU:     key_config_loop(emuctrl_actions,\r
-                                                       sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;\r
-                               case MA_CTRL_DONE:    if (!rom_loaded) emu_WriteConfig(0); return;\r
-                               default: return;\r
-                       }\r
-               }\r
-               if (inp & PBTN_MBACK) return;\r
-       }\r
-}\r
-\r
-\r
-// --------- sega/mega cd options ----------\r
-\r
-menu_entry cdopt_entries[] =\r
-{\r
-       { NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_USA, NULL, 0, 0, 0, 1, 0 },\r
-       { NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_EUR, NULL, 0, 0, 0, 1, 0 },\r
-       { NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_JAP, NULL, 0, 0, 0, 1, 0 },\r
-       { "CD LEDs",                   MB_ONOFF, MA_CDOPT_LEDS,         &currentConfig.EmuOpt, 0x0400, 0, 0, 1, 1 },\r
-       { "CDDA audio",                MB_ONOFF, MA_CDOPT_CDDA,         &PicoOpt, 0x0800, 0, 0, 1, 1 },\r
-       { "PCM audio",                 MB_ONOFF, MA_CDOPT_PCM,          &PicoOpt, 0x0400, 0, 0, 1, 1 },\r
-       { NULL,                        MB_NONE,  MA_CDOPT_READAHEAD,    NULL, 0, 0, 0, 1, 1 },\r
-       { "SaveRAM cart",              MB_ONOFF, MA_CDOPT_SAVERAM,      &PicoOpt, 0x8000, 0, 0, 1, 1 },\r
-       { "Scale/Rot. fx (slow)",      MB_ONOFF, MA_CDOPT_SCALEROT_CHIP,&PicoOpt, 0x1000, 0, 0, 1, 1 },\r
-       { "Better sync (slow)",        MB_ONOFF, MA_CDOPT_BETTER_SYNC,  &PicoOpt, 0x2000, 0, 0, 1, 1 },\r
-       { "done",                      MB_NONE,  MA_CDOPT_DONE,         NULL, 0, 0, 0, 1, 0 },\r
-};\r
-\r
-#define CDOPT_ENTRY_COUNT (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]))\r
-const int cdopt_entry_count = CDOPT_ENTRY_COUNT;\r
-\r
-\r
-struct bios_names_t\r
-{\r
-       char us[32], eu[32], jp[32];\r
-};\r
-\r
-static void menu_cdopt_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
-{\r
-       struct bios_names_t *bios_names = param;\r
-       char ra_buff[16];\r
-\r
-       switch (entry->id)\r
-       {\r
-               case MA_CDOPT_TESTBIOS_USA: text_out16(x, y, "USA BIOS:     %s", bios_names->us); break;\r
-               case MA_CDOPT_TESTBIOS_EUR: text_out16(x, y, "EUR BIOS:     %s", bios_names->eu); break;\r
-               case MA_CDOPT_TESTBIOS_JAP: text_out16(x, y, "JAP BIOS:     %s", bios_names->jp); break;\r
-               case MA_CDOPT_READAHEAD:\r
-                       if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);\r
-                       else strcpy(ra_buff, "     OFF");\r
-                       text_out16(x, y, "ReadAhead buffer      %s", ra_buff);\r
-                       break;\r
-               default:break;\r
-       }\r
-}\r
-\r
-static void draw_cd_menu_options(int menu_sel, struct bios_names_t *bios_names)\r
-{\r
-       int tl_x = 25, tl_y = 60;\r
-       menu_id selected_id;\r
-       char ra_buff[16];\r
-\r
-       if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);\r
-       else strcpy(ra_buff, "     OFF");\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 246);\r
-\r
-       me_draw(cdopt_entries, CDOPT_ENTRY_COUNT, tl_x, tl_y, menu_cdopt_cust_draw, bios_names);\r
-\r
-/* FIXME\r
-       selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);\r
-       if ((selected_id == MA_CDOPT_TESTBIOS_USA && strcmp(bios_names->us, "NOT FOUND")) ||\r
-               (selected_id == MA_CDOPT_TESTBIOS_EUR && strcmp(bios_names->eu, "NOT FOUND")) ||\r
-               (selected_id == MA_CDOPT_TESTBIOS_JAP && strcmp(bios_names->jp, "NOT FOUND")))\r
-                       text_out16(tl_x, 210, "Press start to test selected BIOS");\r
-*/\r
-\r
-       menu_flip();\r
-}\r
-\r
-static void cd_menu_loop_options(void)\r
-{\r
-       static int menu_sel = 0;\r
-       int menu_sel_max = 10;\r
-       unsigned long inp = 0;\r
-       struct bios_names_t bios_names;\r
-       menu_id selected_id;\r
-       char *bios, *p;\r
-\r
-       if (emu_findBios(4, &bios)) { // US\r
-               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
-               strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;\r
-       } else  strcpy(bios_names.us, "NOT FOUND");\r
-\r
-       if (emu_findBios(8, &bios)) { // EU\r
-               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
-               strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;\r
-       } else  strcpy(bios_names.eu, "NOT FOUND");\r
-\r
-       if (emu_findBios(1, &bios)) { // JP\r
-               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
-               strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;\r
-       } else  strcpy(bios_names.jp, "NOT FOUND");\r
-\r
-       for(;;)\r
-       {\r
-               draw_cd_menu_options(menu_sel, &bios_names);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MOK|PBTN_MBACK);\r
-               if (inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
-               if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
-               selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);\r
-               if (inp & (PBTN_LEFT|PBTN_RIGHT)) { // multi choise\r
-                       if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, (inp&PBTN_RIGHT) ? 1 : 0) &&\r
-                           selected_id == MA_CDOPT_READAHEAD) {\r
-                               if (inp & PBTN_LEFT) {\r
-                                       PicoCDBuffers >>= 1;\r
-                                       if (PicoCDBuffers < 2) PicoCDBuffers = 0;\r
-                               } else {\r
-                                       if (PicoCDBuffers < 2) PicoCDBuffers = 2;\r
-                                       else PicoCDBuffers <<= 1;\r
-                                       if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M\r
-                               }\r
-                       }\r
-               }\r
-               if (inp & PBTN_MOK) {\r
-                       // toggleable options\r
-                       if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, 1) &&\r
-                           selected_id == MA_CDOPT_DONE) {\r
-                               return;\r
-                       }\r
-                       // BIOS testers\r
-                       switch (selected_id) {\r
-                               case MA_CDOPT_TESTBIOS_USA:\r
-                                       if (emu_findBios(4, &bios)) { // test US\r
-                                               strcpy(romFileName, bios);\r
-                                               engineState = PGS_ReloadRom;\r
-                                               return;\r
-                                       }\r
-                                       break;\r
-                               case MA_CDOPT_TESTBIOS_EUR:\r
-                                       if (emu_findBios(8, &bios)) { // test EU\r
-                                               strcpy(romFileName, bios);\r
-                                               engineState = PGS_ReloadRom;\r
-                                               return;\r
-                                       }\r
-                                       break;\r
-                               case MA_CDOPT_TESTBIOS_JAP:\r
-                                       if (emu_findBios(1, &bios)) { // test JP\r
-                                               strcpy(romFileName, bios);\r
-                                               engineState = PGS_ReloadRom;\r
-                                               return;\r
-                                       }\r
-                                       break;\r
-                               default:\r
-                                       break;\r
-                       }\r
-               }\r
-               if (inp & PBTN_MBACK) return;\r
-       }\r
-}\r
-\r
-\r
-// --------- advanced options ----------\r
-\r
-menu_entry opt2_entries[] =\r
-{\r
-       { NULL,                        MB_NONE,  MA_OPT2_GAMMA,         NULL, 0, 0, 0, 1, 1 },\r
-       { "A_SN's gamma curve",        MB_ONOFF, MA_OPT2_A_SN_GAMMA,    &currentConfig.EmuOpt, 0x1000, 0, 0, 1, 1 },\r
-       { "Perfect vsync",             MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1, 1 },\r
-       { "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },\r
-       { "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &PicoOpt, 0x00004, 0, 0, 1, 1 },\r
-       { "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },\r
-       { "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },\r
-       { "gzip savestates",           MB_ONOFF, MA_OPT2_GZIP_STATES,   &currentConfig.EmuOpt, 0x0008, 0, 0, 1, 1 },\r
-       { "Don't save last used ROM",  MB_ONOFF, MA_OPT2_NO_LAST_ROM,   &currentConfig.EmuOpt, 0x0020, 0, 0, 1, 1 },\r
-       { "needs restart:",            MB_NONE,  MA_NONE,               NULL, 0, 0, 0, 1, 0 },\r
-       { "craigix's RAM timings",     MB_ONOFF, MA_OPT2_RAMTIMINGS,    &currentConfig.EmuOpt, 0x0100, 0, 0, 1, 1 },\r
-       { NULL,                        MB_ONOFF, MA_OPT2_SQUIDGEHACK,   &currentConfig.EmuOpt, 0x0010, 0, 0, 1, 1 },\r
-       { "SVP dynarec",               MB_ONOFF, MA_OPT2_SVP_DYNAREC,   &PicoOpt, 0x20000, 0, 0, 1, 1 },\r
-       { "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS, &PicoOpt, 0x80000, 0, 0, 1, 1 },\r
-       { "done",                      MB_NONE,  MA_OPT2_DONE,          NULL, 0, 0, 0, 1, 0 },\r
-};\r
-\r
-#define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0]))\r
-const int opt2_entry_count = OPT2_ENTRY_COUNT;\r
-\r
-static void menu_opt2_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
-{\r
-       if (entry->id == MA_OPT2_GAMMA)\r
-               text_out16(x, y, "Gamma correction           %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100);\r
-       else if (entry->id == MA_OPT2_SQUIDGEHACK)\r
-               text_out16(x, y, "Squidgehack (now %s %s", mmuhack_status ? "active)  " : "inactive)",\r
-                       (currentConfig.EmuOpt&0x0010)?"ON":"OFF");\r
-}\r
-\r
-\r
-static void draw_amenu_options(int menu_sel)\r
-{\r
-       int tl_x = 25, tl_y = 50;\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 252);\r
-\r
-       me_draw(opt2_entries, OPT2_ENTRY_COUNT, tl_x, tl_y, menu_opt2_cust_draw, NULL);\r
-\r
-       menu_flip();\r
-}\r
-\r
-static void amenu_loop_options(void)\r
-{\r
-       static int menu_sel = 0;\r
-       int menu_sel_max;\r
-       unsigned long inp = 0;\r
-       menu_id selected_id;\r
-\r
-       menu_sel_max = me_count_enabled(opt2_entries, OPT2_ENTRY_COUNT) - 1;\r
-\r
-       for(;;)\r
-       {\r
-               draw_amenu_options(menu_sel);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MOK|PBTN_MBACK);\r
-               if (inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
-               if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
-               selected_id = me_index2id(opt2_entries, OPT2_ENTRY_COUNT, menu_sel);\r
-               if (inp & (PBTN_LEFT|PBTN_RIGHT)) { // multi choise\r
-                       if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, (inp&PBTN_RIGHT) ? 1 : 0) &&\r
-                           selected_id == MA_OPT2_GAMMA) {\r
-                               while ((inp = in_menu_wait_any(20)) & (PBTN_LEFT|PBTN_RIGHT)) {\r
-                                       currentConfig.gamma += (inp & PBTN_LEFT) ? -1 : 1;\r
-                                       if (currentConfig.gamma <   1) currentConfig.gamma =   1;\r
-                                       if (currentConfig.gamma > 300) currentConfig.gamma = 300;\r
-                                       draw_amenu_options(menu_sel);\r
-                               }\r
-                       }\r
-               }\r
-               if (inp & PBTN_MOK) { // toggleable options\r
-                       if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, 1) &&\r
-                           selected_id == MA_OPT2_DONE) {\r
-                               return;\r
-                       }\r
-               }\r
-               if (inp & PBTN_MBACK) return;\r
-       }\r
-}\r
-\r
-// -------------- options --------------\r
-\r
-\r
-menu_entry opt_entries[] =\r
-{\r
-       { NULL,                        MB_NONE,  MA_OPT_RENDERER,      NULL, 0, 0, 0, 1, 1 },\r
-       { NULL,                        MB_RANGE, MA_OPT_SCALING,       &currentConfig.scaling, 0, 0, 3, 1, 1 },\r
-       { "Accurate sprites",          MB_ONOFF, MA_OPT_ACC_SPRITES,   &PicoOpt, 0x080, 0, 0, 0, 1 },\r
-       { "Show FPS",                  MB_ONOFF, MA_OPT_SHOW_FPS,      &currentConfig.EmuOpt,  0x002, 0, 0, 1, 1 },\r
-       { NULL,                        MB_RANGE, MA_OPT_FRAMESKIP,     &currentConfig.Frameskip, 0, -1, 16, 1, 1 },\r
-       { "Enable sound",              MB_ONOFF, MA_OPT_ENABLE_SOUND,  &currentConfig.EmuOpt,  0x004, 0, 0, 1, 1 },\r
-       { NULL,                        MB_NONE,  MA_OPT_SOUND_QUALITY, NULL, 0, 0, 0, 1, 1 },\r
-       { "Use ARM940 core for sound", MB_ONOFF, MA_OPT_ARM940_SOUND,  &PicoOpt, 0x200, 0, 0, 1, 1 },\r
-       { NULL,                        MB_NONE,  MA_OPT_REGION,        NULL, 0, 0, 0, 1, 1 },\r
-       { "Use SRAM/BRAM savestates",  MB_ONOFF, MA_OPT_SRAM_STATES,   &currentConfig.EmuOpt,  0x001, 0, 0, 1, 1 },\r
-       { NULL,                        MB_NONE,  MA_OPT_CONFIRM_STATES,NULL, 0, 0, 0, 1, 1 },\r
-       { "Save slot",                 MB_RANGE, MA_OPT_SAVE_SLOT,     &state_slot, 0, 0, 9, 1, 1 },\r
-       { NULL,                        MB_NONE,  MA_OPT_CPU_CLOCKS,    NULL, 0, 0, 0, 1, 1 },\r
-       { "[Sega/Mega CD options]",    MB_NONE,  MA_OPT_SCD_OPTS,      NULL, 0, 0, 0, 1, 0 },\r
-       { "[advanced options]",        MB_NONE,  MA_OPT_ADV_OPTS,      NULL, 0, 0, 0, 1, 0 },\r
-       { NULL,                        MB_NONE,  MA_OPT_SAVECFG,       NULL, 0, 0, 0, 1, 0 },\r
-       { "Save cfg for current game only",MB_NONE,MA_OPT_SAVECFG_GAME,NULL, 0, 0, 0, 1, 0 },\r
-       { NULL,                        MB_NONE,  MA_OPT_LOADCFG,       NULL, 0, 0, 0, 1, 0 },\r
-};\r
-\r
-#define OPT_ENTRY_COUNT (sizeof(opt_entries) / sizeof(opt_entries[0]))\r
-const int opt_entry_count = OPT_ENTRY_COUNT;\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
-\r
-       switch (entry->id)\r
-       {\r
-               case MA_OPT_RENDERER:\r
-                       if (PicoOpt & POPT_ALT_RENDERER)\r
-                               str = " 8bit fast";\r
-                       else if (currentConfig.EmuOpt&0x80)\r
-                               str = "16bit accurate";\r
-                       else\r
-                               str = " 8bit accurate";\r
-                       text_out16(x, y, "Renderer:            %s", str);\r
-                       break;\r
-               case MA_OPT_SCALING:\r
-                       switch (currentConfig.scaling) {\r
-                               default: str = "            OFF";   break;\r
-                               case 1:  str = "hw horizontal";     break;\r
-                               case 2:  str = "hw horiz. + vert."; break;\r
-                               case 3:  str = "sw horizontal";     break;\r
-                       }\r
-                       text_out16(x, y, "Scaling:       %s", str);\r
-                       break;\r
-               case MA_OPT_FRAMESKIP:\r
-                       if (currentConfig.Frameskip < 0)\r
-                            strcpy(str24, "Auto");\r
-                       else sprintf(str24, "%i", currentConfig.Frameskip);\r
-                       text_out16(x, y, "Frameskip                  %s", str24);\r
-                       break;\r
-               case MA_OPT_SOUND_QUALITY:\r
-                       str = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";\r
-                       text_out16(x, y, "Sound Quality:     %5iHz %s", PsndRate, str);\r
-                       break;\r
-               case MA_OPT_REGION:\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
-                               default: str = "OFF";    break;\r
-                               case 1:  str = "writes"; break;\r
-                               case 4:  str = "loads";  break;\r
-                               case 5:  str = "both";   break;\r
-                       }\r
-                       text_out16(x, y, "Confirm savestate          %s", str);\r
-                       break;\r
-               case MA_OPT_CPU_CLOCKS:\r
-                       text_out16(x, y, "GP2X CPU clocks            %iMhz", currentConfig.CPUclock);\r
-                       break;\r
-               case MA_OPT_SAVECFG:\r
-                       str24[0] = 0;\r
-                       if (config_slot != 0) sprintf(str24, " (profile: %i)", config_slot);\r
-                       text_out16(x, y, "Save cfg as default%s", str24);\r
-                       break;\r
-               case MA_OPT_LOADCFG:\r
-                       text_out16(x, y, "Load cfg from profile %i", config_slot);\r
-                       break;\r
-               default:\r
-                       printf("%s: unimplemented (%i)\n", __FUNCTION__, entry->id);\r
-                       break;\r
-       }\r
-}\r
-\r
-\r
-\r
-static void draw_menu_options(int menu_sel)\r
-{\r
-       int tl_x = 25, tl_y = 24;\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 284);\r
-\r
-       me_draw(opt_entries, OPT_ENTRY_COUNT, tl_x, tl_y, menu_opt_cust_draw, NULL);\r
-\r
-       menu_flip();\r
-}\r
-\r
-static int sndrate_prevnext(int rate, int dir)\r
-{\r
-       int i, rates[] = { 8000, 11025, 16000, 22050, 44100 };\r
-\r
-       for (i = 0; i < 5; i++)\r
-               if (rates[i] == rate) break;\r
-\r
-       i += dir ? 1 : -1;\r
-       if (i > 4) return dir ? 44100 : 22050;\r
-       if (i < 0) return dir ? 11025 : 8000;\r
-       return rates[i];\r
-}\r
-\r
-static void region_prevnext(int right)\r
-{\r
-       // jp_ntsc=1, jp_pal=2, usa=4, eu=8\r
-       static int rgn_orders[] = { 0x148, 0x184, 0x814, 0x418, 0x841, 0x481 };\r
-       int i;\r
-       if (right) {\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 PicoRegionOverride=1;\r
-               }\r
-               else PicoRegionOverride<<=1;\r
-               if (PicoRegionOverride > 8) PicoRegionOverride = 8;\r
-       } else {\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 PicoRegionOverride>>=1;\r
-       }\r
-}\r
-\r
-static void menu_options_save(void)\r
-{\r
-       if (PicoRegionOverride) {\r
-               // force setting possibly changed..\r
-               Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
-       }\r
-       if (!(PicoOpt & POPT_6BTN_PAD)) {\r
-               // unbind XYZ MODE, just in case\r
-               unbind_action(0xf00, -1, -1);\r
-       }\r
-}\r
-\r
-static int menu_loop_options(void)\r
-{\r
-       static int menu_sel = 0;\r
-       int menu_sel_max, ret;\r
-       unsigned long inp = 0;\r
-       menu_id selected_id;\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
-       menu_sel_max = me_count_enabled(opt_entries, OPT_ENTRY_COUNT) - 1;\r
-       if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
-\r
-       while (1)\r
-       {\r
-               draw_menu_options(menu_sel);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MOK|PBTN_MBACK);\r
-               if (inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
-               if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
-               selected_id = me_index2id(opt_entries, OPT_ENTRY_COUNT, menu_sel);\r
-               if (inp & (PBTN_LEFT|PBTN_RIGHT)) { // multi choice\r
-                       if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, (inp&PBTN_RIGHT) ? 1 : 0)) {\r
-                               switch (selected_id) {\r
-                                       case MA_OPT_RENDERER:\r
-                                               if (inp & PBTN_LEFT) {\r
-                                                       if      (PicoOpt&0x10) PicoOpt&= ~0x10;\r
-                                                       else if (!(currentConfig.EmuOpt &0x80))currentConfig.EmuOpt |=  0x80;\r
-                                                       else if (  currentConfig.EmuOpt &0x80) break;\r
-                                               } else {\r
-                                                       if      (PicoOpt&0x10) break;\r
-                                                       else if (!(currentConfig.EmuOpt &0x80))PicoOpt|=  0x10;\r
-                                                       else if (  currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
-                                               }\r
-                                               break;\r
-                                       case MA_OPT_SOUND_QUALITY:\r
-                                               if ((inp & PBTN_RIGHT) && PsndRate == 44100 && !(PicoOpt&0x08)) {\r
-                                                       PsndRate = 8000; PicoOpt|= 0x08;\r
-                                               } else if ((inp & PBTN_LEFT) && PsndRate == 8000 && (PicoOpt&0x08)) {\r
-                                                       PsndRate = 44100; PicoOpt&=~0x08;\r
-                                               } else  PsndRate = sndrate_prevnext(PsndRate, inp & PBTN_RIGHT);\r
-                                               break;\r
-                                       case MA_OPT_REGION:\r
-                                               region_prevnext(inp & PBTN_RIGHT);\r
-                                               break;\r
-                                       case MA_OPT_CONFIRM_STATES: {\r
-                                                        int n = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);\r
-                                                        n += (inp & PBTN_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 MA_OPT_SAVE_SLOT:\r
-                                                if (inp & PBTN_RIGHT) {\r
-                                                        state_slot++; if (state_slot > 9) state_slot = 0;\r
-                                                } else {state_slot--; if (state_slot < 0) state_slot = 9;\r
-                                                }\r
-                                                break;\r
-                                       case MA_OPT_CPU_CLOCKS:\r
-                                                while ((inp = in_menu_wait_any(50)) & (PBTN_LEFT|PBTN_RIGHT)) {\r
-                                                        currentConfig.CPUclock += (inp & PBTN_LEFT) ? -1 : 1;\r
-                                                        if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;\r
-                                                        draw_menu_options(menu_sel);\r
-                                                }\r
-                                                break;\r
-                                       case MA_OPT_SAVECFG:\r
-                                       case MA_OPT_SAVECFG_GAME:\r
-                                       case MA_OPT_LOADCFG:\r
-                                                config_slot += (inp&PBTN_RIGHT) ? 1 : -1;\r
-                                                if (config_slot > 9) config_slot = 0;\r
-                                                if (config_slot < 0) config_slot = 9;\r
-                                                me_enable(opt_entries, OPT_ENTRY_COUNT, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
-                                                menu_sel_max = me_count_enabled(opt_entries, OPT_ENTRY_COUNT) - 1;\r
-                                                if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
-                                                break;\r
-                                       default:\r
-                                               //printf("%s: something unknown selected (%i)\n", __FUNCTION__, selected_id);\r
-                                               break;\r
-                               }\r
-                       }\r
-               }\r
-               if (inp & PBTN_MOK) {\r
-                       if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, 1))\r
-                       {\r
-                               switch (selected_id)\r
-                               {\r
-                                       case MA_OPT_SCD_OPTS:\r
-                                               cd_menu_loop_options();\r
-                                               if (engineState == PGS_ReloadRom)\r
-                                                       return 0; // test BIOS\r
-                                               break;\r
-                                       case MA_OPT_ADV_OPTS:\r
-                                               amenu_loop_options();\r
-                                               break;\r
-                                       case MA_OPT_SAVECFG: // done (update and write)\r
-                                               menu_options_save();\r
-                                               if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");\r
-                                               else strcpy(menuErrorMsg, "failed to write config");\r
-                                               return 1;\r
-                                       case MA_OPT_SAVECFG_GAME: // done (update and write for current game)\r
-                                               menu_options_save();\r
-                                               if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");\r
-                                               else strcpy(menuErrorMsg, "failed to write config");\r
-                                               return 1;\r
-                                       case MA_OPT_LOADCFG:\r
-                                               ret = emu_ReadConfig(1, 1);\r
-                                               if (!ret) ret = emu_ReadConfig(0, 1);\r
-                                               if (ret)  strcpy(menuErrorMsg, "config loaded");\r
-                                               else      strcpy(menuErrorMsg, "failed to load config");\r
-                                               return 1;\r
-                                       default:\r
-                                               //printf("%s: something unknown selected (%i)\n", __FUNCTION__, selected_id);\r
-                                               break;\r
-                               }\r
-                       }\r
-               }\r
-               if(inp & PBTN_MBACK) {\r
-                       menu_options_save();\r
-                       return 0;  // done (update, no write)\r
-               }\r
-       }\r
-}\r
-\r
-// -------------- credits --------------\r
-\r
-static void draw_menu_credits(void)\r
-{\r
-       int tl_x = 15, tl_y = 56, y;\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");\r
-       y = tl_y;\r
-       text_out16(tl_x, y, "Credits:");\r
-       text_out16(tl_x, (y+=10), "fDave: Cyclone 68000 core,");\r
-       text_out16(tl_x, (y+=10), "      base code of PicoDrive");\r
-       text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");\r
-       text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");\r
-       text_out16(tl_x, (y+=10), "rlyeh and others: minimal SDK");\r
-       text_out16(tl_x, (y+=10), "Squidge: squidgehack");\r
-       text_out16(tl_x, (y+=10), "Dzz: ARM940 sample");\r
-       text_out16(tl_x, (y+=10), "GnoStiC / Puck2099: USB joy code");\r
-       text_out16(tl_x, (y+=10), "craigix: GP2X hardware");\r
-       text_out16(tl_x, (y+=10), "ketchupgun: skin design");\r
-\r
-       text_out16(tl_x, (y+=20), "special thanks (for docs, ideas):");\r
-       text_out16(tl_x, (y+=10), " Charles MacDonald, Haze,");\r
-       text_out16(tl_x, (y+=10), " Stephane Dallongeville,");\r
-       text_out16(tl_x, (y+=10), " Lordus, Exophase, Rokas,");\r
-       text_out16(tl_x, (y+=10), " Nemesis, Tasco Deluxe");\r
-\r
-       menu_flip();\r
-}\r
-\r
-\r
-// -------------- root menu --------------\r
-\r
-menu_entry main_entries[] =\r
-{\r
-       { "Resume game",        MB_NONE, MA_MAIN_RESUME_GAME, NULL, 0, 0, 0, 0, 0 },\r
-       { "Save State",         MB_NONE, MA_MAIN_SAVE_STATE,  NULL, 0, 0, 0, 0, 0 },\r
-       { "Load State",         MB_NONE, MA_MAIN_LOAD_STATE,  NULL, 0, 0, 0, 0, 0 },\r
-       { "Reset game",         MB_NONE, MA_MAIN_RESET_GAME,  NULL, 0, 0, 0, 0, 0 },\r
-       { "Load new ROM/ISO",   MB_NONE, MA_MAIN_LOAD_ROM,    NULL, 0, 0, 0, 1, 0 },\r
-       { "Change options",     MB_NONE, MA_MAIN_OPTIONS,     NULL, 0, 0, 0, 1, 0 },\r
-       { "Configure controls", MB_NONE, MA_MAIN_CONTROLS,    NULL, 0, 0, 0, 1, 0 },\r
-       { "Credits",            MB_NONE, MA_MAIN_CREDITS,     NULL, 0, 0, 0, 1, 0 },\r
-       { "Patches / GameGenie",MB_NONE, MA_MAIN_PATCHES,     NULL, 0, 0, 0, 0, 0 },\r
-       { "Exit",               MB_NONE, MA_MAIN_EXIT,        NULL, 0, 0, 0, 1, 0 }\r
-};\r
-\r
-#define MAIN_ENTRY_COUNT (sizeof(main_entries) / sizeof(main_entries[0]))\r
-\r
-static void draw_menu_root(int menu_sel)\r
-{\r
-       const int tl_x = 70, tl_y = 70;\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       text_out16(tl_x, 20, "PicoDrive v" VERSION);\r
-\r
-       menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 146);\r
-\r
-       me_draw(main_entries, MAIN_ENTRY_COUNT, tl_x, tl_y, NULL, NULL);\r
-\r
-       // error\r
-       if (menuErrorMsg[0]) {\r
-               memset((char *)gp2x_screen + 320*224*2, 0, 320*16*2);\r
-               text_out16(5, 226, menuErrorMsg);\r
-       }\r
-       menu_flip();\r
-}\r
-\r
-\r
-static void menu_loop_root(void)\r
-{\r
-       static int menu_sel = 0;\r
-       int ret, menu_sel_max;\r
-       unsigned long inp = 0;\r
-\r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESUME_GAME, rom_loaded);\r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_SAVE_STATE,  rom_loaded);\r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_LOAD_STATE,  rom_loaded);\r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESET_GAME,  rom_loaded);\r
-       me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_PATCHES,     PicoPatches != NULL);\r
-\r
-       menu_sel_max = me_count_enabled(main_entries, MAIN_ENTRY_COUNT) - 1;\r
-       if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;\r
-\r
-       /* make sure action buttons are not pressed on entering menu */\r
-       draw_menu_root(menu_sel);\r
-       while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU));\r
-\r
-       for (;;)\r
-       {\r
-               draw_menu_root(menu_sel);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R);\r
-               if(inp & PBTN_UP  )  { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
-               if(inp & PBTN_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
-               if((inp & (PBTN_L|PBTN_R)) == (PBTN_L|PBTN_R)) debug_menu_loop();\r
-               if(inp &(PBTN_MENU|PBTN_MBACK)){\r
-                       if (rom_loaded) {\r
-                               while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MBACK)); // wait until select is released\r
-                               engineState = PGS_Running;\r
-                               break;\r
-                       }\r
-               }\r
-               if(inp & PBTN_MOK)  {\r
-                       switch (me_index2id(main_entries, MAIN_ENTRY_COUNT, menu_sel))\r
-                       {\r
-                               case MA_MAIN_RESUME_GAME:\r
-                                       if (rom_loaded) {\r
-                                               while (in_menu_wait_any(50) & PBTN_MOK);\r
-                                               engineState = PGS_Running;\r
-                                               return;\r
-                                       }\r
-                                       break;\r
-                               case MA_MAIN_SAVE_STATE:\r
-                                       if (rom_loaded) {\r
-                                               if(savestate_menu_loop(0))\r
-                                                       continue;\r
-                                               engineState = PGS_Running;\r
-                                               return;\r
-                                       }\r
-                                       break;\r
-                               case MA_MAIN_LOAD_STATE:\r
-                                       if (rom_loaded) {\r
-                                               if(savestate_menu_loop(1))\r
-                                                       continue;\r
-                                               while (in_menu_wait_any(50) & PBTN_MOK);\r
-                                               engineState = PGS_Running;\r
-                                               return;\r
-                                       }\r
-                                       break;\r
-                               case MA_MAIN_RESET_GAME:\r
-                                       if (rom_loaded) {\r
-                                               emu_ResetGame();\r
-                                               while (in_menu_wait_any(50) & PBTN_MOK);\r
-                                               engineState = PGS_Running;\r
-                                               return;\r
-                                       }\r
-                                       break;\r
-                               case MA_MAIN_LOAD_ROM:\r
-                               {\r
-                                       char curr_path[PATH_MAX], *selfname;\r
-                                       FILE *tstf;\r
-                                       if ( (tstf = fopen(loadedRomFName, "rb")) )\r
-                                       {\r
-                                               fclose(tstf);\r
-                                               strcpy(curr_path, loadedRomFName);\r
-                                       }\r
-                                       else\r
-                                               getcwd(curr_path, PATH_MAX);\r
-                                       selfname = romsel_loop(curr_path);\r
-                                       if (selfname) {\r
-                                               printf("selected file: %s\n", selfname);\r
-                                               engineState = PGS_ReloadRom;\r
-                                               return;\r
-                                       }\r
-                                       break;\r
-                               }\r
-                               case MA_MAIN_OPTIONS:\r
-                                       ret = menu_loop_options();\r
-                                       if (ret == 1) continue; // status update\r
-                                       if (engineState == PGS_ReloadRom)\r
-                                               return; // BIOS test\r
-                                       break;\r
-                               case MA_MAIN_CONTROLS:\r
-                                       kc_sel_loop();\r
-                                       break;\r
-                               case MA_MAIN_CREDITS:\r
-                                       draw_menu_credits();\r
-                                       usleep(500*1000);\r
-                                       inp = in_menu_wait(PBTN_MOK|PBTN_MBACK);\r
-                                       break;\r
-                               case MA_MAIN_EXIT:\r
-                                       engineState = PGS_Quit;\r
-                                       return;\r
-                               case MA_MAIN_PATCHES:\r
-                                       if (rom_loaded && PicoPatches) {\r
-                                               patches_menu_loop();\r
-                                               PicoPatchApply();\r
-                                               strcpy(menuErrorMsg, "Patches applied");\r
-                                               continue;\r
-                                       }\r
-                                       break;\r
-                               default:\r
-                                       printf("%s: something unknown selected\n", __FUNCTION__);\r
-                                       break;\r
-                       }\r
-               }\r
-               menuErrorMsg[0] = 0; // clear error msg\r
-       }\r
-}\r
-\r
-static void menu_prepare_bg(int use_game_bg)\r
-{\r
-       if (use_game_bg)\r
-       {\r
-               // darken the active framebuffer\r
-               memset(gp2x_screen, 0, 320*8*2);\r
-               menu_darken_bg((char *)gp2x_screen + 320*8*2, 320*224, 1);\r
-               memset((char *)gp2x_screen + 320*232*2, 0, 320*8*2);\r
-       }\r
-       else\r
-       {\r
-               // should really only happen once, on startup..\r
-               readpng(gp2x_screen, "skin/background.png", READPNG_BG);\r
-       }\r
-\r
-       // copy to buffer2\r
-       gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);\r
-}\r
-\r
-static void menu_gfx_prepare(void)\r
-{\r
-       menu_prepare_bg(rom_loaded);\r
-\r
-       // switch to 16bpp\r
-       gp2x_video_changemode2(16);\r
-       gp2x_video_RGB_setscaling(0, 320, 240);\r
-       menu_flip();\r
-}\r
-\r
-\r
-void menu_loop_old(void)\r
-{\r
-       in_set_blocking(1);\r
-       menu_gfx_prepare();\r
-\r
-       menu_loop_root();\r
-\r
-       in_set_blocking(0);\r
-       menuErrorMsg[0] = 0;\r
-}\r
-\r
-\r
-// --------- CD tray close menu ----------\r
-\r
-static void draw_menu_tray(int menu_sel)\r
-{\r
-       int tl_x = 70, tl_y = 90, y;\r
-       memset(gp2x_screen, 0, 320*240*2);\r
-\r
-       text_out16(tl_x, 20, "The unit is about to");\r
-       text_out16(tl_x, 30, "close the CD tray.");\r
-\r
-       y = tl_y;\r
-       text_out16(tl_x, y,       "Load new CD image");\r
-       text_out16(tl_x, (y+=10), "Insert nothing");\r
-\r
-       // draw cursor\r
-       text_out16(tl_x - 16, tl_y + menu_sel*10, ">");\r
-       // error\r
-       if (menuErrorMsg[0]) text_out16(5, 226, menuErrorMsg);\r
-       menu_flip();\r
-}\r
-\r
-\r
-int menu_loop_tray(void)\r
-{\r
-       int menu_sel = 0, menu_sel_max = 1;\r
-       unsigned long inp = 0;\r
-       char curr_path[PATH_MAX], *selfname;\r
-       FILE *tstf;\r
-\r
-       gp2x_memset_all_buffers(0, 0, 320*240*2);\r
-       menu_gfx_prepare();\r
-\r
-       if ( (tstf = fopen(loadedRomFName, "rb")) )\r
-       {\r
-               fclose(tstf);\r
-               strcpy(curr_path, loadedRomFName);\r
-       }\r
-       else\r
-       {\r
-               getcwd(curr_path, PATH_MAX);\r
-       }\r
-\r
-       /* make sure action buttons are not pressed on entering menu */\r
-       draw_menu_tray(menu_sel);\r
-       while (in_menu_wait_any(50) & PBTN_MOK);\r
-\r
-       for (;;)\r
-       {\r
-               draw_menu_tray(menu_sel);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK);\r
-               if(inp & PBTN_UP  )  { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
-               if(inp & PBTN_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
-               if(inp & PBTN_MOK   )  {\r
-                       switch (menu_sel) {\r
-                               case 0: // select image\r
-                                       selfname = romsel_loop(curr_path);\r
-                                       if (selfname) {\r
-                                               int ret = -1;\r
-                                               cd_img_type cd_type;\r
-                                               cd_type = emu_cdCheck(NULL, romFileName);\r
-                                               if (cd_type != CIT_NOT_CD)\r
-                                                       ret = Insert_CD(romFileName, cd_type);\r
-                                               if (ret != 0) {\r
-                                                       sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
-                                                       printf("%s\n", menuErrorMsg);\r
-                                                       continue;\r
-                                               }\r
-                                               engineState = PGS_RestartRun;\r
-                                               return 1;\r
-                                       }\r
-                                       break;\r
-                               case 1: // insert nothing\r
-                                       engineState = PGS_RestartRun;\r
-                                       return 0;\r
-                       }\r
-               }\r
-               menuErrorMsg[0] = 0; // clear error msg\r
-       }\r
-}\r
-\r
-\r
diff --git a/platform/gp2x/menu.h b/platform/gp2x/menu.h
deleted file mode 100644 (file)
index 7561d34..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-// (c) Copyright 2006,2007 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
-void menu_loop(void);\r
-int  menu_loop_tray(void);\r
-void menu_romload_prepare(const char *rom_name);\r
-void menu_romload_end(void);\r
-\r
-#define CONFIGURABLE_KEYS \\r
-       (GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_A|GP2X_B|GP2X_X|GP2X_Y| \\r
-               GP2X_START|GP2X_SELECT|GP2X_L|GP2X_R|GP2X_PUSH|GP2X_VOL_UP|GP2X_VOL_DOWN)\r
-\r
index 932b7e5..d611349 100644 (file)
@@ -31,8 +31,6 @@
 #define dprintf(x...)\r
 \r
 // platform\r
-#define PLAT_MAX_KEYS 32\r
-#define PLAT_HAVE_JOY 1\r
 #define PATH_SEP      "/"\r
 #define PATH_SEP_C    '/'\r
 #define MENU_X2       0\r
index 9d7e38d..b59e777 100644 (file)
@@ -11,7 +11,6 @@
 #include "../../pico/sound/ym2612.h"
 #include "../gp2x/gp2x.h"
 #include "../gp2x/emu.h"
-#include "../gp2x/menu.h"
 #include "../gp2x/code940/940shared.h"
 #include "../common/helix/pub/mp3dec.h"
 #include "../../pico/pico_int.h"
index 4c11d2b..a22e079 100644 (file)
@@ -48,6 +48,12 @@ static void destroy (GtkWidget *widget, gpointer data)
        gtk_main_quit ();
 }
 
+/* faking GP2X pad */
+enum  { GP2X_UP=0x1,       GP2X_LEFT=0x4,       GP2X_DOWN=0x10,  GP2X_RIGHT=0x40,
+        GP2X_START=1<<8,   GP2X_SELECT=1<<9,    GP2X_L=1<<10,    GP2X_R=1<<11,
+        GP2X_A=1<<12,      GP2X_B=1<<13,        GP2X_X=1<<14,    GP2X_Y=1<<15,
+        GP2X_VOL_UP=1<<23, GP2X_VOL_DOWN=1<<22, GP2X_PUSH=1<<27 };
+
 static gint key_press_event (GtkWidget *widget, GdkEventKey *event)
 {
        switch (event->hardware_keycode)
@@ -334,11 +340,6 @@ void gp2x_pd_clone_buffer2(void)
 }
 
 /* joy */
-unsigned long gp2x_joystick_read(int allow_usb_joy)
-{
-       return current_keys;
-}
-
 int gp2x_touchpad_read(int *x, int *y)
 {
        return -1;
index 3d0522c..c2589a9 100644 (file)
@@ -9,7 +9,6 @@
 #include <linux/input.h>
 #include <errno.h>
 
-#include "../common/common.h"
 #include "../common/input.h"
 #include "in_evdev.h"
 
@@ -354,29 +353,50 @@ static int in_evdev_update_keycode(void *data, int *is_down)
        return -1;
 }
 
+static const struct {
+       short key;
+       short pbtn;
+} key_pbtn_map[] =
+{
+       { KEY_UP,       PBTN_UP },
+       { KEY_DOWN,     PBTN_DOWN },
+       { KEY_LEFT,     PBTN_LEFT },
+       { KEY_RIGHT,    PBTN_RIGHT },
+       { KEY_ENTER,    PBTN_MOK },
+       { BTN_A,        PBTN_MOK },
+       { BTN_TRIGGER,  PBTN_MOK },
+       { KEY_ESC,      PBTN_MBACK },
+       { BTN_B,        PBTN_MBACK },
+       { BTN_THUMB,    PBTN_MBACK },
+       { KEY_A,        PBTN_MA2 },
+       { KEY_S,        PBTN_MA3 },
+       { KEY_BACKSLASH,  PBTN_MENU },
+       { KEY_MENU,       PBTN_MENU },
+       { KEY_LEFTBRACE,  PBTN_L },
+       { KEY_RIGHTBRACE, PBTN_R },
+};
+
+#define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
+
 static int in_evdev_menu_translate(int keycode)
 {
-       switch (keycode) {
-               case KEY_UP:    return PBTN_UP;
-               case KEY_DOWN:  return PBTN_DOWN;
-               case KEY_LEFT:  return PBTN_LEFT;
-               case KEY_RIGHT: return PBTN_RIGHT;
-               case KEY_ENTER:
-               case BTN_A:
-               case BTN_TRIGGER:
-                       return PBTN_MOK;
-               case KEY_ESC:
-               case BTN_B:
-               case BTN_THUMB:
-                       return PBTN_MBACK;
-               case KEY_MENU:
-                       return PBTN_MENU;
-               case KEY_LEFTBRACE:
-                       return PBTN_L;
-               case KEY_RIGHTBRACE:
-                       return PBTN_R;
-               default:        return 0;
+       int i;
+       if (keycode < 0)
+       {
+               /* menu -> kc */
+               keycode = -keycode;
+               for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
+                       if (key_pbtn_map[i].pbtn == keycode)
+                               return key_pbtn_map[i].key;
        }
+       else
+       {
+               for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
+                       if (key_pbtn_map[i].key == keycode)
+                               return key_pbtn_map[i].pbtn;
+       }
+
+       return 0;
 }
 
 static int in_evdev_get_key_code(const char *key_name)
@@ -421,6 +441,8 @@ static const struct {
        { BTN_Y,        6 },
        { KEY_ENTER,    7 },
        { BTN_START,    7 },
+       { BTN_TL,       27 },   /* save state */
+       { BTN_TR,       28 },   /* load state */
 };
 
 #define DEF_BIND_COUNT (sizeof(in_evdev_def_binds) / sizeof(in_evdev_def_binds[0]))
index 20dbeaf..c75406d 100644 (file)
@@ -35,8 +35,6 @@
 #define dprintf(x...)
 
 // platform
-#define PLAT_MAX_KEYS 32
-#define PLAT_HAVE_JOY 1
 #define PATH_SEP      "/"
 #define PATH_SEP_C    '/'
 #define MENU_X2       0
index 55cb371..16fc7cd 100644 (file)
@@ -19,7 +19,6 @@
 #include "../common/emu.h"\r
 #include "../common/menu.h"\r
 #include "../common/config.h"\r
-#include "../common/common.h"\r
 #include "../common/input.h"\r
 #include "../linux/sndout_oss.h"\r
 #include "asm_utils.h"\r
index 3d047dc..58a8eea 100644 (file)
@@ -31,8 +31,6 @@
 #define dprintf(x...)\r
 \r
 // platform\r
-#define PLAT_MAX_KEYS 32\r
-#define PLAT_HAVE_JOY 1\r
 #define PATH_SEP      "/"\r
 #define PATH_SEP_C    '/'\r
 #define MENU_X2       1\r
index 7d543f1..cc42e6c 100644 (file)
@@ -33,8 +33,6 @@ extern void blit1(void);
 #define dprintf(x...)\r
 \r
 // platform\r
-#define PLAT_MAX_KEYS 32\r
-#define PLAT_HAVE_JOY 0\r
 #define PATH_SEP      "/"\r
 #define PATH_SEP_C    '/'\r
 #define MENU_X2       0\r
index 60128c1..6785d25 100644 (file)
@@ -26,8 +26,6 @@
 #define dprintf(x...)\r
 \r
 // platform\r
-#define PLAT_MAX_KEYS (256+19)\r
-#define PLAT_HAVE_JOY 0\r
 #define PATH_SEP      "\\"\r
 #define PATH_SEP_C    '\\'\r
 #define MENU_X2       0\r