#include "../common/input.h"
#include "in_gp2x.h"
-#include "soc.h"
+#include "plat_gp2x.h"
#define IN_PREFIX "gp2x:"
#define IN_GP2X_NBUTTONS 32
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"
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)
}
#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;
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");
}
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;
}
in_register(IN_PREFIX "GP2X pad", IN_DRVID_GP2X, -1, (void *)1,
- IN_GP2X_NBUTTONS, 1);
+ IN_GP2X_NBUTTONS, in_gp2x_keys, 1);
}
static void in_gp2x_free(void *drv_data)
#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)
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;
char btype;
{
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;
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;
}