X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fin_gp2x.c;h=01352c5ce2c880d402ab24e382be55749ef2eaf0;hb=df77913a462b8dee9afbe6e059b3a30fbfbe9f5b;hp=f0da43608a6665a6967b980e43845e041a9f2660;hpb=0114ccc43b628801282c5a076e0f3a9f368ea329;p=libpicofe.git diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c index f0da436..01352c5 100644 --- a/gp2x/in_gp2x.c +++ b/gp2x/in_gp2x.c @@ -8,7 +8,7 @@ #include "../common/input.h" #include "in_gp2x.h" -#include "soc.h" +#include "plat_gp2x.h" #define IN_PREFIX "gp2x:" #define IN_GP2X_NBUTTONS 32 @@ -27,10 +27,10 @@ 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", + [BTN_UP] = "Up", [BTN_LEFT] = "Left", [BTN_DOWN] = "Down", [BTN_RIGHT] = "Right", + [BTN_START] = "Start", [BTN_SELECT] = "Select", [BTN_L] = "L", [BTN_R] = "R", [BTN_A] = "A", [BTN_B] = "B", [BTN_X] = "X", [BTN_Y] = "Y", [BTN_VOL_DOWN]= "VOL DOWN", [BTN_VOL_UP] = "VOL UP", [BTN_PUSH] = "PUSH" @@ -55,8 +55,8 @@ static int in_gp2x_get_mmsp2_bits(void) static int in_gp2x_get_wiz_bits(void) { - int value = 0; - read(gpiodev, &value, 4); + int r, value = 0; + r = read(gpiodev, &value, 4); if (value & 0x02) value |= 0x05; if (value & 0x08) @@ -80,6 +80,9 @@ static int in_gp2x_get_wiz_bits(void) } #ifdef FAKE_IN_GP2X +volatile unsigned short *gp2x_memregs; +int gp2x_dev_id = -1; + static int in_gp2x_get_fake_bits(void) { extern int current_keys; @@ -89,15 +92,12 @@ static int in_gp2x_get_fake_bits(void) static void in_gp2x_probe(void) { - gp2x_soc_t soc; - - soc = soc_detect(); - switch (soc) + switch (gp2x_dev_id) { - case SOCID_MMSP2: + case GP2X_DEV_GP2X: in_gp2x_get_bits = in_gp2x_get_mmsp2_bits; break; - case SOCID_POLLUX: + case GP2X_DEV_WIZ: gpiodev = open("/dev/GPIO", O_RDONLY); if (gpiodev < 0) { perror("in_gp2x: couldn't open /dev/GPIO"); @@ -105,6 +105,7 @@ static void in_gp2x_probe(void) } in_gp2x_get_bits = in_gp2x_get_wiz_bits; break; + // we'll use evdev for Caanoo default: #ifdef FAKE_IN_GP2X in_gp2x_get_bits = in_gp2x_get_fake_bits; @@ -113,7 +114,8 @@ static void in_gp2x_probe(void) return; } - in_register(IN_PREFIX "GP2X pad", IN_DRVID_GP2X, -1, (void *)1, 1); + in_register(IN_PREFIX "GP2X pad", IN_DRVID_GP2X, -1, (void *)1, + IN_GP2X_NBUTTONS, in_gp2x_keys, 1); } static void in_gp2x_free(void *drv_data) @@ -129,23 +131,29 @@ static int in_gp2x_get_bind_count(void) return IN_GP2X_NBUTTONS; } -/* returns bitfield of binds of pressed buttons */ -int in_gp2x_update(void *drv_data, int *binds) +/* ORs result with pressed buttons */ +int in_gp2x_update(void *drv_data, const int *binds, int *result) { - int i, keys, ret = 0; + int type_start = 0; + int i, t, keys; keys = in_gp2x_get_bits(); - if (keys & in_gp2x_combo_keys) - return in_combos_do(keys, binds, BTN_PUSH, in_gp2x_combo_keys, in_gp2x_combo_acts); + if (keys & in_gp2x_combo_keys) { + result[IN_BINDTYPE_EMU] = in_combos_do(keys, binds, BTN_PUSH, + in_gp2x_combo_keys, in_gp2x_combo_acts); + type_start = IN_BINDTYPE_PLAYER12; + } - for (i = 0; keys; i++) { - if (keys & 1) - ret |= binds[i]; - keys >>= 1; + for (i = 0; keys; i++, keys >>= 1) { + if (!(keys & 1)) + continue; + + for (t = type_start; t < IN_BINDTYPE_COUNT; t++) + result[t] |= binds[IN_BIND_OFFS(i, t)]; } - return ret; + return 0; } int in_gp2x_update_keycode(void *data, int *is_down) @@ -190,7 +198,7 @@ static const struct { #define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0])) -static int in_gp2x_menu_translate(int keycode) +static int in_gp2x_menu_translate(void *drv_data, int keycode) { int i; if (keycode < 0) @@ -211,50 +219,27 @@ static int in_gp2x_menu_translate(int keycode) return 0; } -static int in_gp2x_get_key_code(const char *key_name) -{ - int i; - - for (i = 0; i < IN_GP2X_NBUTTONS; i++) { - const char *k = in_gp2x_keys[i]; - if (k != NULL && strcasecmp(k, key_name) == 0) - return i; - } - - return -1; -} - -static const char *in_gp2x_get_key_name(int keycode) -{ - const char *name = NULL; - if (keycode >= 0 && keycode < IN_GP2X_NBUTTONS) - name = in_gp2x_keys[keycode]; - if (name == NULL) - name = "Unkn"; - - return name; -} - static const struct { short code; - short bit; + char btype; + char bit; } in_gp2x_def_binds[] = { /* MXYZ SACB RLDU */ - { BTN_UP, 0 }, - { BTN_DOWN, 1 }, - { BTN_LEFT, 2 }, - { BTN_RIGHT, 3 }, - { BTN_X, 4 }, /* B */ - { 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 */ + { BTN_UP, IN_BINDTYPE_PLAYER12, 0 }, + { BTN_DOWN, IN_BINDTYPE_PLAYER12, 1 }, + { BTN_LEFT, IN_BINDTYPE_PLAYER12, 2 }, + { BTN_RIGHT, IN_BINDTYPE_PLAYER12, 3 }, + { BTN_X, IN_BINDTYPE_PLAYER12, 4 }, /* B */ + { BTN_B, IN_BINDTYPE_PLAYER12, 5 }, /* C */ + { 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_L, IN_BINDTYPE_EMU, PEVB_STATE_SAVE }, + { BTN_R, IN_BINDTYPE_EMU, PEVB_STATE_LOAD }, + { BTN_VOL_UP, IN_BINDTYPE_EMU, PEVB_VOL_UP }, + { BTN_VOL_DOWN, IN_BINDTYPE_EMU, PEVB_VOL_DOWN }, }; #define DEF_BIND_COUNT (sizeof(in_gp2x_def_binds) / sizeof(in_gp2x_def_binds[0])) @@ -264,45 +249,55 @@ static void in_gp2x_get_def_binds(int *binds) int i; for (i = 0; i < DEF_BIND_COUNT; i++) - binds[in_gp2x_def_binds[i].code] = 1 << in_gp2x_def_binds[i].bit; + binds[IN_BIND_OFFS(in_gp2x_def_binds[i].code, in_gp2x_def_binds[i].btype)] = + 1 << in_gp2x_def_binds[i].bit; } /* remove binds of missing keys, count remaining ones */ -static int in_gp2x_clean_binds(void *drv_data, int *binds) +static int in_gp2x_clean_binds(void *drv_data, int *binds, int *def_binds) { 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]) { - count++; - if (binds[i] & ((1 << 29)|(1 << 30))) - have_vol = 1; - if (binds[i] & (1 << 23)) - have_menu = 1; + int t, eb, offs; + for (t = 0; t < IN_BINDTYPE_COUNT; t++) { + offs = IN_BIND_OFFS(i, t); + if (in_gp2x_keys[i] == NULL) + binds[offs] = def_binds[offs] = 0; + if (binds[offs]) + count++; } + eb = binds[IN_BIND_OFFS(i, IN_BINDTYPE_EMU)]; + if (eb & (PEV_VOL_DOWN|PEV_VOL_UP)) + have_vol = 1; + if (eb & PEV_MENU) + 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; + binds[IN_BIND_OFFS(BTN_VOL_UP, IN_BINDTYPE_EMU)] = PEV_VOL_UP; + binds[IN_BIND_OFFS(BTN_VOL_DOWN, IN_BINDTYPE_EMU)] = PEV_VOL_DOWN; + count += 2; } - if (!have_menu && binds[BTN_SELECT] == 0) - binds[BTN_SELECT] = 1 << 23; + if (!have_menu) { + binds[IN_BIND_OFFS(BTN_SELECT, IN_BINDTYPE_EMU)] = PEV_MENU; + count++; + } in_combos_find(binds, BTN_PUSH, &in_gp2x_combo_keys, &in_gp2x_combo_acts); return count; - } void in_gp2x_init(void *vdrv) { in_drv_t *drv = vdrv; + if (gp2x_dev_id == GP2X_DEV_WIZ) + in_gp2x_keys[BTN_START] = "MENU"; + in_gp2x_combo_keys = in_gp2x_combo_acts = 0; drv->prefix = in_gp2x_prefix; @@ -312,8 +307,6 @@ void in_gp2x_init(void *vdrv) drv->get_def_binds = in_gp2x_get_def_binds; drv->clean_binds = in_gp2x_clean_binds; drv->menu_translate = in_gp2x_menu_translate; - drv->get_key_code = in_gp2x_get_key_code; - drv->get_key_name = in_gp2x_get_key_name; drv->update_keycode = in_gp2x_update_keycode; }