X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flinux%2Fin_evdev.c;h=445f8fd825a1ff33f1440a7c2b9734c3abdf8146;hb=faf2b2aae80c811f778f7cfa9a320dd7ade01dac;hp=f11f3a4112374d1a8d4eb9697d84534b74dcb58c;hpb=605e6809b6e7f33153dedb3d6dfa7f7a9aa7c6a8;p=pcsx_rearmed.git diff --git a/frontend/linux/in_evdev.c b/frontend/linux/in_evdev.c index f11f3a41..445f8fd8 100644 --- a/frontend/linux/in_evdev.c +++ b/frontend/linux/in_evdev.c @@ -49,7 +49,10 @@ typedef struct { #define KEYBITS_BIT_CLEAR(x) (keybits[(x)/sizeof(keybits[0])/8] &= \ ~(1 << ((x) & (sizeof(keybits[0])*8-1)))) -static const char * const in_evdev_prefix = "evdev:"; +int in_evdev_allow_abs_only; + +#define IN_EVDEV_PREFIX "evdev:" + static const char * const in_evdev_keys[KEY_CNT] = { [0 ... KEY_MAX] = NULL, [KEY_RESERVED] = "Reserved", [KEY_ESC] = "Esc", @@ -151,7 +154,7 @@ static void in_evdev_probe(void) for (i = 0;; i++) { int support = 0, count = 0; - int u, ret, fd, kc_first, kc_last; + int u, ret, fd, kc_first = KEY_MAX, kc_last = 0; in_evdev_t *dev; char name[64]; @@ -170,30 +173,29 @@ static void in_evdev_probe(void) goto skip; } - if (!(support & (1 << EV_KEY))) - goto skip; - - ret = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits); - if (ret == -1) { - printf("in_evdev: ioctl failed on %s\n", name); - goto skip; - } + if (support & (1 << EV_KEY)) { + ret = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits); + if (ret == -1) { + printf("in_evdev: ioctl failed on %s\n", name); + goto skip; + } - /* check for interesting keys */ - kc_first = KEY_MAX; - kc_last = 0; - for (u = 0; u < KEY_CNT; u++) { - if (KEYBITS_BIT(u)) { - if (u < kc_first) - kc_first = u; - if (u > kc_last) - kc_last = u; - if (u != KEY_POWER && u != KEY_SLEEP && u != BTN_TOUCH) - count++; + /* check for interesting keys */ + for (u = 0; u < KEY_CNT; u++) { + if (KEYBITS_BIT(u)) { + if (u < kc_first) + kc_first = u; + if (u > kc_last) + kc_last = u; + if (u != KEY_POWER && u != KEY_SLEEP && u != BTN_TOUCH) + count++; + if (u == BTN_TOUCH) /* we can't deal with ts currently */ + goto skip; + } } } - if (count == 0) + if (count == 0 && !in_evdev_allow_abs_only) goto skip; dev = calloc(1, sizeof(*dev)); @@ -237,14 +239,19 @@ static void in_evdev_probe(void) } no_abs: + if (count == 0 && dev->abs_lzone == 0) { + free(dev); + goto skip; + } + dev->fd = fd; dev->kc_first = kc_first; dev->kc_last = kc_last; - strcpy(name, in_evdev_prefix); + strcpy(name, IN_EVDEV_PREFIX); ioctl(fd, EVIOCGNAME(sizeof(name)-6), name+6); printf("in_evdev: found \"%s\" with %d events (type %08x)\n", name+6, count, support); - in_register(name, IN_DRVID_EVDEV, fd, dev, KEY_CNT, in_evdev_keys, 0); + in_register(name, fd, dev, KEY_CNT, in_evdev_keys, 0); continue; skip: @@ -277,7 +284,7 @@ static void or_binds(const int *binds, int key, int *result) /* ORs result with binds of pressed buttons * XXX: should measure performance hit of this func, might need to optimize */ -int in_evdev_update(void *drv_data, const int *binds, int *result) +static int in_evdev_update(void *drv_data, const int *binds, int *result) { struct input_event ev[16]; struct input_absinfo ainfo; @@ -532,43 +539,6 @@ static int in_evdev_menu_translate(void *drv_data, int keycode) return 0; } -/* FIXME: move to plat */ -#if 0 -static const struct { - short code; - char btype; - char bit; -} in_evdev_def_binds[] = -{ - /* MXYZ SACB RLDU */ - { KEY_UP, IN_BINDTYPE_PLAYER12, 0 }, - { KEY_DOWN, IN_BINDTYPE_PLAYER12, 1 }, - { KEY_LEFT, IN_BINDTYPE_PLAYER12, 2 }, - { KEY_RIGHT, IN_BINDTYPE_PLAYER12, 3 }, - { KEY_S, IN_BINDTYPE_PLAYER12, 4 }, /* B */ - { KEY_D, IN_BINDTYPE_PLAYER12, 5 }, /* C */ - { KEY_A, IN_BINDTYPE_PLAYER12, 6 }, /* A */ - { KEY_ENTER, IN_BINDTYPE_PLAYER12, 7 }, - { KEY_BACKSLASH, IN_BINDTYPE_EMU, PEVB_MENU }, - /* Pandora */ - { KEY_PAGEDOWN, IN_BINDTYPE_PLAYER12, 4 }, - { KEY_END, IN_BINDTYPE_PLAYER12, 5 }, - { KEY_HOME, IN_BINDTYPE_PLAYER12, 6 }, - { KEY_LEFTALT, IN_BINDTYPE_PLAYER12, 7 }, - { KEY_RIGHTSHIFT,IN_BINDTYPE_EMU, PEVB_STATE_SAVE }, - { KEY_RIGHTCTRL, IN_BINDTYPE_EMU, PEVB_STATE_LOAD }, - { KEY_LEFTCTRL, IN_BINDTYPE_EMU, PEVB_MENU }, - /* Caanoo */ - { BTN_THUMB, IN_BINDTYPE_PLAYER12, 4 }, /* B */ - { BTN_THUMB2, IN_BINDTYPE_PLAYER12, 5 }, /* C */ - { BTN_TRIGGER, IN_BINDTYPE_PLAYER12, 6 }, /* A */ - { BTN_BASE3, IN_BINDTYPE_PLAYER12, 7 }, - { BTN_TOP2, IN_BINDTYPE_EMU, PEVB_STATE_SAVE }, - { BTN_PINKIE, IN_BINDTYPE_EMU, PEVB_STATE_LOAD }, - { BTN_BASE, IN_BINDTYPE_EMU, PEVB_MENU }, -}; -#endif - static void in_evdev_get_def_binds(int *binds) { int i; @@ -617,18 +587,21 @@ static int in_evdev_clean_binds(void *drv_data, int *binds, int *def_binds) return count; } -void in_evdev_init(void *vdrv) +static const in_drv_t in_evdev_drv = { + .prefix = IN_EVDEV_PREFIX, + .probe = in_evdev_probe, + .free = in_evdev_free, + .get_key_names = in_evdev_get_key_names, + .get_def_binds = in_evdev_get_def_binds, + .clean_binds = in_evdev_clean_binds, + .set_config = in_evdev_set_config, + .update = in_evdev_update, + .update_keycode = in_evdev_update_keycode, + .menu_translate = in_evdev_menu_translate, +}; + +void in_evdev_init(void) { - in_drv_t *drv = vdrv; - - drv->prefix = in_evdev_prefix; - drv->probe = in_evdev_probe; - drv->free = in_evdev_free; - drv->get_key_names = in_evdev_get_key_names; - drv->get_def_binds = in_evdev_get_def_binds; - drv->clean_binds = in_evdev_clean_binds; - drv->set_config = in_evdev_set_config; - drv->update_keycode = in_evdev_update_keycode; - drv->menu_translate = in_evdev_menu_translate; + in_register_driver(&in_evdev_drv); }