fix clang warnings
[libpicofe.git] / linux / in_evdev.c
index 3d0522c..fed27f7 100644 (file)
@@ -1,3 +1,14 @@
+/*
+ * (C) GraÅžvydas "notaz" Ignotas, 2008-2012
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ *  - MAME license.
+ * See the COPYING file in the top-level directory.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <linux/input.h>
 #include <errno.h>
 
-#include "../common/common.h"
-#include "../common/input.h"
+#include "../input.h"
 #include "in_evdev.h"
 
+#define MAX_ABS_DEVS 8
+
 typedef struct {
        int fd;
-       int prev_update;
+       int *kbits;
+       int abs_min_x; /* abs->digital mapping */
+       int abs_max_x;
+       int abs_min_y;
+       int abs_max_y;
        int abs_lzone;
-       int abs_rzone;
-       int abs_tzone;
-       int abs_bzone;
        int abs_lastx;
        int abs_lasty;
+       int kc_first;
+       int kc_last;
+       unsigned int abs_count;
+       int abs_mult[MAX_ABS_DEVS]; /* 16.16 multiplier to IN_ABS_RANGE */
+       int abs_adj[MAX_ABS_DEVS];  /* adjust for centering */
+       unsigned int abs_to_digital:1;
 } in_evdev_t;
 
+#ifndef KEY_CNT
+#define KEY_CNT (KEY_MAX + 1)
+#endif
+
 #define KEYBITS_BIT(x) (keybits[(x)/sizeof(keybits[0])/8] & \
        (1 << ((x) & (sizeof(keybits[0])*8-1))))
 
 #define KEYBITS_BIT_SET(x) (keybits[(x)/sizeof(keybits[0])/8] |= \
        (1 << ((x) & (sizeof(keybits[0])*8-1))))
 
