X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fin_gp2x.c;h=ab4ba179bdeb0c143b8a6fae4e368d55081a6850;hb=ee2a3bdfa5a969ea9446b2d08748f16e29bbd4d5;hp=81681ffa2afe2fbb4e4d67f6ff072cc75750c539;hpb=9025b93159042e856af2fb1a1e7e5017f9fee99c;p=picodrive.git diff --git a/platform/gp2x/in_gp2x.c b/platform/gp2x/in_gp2x.c index 81681ff..ab4ba17 100644 --- a/platform/gp2x/in_gp2x.c +++ b/platform/gp2x/in_gp2x.c @@ -1,9 +1,14 @@ +#include #include #include +#include +#include +#include +#include -#include "../common/common.h" #include "../common/input.h" #include "in_gp2x.h" +#include "soc.h" #define IN_PREFIX "gp2x:" #define IN_GP2X_NBUTTONS 32 @@ -12,8 +17,9 @@ * both must be pressed for action to happen) */ static int in_gp2x_combo_keys = 0; static int in_gp2x_combo_acts = 0; +static int gpiodev = -1; /* Wiz only */ -extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */ +static int (*in_gp2x_get_bits)(void); enum { BTN_UP = 0, BTN_LEFT = 2, BTN_DOWN = 4, BTN_RIGHT = 6, BTN_START = 8, BTN_SELECT = 9, BTN_L = 10, BTN_R = 11, @@ -30,20 +36,51 @@ static const char * const in_gp2x_keys[IN_GP2X_NBUTTONS] = { [BTN_PUSH] = "PUSH" }; +static int in_gp2x_get_mmsp2_bits(void); +static int in_gp2x_get_wiz_bits(void); static void in_gp2x_probe(void) { + gp2x_soc_t soc; + + soc = soc_detect(); + switch (soc) + { + case SOCID_MMSP2: + in_gp2x_get_bits = in_gp2x_get_mmsp2_bits; + break; + case SOCID_POLLUX: + gpiodev = open("/dev/GPIO", O_RDONLY); + if (gpiodev < 0) { + perror("in_gp2x: couldn't open /dev/GPIO"); + return; + } + in_gp2x_get_bits = in_gp2x_get_wiz_bits; + break; + default: + return; + } + in_register(IN_PREFIX "GP2X pad", IN_DRVID_GP2X, -1, (void *)1, 1); } +static void in_gp2x_free(void *drv_data) +{ + if (gpiodev >= 0) { + close(gpiodev); + gpiodev = -1; + } +} + static int in_gp2x_get_bind_count(void) { return IN_GP2X_NBUTTONS; } -static int in_gp2x_get_gpio_bits(void) +static int in_gp2x_get_mmsp2_bits(void) { #ifndef FAKE_IN_GP2X + extern volatile unsigned short *gp2x_memregs; int value; value = gp2x_memregs[0x1198>>1] & 0xff; // GPIO M if (value == 0xFD) value = 0xFA; @@ -61,12 +98,38 @@ static int in_gp2x_get_gpio_bits(void) #endif } +static int in_gp2x_get_wiz_bits(void) +{ + int value = 0; + read(gpiodev, &value, 4); + if (value & 0x02) + value |= 0x05; + if (value & 0x08) + value |= 0x14; + if (value & 0x20) + value |= 0x50; + if (value & 0x80) + value |= 0x41; + + /* convert to GP2X style */ + value &= 0x7ff55; + if (value & (1 << 16)) + value |= 1 << BTN_VOL_UP; + if (value & (1 << 17)) + value |= 1 << BTN_VOL_DOWN; + if (value & (1 << 18)) + value |= 1 << BTN_PUSH; + value &= ~0x70000; + + return value; +} + /* returns bitfield of binds of pressed buttons */ int in_gp2x_update(void *drv_data, int *binds) { int i, keys, ret = 0; - keys = in_gp2x_get_gpio_bits(); + 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); @@ -85,7 +148,7 @@ int in_gp2x_update_keycode(void *data, int *is_down) static int old_val = 0; int val, diff, i; - val = in_gp2x_get_gpio_bits(); + val = in_gp2x_get_bits(); diff = val ^ old_val; if (diff == 0) return -1; @@ -102,20 +165,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 +244,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 +265,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; @@ -194,6 +302,7 @@ void in_gp2x_init(void *vdrv) drv->prefix = in_gp2x_prefix; drv->probe = in_gp2x_probe; + drv->free = in_gp2x_free; drv->get_bind_count = in_gp2x_get_bind_count; drv->get_def_binds = in_gp2x_get_def_binds; drv->clean_binds = in_gp2x_clean_binds;