frontend: sync with pico code

[pcsx_rearmed.git] / frontend / linux / in_evdev.c

diff --git a/frontend/linux/in_evdev.c b/frontend/linux/in_evdev.c
index f11f3a4..f88d74c 100644 (file)
--- a/frontend/linux/in_evdev.c
+++ b/frontend/linux/in_evdev.c
@@ -49,6 +49,8 @@ typedef struct {
 #define KEYBITS_BIT_CLEAR(x) (keybits[(x)/sizeof(keybits[0])/8] &= \
        ~(1 << ((x) & (sizeof(keybits[0])*8-1))))
 
+int in_evdev_allow_abs_only;
+
 static const char * const in_evdev_prefix = "evdev:";
 static const char * const in_evdev_keys[KEY_CNT] = {
        [0 ... KEY_MAX] = NULL,
@@ -151,7 +153,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 +172,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,6 +238,11 @@ 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;
@@ -532,43 +538,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;