-static const char * const in_evdev_prefix = "evdev:";
-static const char * const in_evdev_keys[KEY_MAX + 1] = {
-       [0 ... KEY_MAX] = NULL,
+#define KEYBITS_BIT_CLEAR(x) (keybits[(x)/sizeof(keybits[0])/8] &= \
+       ~(1 << ((x) & (sizeof(keybits[0])*8-1))))
+
+int in_evdev_allow_abs_only;
+
+#define IN_EVDEV_PREFIX "evdev:"
+
+static const char * const in_evdev_keys[KEY_CNT] = {
+       // [0 ... KEY_MAX] = NULL, // not necessary
        [KEY_RESERVED] = "Reserved",            [KEY_ESC] = "Esc",
        [KEY_1] = "1",                          [KEY_2] = "2",
        [KEY_3] = "3",                          [KEY_4] = "4",
@@ -120,20 +149,29 @@ static const char * const in_evdev_keys[KEY_MAX + 1] = {
 
 static void in_evdev_probe(void)
 {
+       long keybits[KEY_CNT / sizeof(long) / 8];
+       long absbits[(ABS_MAX+1) / sizeof(long) / 8];
        int i;
 
+       // the kernel might support and return less keys then we know about,
+       // so make sure the buffers are clear.
+       memset(keybits, 0, sizeof(keybits));
+       memset(absbits, 0, sizeof(absbits));
+
        for (i = 0;; i++)
        {
-               int keybits[(KEY_MAX+1)/sizeof(int)], absbits[(ABS_MAX+1)/sizeof(int)];
                int support = 0, count = 0;
+               int u, ret, fd, kc_first = KEY_MAX, kc_last = 0, have_abs = 0;
                in_evdev_t *dev;
-               int u, ret, fd;
                char name[64];
 
                snprintf(name, sizeof(name), "/dev/input/event%d", i);
                fd = open(name, O_RDONLY|O_NONBLOCK);
-               if (fd == -1)
+               if (fd == -1) {
+                       if (errno == EACCES)
+                               continue;       /* maybe we can access next one */
                        break;
+               }
 
                /* check supported events */
                ret = ioctl(fd, EVIOCGBIT(0, sizeof(support)), &support);
@@ -142,28 +180,42 @@ 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 */
-               for (u = 0; u < KEY_MAX + 1; u++) {
-                       if (KEYBITS_BIT(u) && u != KEY_POWER && u != KEY_SLEEP)
-                               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)
-                       goto skip;
-
                dev = calloc(1, sizeof(*dev));
                if (dev == NULL)
                        goto skip;
 
+               ret = ioctl(fd, EVIOCGKEY(sizeof(keybits)), keybits);
+               if (ret == -1) {
+                       printf("Warning: EVIOCGKEY not supported, will have to track state\n");
+                       dev->kbits = calloc(KEY_CNT, sizeof(int));
+                       if (dev->kbits == NULL) {
+                               free(dev);
+                               goto skip;
+                       }
+               }
+
                /* check for abs too */
                if (support & (1 << EV_ABS)) {
                        struct input_absinfo ainfo;
@@ -176,26 +228,47 @@ static void in_evdev_probe(void)
                                if (ret == -1)
                                        goto no_abs;
                                dist = ainfo.maximum - ainfo.minimum;
-                               dev->abs_lzone = ainfo.minimum + dist / 4;
-                               dev->abs_rzone = ainfo.maximum - dist / 4;
+                               dev->abs_lzone = dist / 4;
+                               dev->abs_min_x = ainfo.minimum;
+                               dev->abs_max_x = ainfo.maximum;
                        }
                        if (absbits[0] & (1 << ABS_Y)) {
                                ret = ioctl(fd, EVIOCGABS(ABS_Y), &ainfo);
                                if (ret == -1)
                                        goto no_abs;
                                dist = ainfo.maximum - ainfo.minimum;
-                               dev->abs_tzone = ainfo.minimum + dist / 4;
-                               dev->abs_bzone = ainfo.maximum - dist / 4;
+                               dev->abs_min_y = ainfo.minimum;
+                               dev->abs_max_y = ainfo.maximum;
                        }
+                       for (u = 0; u < MAX_ABS_DEVS; u++) {
+                               ret = ioctl(fd, EVIOCGABS(u), &ainfo);
+                               if (ret == -1)
+                                       break;
+                               dist = ainfo.maximum - ainfo.minimum;
+                               if (dist != 0)
+                                       dev->abs_mult[u] = IN_ABS_RANGE * 2 * 65536 / dist;
+                               dev->abs_adj[u] = -(ainfo.maximum + ainfo.minimum + 1) / 2;
+                               have_abs = 1;
+                       }
+                       dev->abs_count = u;
                }
 
 no_abs:
+               if (count == 0 && !have_abs) {
+                       free(dev);
+                       goto skip;
+               }
+
                dev->fd = fd;
-               strcpy(name, in_evdev_prefix);
+               dev->kc_first = kc_first;
+               dev->kc_last = kc_last;
+               if (count > 0 || in_evdev_allow_abs_only)
+                       dev->abs_to_digital = 1;
+               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, 0);
+               in_register(name, fd, dev, KEY_CNT, in_evdev_keys, 0);
                continue;
 
 skip:
@@ -212,273 +285,372 @@ static void in_evdev_free(void *drv_data)
        free(dev);
 }
 
-static int in_evdev_get_bind_count(void)
+static const char * const *
+in_evdev_get_key_names(int *count)
+{
+       *count = KEY_CNT;
+       return in_evdev_keys;
+}
+
+static void or_binds(const int *binds, int key, int *result)
 {
-       return KEY_MAX + 1;
+       int t;
+       for (t = 0; t < IN_BINDTYPE_COUNT; t++)
+               result[t] |= binds[IN_BIND_OFFS(key, t)];
 }
 
-/* returns bitfield of binds of pressed buttons */
-int in_evdev_update(void *drv_data, int *binds)
+/* ORs result with binds of pressed buttons
+ * XXX: should measure performance hit of this func, might need to optimize */
+static int in_evdev_update(void *drv_data, const int *binds, int *result)
 {
        struct input_event ev[16];
        struct input_absinfo ainfo;
-       int keybits[(KEY_MAX+1)/sizeof(int)];
+       int keybits_[KEY_CNT / sizeof(int)];
+       int *keybits = keybits_;
        in_evdev_t *dev = drv_data;
-       int result = 0, changed = 0;
-       int rd, ret, u;
-
-       while (1) {
-               rd = read(dev->fd, ev, sizeof(ev));
-               if (rd < (int)sizeof(ev[0])) {
-                       if (errno != EAGAIN)
-                               perror("in_evdev: read failed");
-                       break;
-               }
+       int rd, ret, u, lzone;
 
-               changed = 1;
+       if (dev->kbits == NULL) {
+               ret = ioctl(dev->fd, EVIOCGKEY(sizeof(keybits_)), keybits_);
+               if (ret == -1) {
+                       perror("in_evdev: ioctl failed");
+                       return -1;
+               }
        }
-
-       if (!changed)
-               return dev->prev_update;
-
-       ret = ioctl(dev->fd, EVIOCGKEY(sizeof(keybits)), keybits);
-       if (ret == -1) {
-               perror("in_evdev: ioctl failed");
-               return 0;
+       else {
+               keybits = dev->kbits;
+               while (1) {
+                       rd = read(dev->fd, ev, sizeof(ev));
+                       if (rd < (int)sizeof(ev[0])) {
+                               if (errno != EAGAIN)
+                                       perror("in_evdev: read failed");
+                               break;
+                       }
+                       for (u = 0; u < rd / sizeof(ev[0]); u++) {
+                               if (ev[u].type != EV_KEY)
+                                       continue;
+                               else if (ev[u].value == 1)
+                                       KEYBITS_BIT_SET(ev[u].code);
+                               else if (ev[u].value == 0)
+                                       KEYBITS_BIT_CLEAR(ev[u].code);
+                       }
+               }
        }
 
-       for (u = 0; u < KEY_MAX + 1; u++) {
-               if (KEYBITS_BIT(u)) {
-                       result |= binds[u];
-               }
+       for (u = dev->kc_first; u <= dev->kc_last; u++) {
+               if (KEYBITS_BIT(u))
+                       or_binds(binds, u, result);
        }
 
        /* map X and Y absolute to UDLR */
-       if (dev->abs_lzone != 0) {
+       lzone = dev->abs_lzone;
+       if (dev->abs_to_digital && lzone != 0) {
                ret = ioctl(dev->fd, EVIOCGABS(ABS_X), &ainfo);
                if (ret != -1) {
-                       if (ainfo.value < dev->abs_lzone) result |= binds[KEY_LEFT];
-                       if (ainfo.value > dev->abs_rzone) result |= binds[KEY_RIGHT];
+                       if (ainfo.value < dev->abs_min_x + lzone) or_binds(binds, KEY_LEFT, result);
+                       if (ainfo.value > dev->abs_max_x - lzone) or_binds(binds, KEY_RIGHT, result);
                }
-       }
-       if (dev->abs_tzone != 0) {
                ret = ioctl(dev->fd, EVIOCGABS(ABS_Y), &ainfo);
                if (ret != -1) {
-                       if (ainfo.value < dev->abs_tzone) result |= binds[KEY_UP];
-                       if (ainfo.value > dev->abs_bzone) result |= binds[KEY_DOWN];
+                       if (ainfo.value < dev->abs_min_y + lzone) or_binds(binds, KEY_UP, result);
+                       if (ainfo.value > dev->abs_max_y - lzone) or_binds(binds, KEY_DOWN, result);
                }
        }
 
-       dev->prev_update = result;
-       return result;
+       return 0;
 }
 
-static void in_evdev_set_blocking(void *drv_data, int y)
+static int in_evdev_update_analog(void *drv_data, int axis_id, int *result)
 {
+       struct input_absinfo ainfo;
        in_evdev_t *dev = drv_data;
-       long flags;
        int ret;
 
-       dev->prev_update = 0;
+       if ((unsigned int)axis_id >= MAX_ABS_DEVS)
+               return -1;
+
+       ret = ioctl(dev->fd, EVIOCGABS(axis_id), &ainfo);
+       if (ret != 0)
+               return ret;
+
+       *result = (ainfo.value + dev->abs_adj[axis_id]) * dev->abs_mult[axis_id];
+       *result >>= 16;
+       return 0;
+}
+
+static int in_evdev_set_blocking(in_evdev_t *dev, int y)
+{
+       long flags;
+       int ret;
 
        flags = (long)fcntl(dev->fd, F_GETFL);
        if ((int)flags == -1) {
                perror("in_evdev: F_GETFL fcntl failed");
-               return;
+               return -1;
        }
+
+       if (flags & O_NONBLOCK) {
+               /* flush the event queue */
+               struct input_event ev;
+               do {
+                       ret = read(dev->fd, &ev, sizeof(ev));
+               }
+               while (ret == sizeof(ev));
+       }
+
        if (y)
                flags &= ~O_NONBLOCK;
        else
                flags |=  O_NONBLOCK;
        ret = fcntl(dev->fd, F_SETFL, flags);
-       if (ret == -1)
+       if (ret == -1) {
                perror("in_evdev: F_SETFL fcntl failed");
+               return -1;
+       }
+
+       return 0;
+}
+
+static int in_evdev_get_config(void *drv_data, int what, int *val)
+{
+       in_evdev_t *dev = drv_data;
+
+       switch (what) {
+       case IN_CFG_ABS_AXIS_COUNT:
+               *val = dev->abs_count;
+               break;
+       default:
+               return -1;
+       }
+
+       return 0;
+}
+
+static int in_evdev_set_config(void *drv_data, int what, int val)
+{
+       in_evdev_t *dev = drv_data;
+       int tmp;
+
+       switch (what) {
+       case IN_CFG_BLOCKING:
+               return in_evdev_set_blocking(dev, val);
+       case IN_CFG_ABS_DEAD_ZONE:
+               if (val < 1 || val > 99 || dev->abs_lzone == 0)
+                       return -1;
+               /* XXX: based on X axis only, for now.. */
+               tmp = (dev->abs_max_x - dev->abs_min_x) / 2;
+               dev->abs_lzone = tmp - tmp * val / 100;
+               if (dev->abs_lzone < 1)
+                       dev->abs_lzone = 1;
+               else if (dev->abs_lzone >= tmp)
+                       dev->abs_lzone = tmp - 1;
+               break;
+       default:
+               return -1;
+       }
+
+       return 0;
 }
 
 static int in_evdev_update_keycode(void *data, int *is_down)
 {
+       int ret_kc = -1, ret_down = 0;
        in_evdev_t *dev = data;
        struct input_event ev;
        int rd;
 
-       if (is_down != NULL)
-               *is_down = 0;
-
+       /* do single event, the caller sometimes wants
+        * to do select() in blocking mode */
        rd = read(dev->fd, &ev, sizeof(ev));
        if (rd < (int) sizeof(ev)) {
                if (errno != EAGAIN) {
                        perror("in_evdev: error reading");
-                       sleep(1);
+                       //sleep(1);
+                       ret_kc = -2;
                }
-               return -1;
+               goto out;
        }
 
        if (ev.type == EV_KEY) {
                if (ev.value < 0 || ev.value > 1)
-                       return -1;
-               if (is_down != NULL)
-                       *is_down = ev.value;
-               return ev.code;
+                       goto out;
+               ret_kc = ev.code;
+               ret_down = ev.value;
+               goto out;
        }
-       else if (ev.type == EV_ABS)
+       else if (ev.type == EV_ABS && dev->abs_to_digital)
        {
-               int down = 0;
-               if (dev->abs_lzone != 0 && ev.code == ABS_X) {
-                       if (ev.value < dev->abs_lzone) {
-                               down = 1;
-                               dev->abs_lastx = KEY_LEFT;
-                       }
-                       else if (ev.value > dev->abs_rzone) {
-                               down = 1;
-                               dev->abs_lastx = KEY_RIGHT;
-                       }
-                       if (is_down != NULL)
-                               *is_down = down;
-                       return dev->abs_lastx;
+               int lzone = dev->abs_lzone, down = 0, *last;
+
+               // map absolute to up/down/left/right
+               if (lzone != 0 && ev.code == ABS_X) {
+                       if (ev.value < dev->abs_min_x + lzone)
+                               down = KEY_LEFT;
+                       else if (ev.value > dev->abs_max_x - lzone)
+                               down = KEY_RIGHT;
+                       last = &dev->abs_lastx;
                }
-               if (dev->abs_tzone != 0 && ev.code == ABS_Y) {
-                       if (ev.value < dev->abs_tzone) {
-                               down = 1;
-                               dev->abs_lasty = KEY_UP;
-                       }
-                       else if (ev.value > dev->abs_bzone) {
-                               down = 1;
-                               dev->abs_lasty = KEY_DOWN;
-                       }
-                       if (is_down != NULL)
-                               *is_down = down;
-                       return dev->abs_lasty;
+               else if (lzone != 0 && ev.code == ABS_Y) {
+                       if (ev.value < dev->abs_min_y + lzone)
+                               down = KEY_UP;
+                       else if (ev.value > dev->abs_max_y - lzone)
+                               down = KEY_DOWN;
+                       last = &dev->abs_lasty;
                }
+               else
+                       goto out;
+
+               if (down == *last)
+                       goto out;
+
+               if (down == 0 || *last != 0) {
+                       /* key up or direction change, return up event for old key */
+                       ret_kc = *last;
+                       ret_down = 0;
+                       *last = 0;
+                       goto out;
+               }
+               ret_kc = *last = down;
+               ret_down = 1;
+               goto out;
        }
 
-       return -1;
-}
-
-static int in_evdev_menu_translate(int keycode)
-{
-       switch (keycode) {
-               case KEY_UP:    return PBTN_UP;
-               case KEY_DOWN:  return PBTN_DOWN;
-               case KEY_LEFT:  return PBTN_LEFT;
-               case KEY_RIGHT: return PBTN_RIGHT;
-               case KEY_ENTER:
-               case BTN_A:
-               case BTN_TRIGGER:
-                       return PBTN_MOK;
-               case KEY_ESC:
-               case BTN_B:
-               case BTN_THUMB:
-                       return PBTN_MBACK;
-               case KEY_MENU:
-                       return PBTN_MENU;
-               case KEY_LEFTBRACE:
-                       return PBTN_L;
-               case KEY_RIGHTBRACE:
-                       return PBTN_R;
-               default:        return 0;
-       }
-}
-
-static int in_evdev_get_key_code(const char *key_name)
-{
-       int i;
-
-       for (i = 0; i < KEY_MAX + 1; i++) {
-               const char *k = in_evdev_keys[i];
-               if (k != NULL && strcasecmp(k, key_name) == 0)
-                       return i;
-       }
-
-       return -1;
-}
+out:
+       if (is_down != NULL)
+               *is_down = ret_down;
 
-static const char *in_evdev_get_key_name(int keycode)
-{
-       const char *name = NULL;
-       if (keycode >= 0 && keycode <= KEY_MAX)
-               name = in_evdev_keys[keycode];
-       if (name == NULL)
-               name = "Unkn";
-       
-       return name;
+       return ret_kc;
 }
 
 static const struct {
-       short code;
-       short bit;
-} in_evdev_def_binds[] =
+       short key;
+       short pbtn;
+} key_pbtn_map[] =
 {
-       /* MXYZ SACB RLDU */
-       { KEY_UP,       0 },
-       { KEY_DOWN,     1 },
-       { KEY_LEFT,     2 },
-       { KEY_RIGHT,    3 },
-       { KEY_S,        4 },    /* B */
-       { BTN_B,        4 },
-       { KEY_D,        5 },    /* C */
-       { BTN_A,        5 },
-       { KEY_A,        6 },    /* A */
-       { BTN_Y,        6 },
-       { KEY_ENTER,    7 },
-       { BTN_START,    7 },
+       { KEY_UP,       PBTN_UP },
+       { KEY_DOWN,     PBTN_DOWN },
+       { KEY_LEFT,     PBTN_LEFT },
+       { KEY_RIGHT,    PBTN_RIGHT },
+       /* XXX: maybe better set this from it's plat code somehow */
+       /* Pandora */
+       { KEY_END,      PBTN_MOK },
+       { KEY_PAGEDOWN, PBTN_MBACK },
+       { KEY_HOME,     PBTN_MA2 },
+       { KEY_PAGEUP,   PBTN_MA3 },
+       { KEY_LEFTCTRL,   PBTN_MENU },
+       { KEY_RIGHTSHIFT, PBTN_L },
+       { KEY_RIGHTCTRL,  PBTN_R },
+       /* Caanoo */
+       { BTN_THUMB2,   PBTN_MOK },
+       { BTN_THUMB,    PBTN_MBACK },
+       { BTN_TRIGGER,  PBTN_MA2 },
+       { BTN_TOP,      PBTN_MA3 },
+       { BTN_BASE,     PBTN_MENU },
+       { BTN_TOP2,     PBTN_L },
+       { BTN_PINKIE,   PBTN_R },
+       /* "normal" keyboards */
+       { KEY_ENTER,    PBTN_MOK },
+       { KEY_ESC,      PBTN_MBACK },
+       { KEY_A,        PBTN_MA2 },
+       { KEY_S,        PBTN_MA3 },
+       { KEY_BACKSLASH,  PBTN_MENU },
+       { KEY_LEFTBRACE,  PBTN_L },
+       { KEY_RIGHTBRACE, PBTN_R },
 };
 
-#define DEF_BIND_COUNT (sizeof(in_evdev_def_binds) / sizeof(in_evdev_def_binds[0]))
+#define KEY_PBTN_MAP_SIZE (sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]))
 
-static void in_evdev_get_def_binds(int *binds)
+static int in_evdev_menu_translate(void *drv_data, int keycode, char *charcode)
 {
+       in_evdev_t *dev = drv_data;
+       int ret = 0;
        int i;
 
-       for (i = 0; i < DEF_BIND_COUNT; i++)
-               binds[in_evdev_def_binds[i].code] = 1 << in_evdev_def_binds[i].bit;
+       if (keycode < 0)
+       {
+               /* menu -> kc */
+               keycode = -keycode;
+               for (i = 0; i < KEY_PBTN_MAP_SIZE; i++)
+                       if (key_pbtn_map[i].pbtn == keycode) {
+                               int k = key_pbtn_map[i].key;
+                               /* should really check EVIOCGBIT, but this is enough for now */
+                               if (dev->kc_first <= k && k <= dev->kc_last)
+                                       return k;
+                       }
+       }
+       else
+       {
+               for (i = 0; i < KEY_PBTN_MAP_SIZE; i++) {
+                       if (key_pbtn_map[i].key == keycode) {
+                               ret = key_pbtn_map[i].pbtn;
+                               break;
+                       }
+               }
+
+               if (charcode != NULL && (unsigned int)keycode < KEY_CNT &&
+                   in_evdev_keys[keycode] != NULL && in_evdev_keys[keycode][1] == 0)
+               {
+                       char c = in_evdev_keys[keycode][0];
+                       if ('A' <= c && c <= 'Z')
+                               c = 'a' + c - 'A';
+                       ret |= PBTN_CHAR;
+                       *charcode = c;
+               }
+       }
+
+       return ret;
 }
 
 /* remove binds of missing keys, count remaining ones */
-static int in_evdev_clean_binds(void *drv_data, int *binds)
+static int in_evdev_clean_binds(void *drv_data, int *binds, int *def_binds)
 {
-       int keybits[(KEY_MAX+1)/sizeof(int)];
+       int keybits[KEY_CNT / sizeof(int)];
        in_evdev_t *dev = drv_data;
-       int i, ret, count = 0;
+       int i, t, ret, offs, count = 0;
 
+       memset(keybits, 0, sizeof(keybits));
        ret = ioctl(dev->fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits);
        if (ret == -1) {
                perror("in_evdev: ioctl failed");
-               memset(keybits, 0xff, sizeof(keybits)); /* mark all as good */
+               // memset(keybits, 0xff, sizeof(keybits)); /* mark all as good */
        }
 
-       if (dev->abs_lzone != 0) {
+       if (dev->abs_to_digital && dev->abs_lzone != 0) {
                KEYBITS_BIT_SET(KEY_LEFT);
                KEYBITS_BIT_SET(KEY_RIGHT);
-       }
-       if (dev->abs_tzone != 0) {
                KEYBITS_BIT_SET(KEY_UP);
                KEYBITS_BIT_SET(KEY_DOWN);
        }
 
-       for (i = 0; i < KEY_MAX + 1; i++) {
-               if (!KEYBITS_BIT(i))
-                       binds[i] = binds[i + KEY_MAX + 1] = 0;
-               if (binds[i])
-                       count++;
+       for (i = 0; i < KEY_CNT; i++) {
+               for (t = 0; t < IN_BINDTYPE_COUNT; t++) {
+                       offs = IN_BIND_OFFS(i, t);
+                       if (!KEYBITS_BIT(i))
+                               binds[offs] = def_binds[offs] = 0;
+                       if (binds[offs])
+                               count++;
+               }
        }
 
        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,
+       .clean_binds    = in_evdev_clean_binds,
+       .get_config     = in_evdev_get_config,
+       .set_config     = in_evdev_set_config,
+       .update         = in_evdev_update,
+       .update_analog  = in_evdev_update_analog,
+       .update_keycode = in_evdev_update_keycode,
+       .menu_translate = in_evdev_menu_translate,
+};
+
+void in_evdev_init(const struct in_default_bind *defbinds)
 {
-       in_drv_t *drv = vdrv;
-
-       drv->prefix = in_evdev_prefix;
-       drv->probe = in_evdev_probe;
-       drv->free = in_evdev_free;
-       drv->get_bind_count = in_evdev_get_bind_count;
-       drv->get_def_binds = in_evdev_get_def_binds;
-       drv->clean_binds = in_evdev_clean_binds;
-       drv->set_blocking = in_evdev_set_blocking;
-       drv->update_keycode = in_evdev_update_keycode;
-       drv->menu_translate = in_evdev_menu_translate;
-       drv->get_key_code = in_evdev_get_key_code;
-       drv->get_key_name = in_evdev_get_key_name;
+       in_register_driver(&in_evdev_drv, defbinds);
 }