various pre-release tweaks

[libpicofe.git] / gp2x / in_gp2x.c

diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c
index 51c9bf5..818aead 100644 (file)
--- a/gp2x/in_gp2x.c
+++ b/gp2x/in_gp2x.c
@@ -27,7 +27,7 @@ enum  { BTN_UP = 0,      BTN_LEFT = 2,      BTN_DOWN = 4,  BTN_RIGHT = 6,
         BTN_VOL_UP = 23, BTN_VOL_DOWN = 22, BTN_PUSH = 27 };
 
 static const char * const in_gp2x_prefix = IN_PREFIX;
-static const char * const in_gp2x_keys[IN_GP2X_NBUTTONS] = {
+static const char *in_gp2x_keys[IN_GP2X_NBUTTONS] = {
        [0 ... IN_GP2X_NBUTTONS-1] = NULL,
        [BTN_UP]    = "UP",    [BTN_LEFT]   = "LEFT",   [BTN_DOWN] = "DOWN", [BTN_RIGHT] = "RIGHT",
        [BTN_START] = "START", [BTN_SELECT] = "SELECT", [BTN_L]    = "L",    [BTN_R]     = "R",
@@ -258,7 +258,7 @@ static const struct {
        { BTN_A,        IN_BINDTYPE_PLAYER12, 6 },      /* A */
        { BTN_START,    IN_BINDTYPE_PLAYER12, 7 },
        { BTN_SELECT,   IN_BINDTYPE_EMU, PEVB_MENU },
-       { BTN_Y,        IN_BINDTYPE_EMU, PEVB_SWITCH_RND },
+//     { BTN_Y,        IN_BINDTYPE_EMU, PEVB_SWITCH_RND },
        { BTN_L,        IN_BINDTYPE_EMU, PEVB_STATE_SAVE },
        { BTN_R,        IN_BINDTYPE_EMU, PEVB_STATE_LOAD },
        { BTN_VOL_UP,   IN_BINDTYPE_EMU, PEVB_VOL_UP },
@@ -317,7 +317,12 @@ static int in_gp2x_clean_binds(void *drv_data, int *binds, int *def_binds)
 void in_gp2x_init(void *vdrv)
 {
        in_drv_t *drv = vdrv;
+       gp2x_soc_t soc;
 
+       soc = soc_detect();
+       if (soc == SOCID_POLLUX)
+               in_gp2x_keys[BTN_START] = "MENU";
+       
        in_gp2x_combo_keys = in_gp2x_combo_acts = 0;
 
        drv->prefix = in_gp2x_prefix;