input: support analog read
[libpicofe.git] / common / input.c
index 0ec3fc8..0b1984b 100644 (file)
@@ -1,3 +1,13 @@
+/*
+ * (C) GraÅžvydas "notaz" Ignotas, 2008-2011
+ *
+ * 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.
+ * See the COPYING file in the top-level directory.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -5,9 +15,15 @@
 #include "input.h"
 #include "plat.h"
 #include "lprintf.h"
-#include "../linux/in_evdev.h"
+
+#ifdef IN_GP2X
+#error needs update: in_gp2x_init in_gp2x_update
 #include "../gp2x/in_gp2x.h"
+#endif
+#ifdef IN_VK
+#error needs update: in_vk_init in_vk_update
 #include "../win32/in_vk.h"
+#endif
 
 typedef struct
 {
@@ -17,18 +33,21 @@ typedef struct
        char *name;
        int key_count;
        int *binds;     /* total = key_count * bindtypes * 2 */
-       int probed:1;
-       int does_combos:1;
+       const char * const *key_names;
+       unsigned int probed:1;
+       unsigned int does_combos:1;
 } in_dev_t;
 
-static in_drv_t in_drivers[IN_DRVID_COUNT];
+static in_drv_t *in_drivers;
 static in_dev_t in_devices[IN_MAX_DEVS];
-static int in_dev_count = 0;
+static int in_driver_count = 0;
+static int in_dev_count = 0;           /* probed + bind devices */
 static int in_have_async_devs = 0;
+static int in_probe_dev_id;
 static int menu_key_state = 0;
 static int menu_last_used_dev = 0;
 
-#define DRV(id) in_drivers[(unsigned)(id) < IN_DRVID_COUNT ? (id) : 0]
+#define DRV(id) in_drivers[id]
 
 
 static int *in_alloc_binds(int drv_id, int key_count)
@@ -46,12 +65,17 @@ static int *in_alloc_binds(int drv_id, int key_count)
        return binds;
 }
 
-static void in_free(in_dev_t *dev)
+static void in_unprobe(in_dev_t *dev)
 {
        if (dev->probed)
                DRV(dev->drv_id).free(dev->drv_data);
        dev->probed = 0;
        dev->drv_data = NULL;
+}
+
+static void in_free(in_dev_t *dev)
+{
+       in_unprobe(dev);
        free(dev->name);
        dev->name = NULL;
        free(dev->binds);
@@ -60,8 +84,8 @@ static void in_free(in_dev_t *dev)
 
 /* to be called by drivers
  * async devices must set drv_fd_hnd to -1 */
-void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data,
-               int key_count, int combos)
+void in_register(const char *nname, int drv_fd_hnd, void *drv_data,
+               int key_count, const char * const *key_names, int combos)
 {
        int i, ret, dupe_count = 0, *binds;
        char name[256], *name_end, *tmp;
@@ -101,7 +125,7 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data,
        if (tmp == NULL)
                return;
 
-       binds = in_alloc_binds(drv_id, key_count);
+       binds = in_alloc_binds(in_probe_dev_id, key_count);
        if (binds == NULL) {
                free(tmp);
                return;
@@ -117,12 +141,13 @@ void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data,
 update:
        in_devices[i].probed = 1;
        in_devices[i].does_combos = combos;
-       in_devices[i].drv_id = drv_id;
+       in_devices[i].drv_id = in_probe_dev_id;
        in_devices[i].drv_fd_hnd = drv_fd_hnd;
+       in_devices[i].key_names = key_names;
        in_devices[i].drv_data = drv_data;
 
        if (in_devices[i].binds != NULL) {
-               ret = DRV(drv_id).clean_binds(drv_data, in_devices[i].binds,
+               ret = DRV(in_probe_dev_id).clean_binds(drv_data, in_devices[i].binds,
                        in_devices[i].binds + key_count * IN_BINDTYPE_COUNT);
                if (ret == 0) {
                        /* no useable binds */
@@ -204,11 +229,16 @@ void in_probe(void)
        int i;
 
        in_have_async_devs = 0;
+       menu_key_state = 0;
+       menu_last_used_dev = 0;
+
        for (i = 0; i < in_dev_count; i++)
-               in_devices[i].probed = 0;
+               in_unprobe(&in_devices[i]);
 
-       for (i = 1; i < IN_DRVID_COUNT; i++)
+       for (i = 0; i < in_driver_count; i++) {
+               in_probe_dev_id = i;
                in_drivers[i].probe();
+       }
 
        /* get rid of devs without binds and probes */
        for (i = 0; i < in_dev_count; i++) {
@@ -229,6 +259,8 @@ void in_probe(void)
 
        if (in_have_async_devs)
                lprintf("input: async-only devices detected..\n");
+
+       in_debug_dump();
 }
 
 /* async update */
@@ -238,47 +270,29 @@ int in_update(int *result)
 
        for (i = 0; i < in_dev_count; i++) {
                in_dev_t *dev = &in_devices[i];
-               if (dev->probed && dev->binds != NULL) {
-                       // FIXME: this is stupid, make it indirect
-                       switch (dev->drv_id) {
-#ifdef IN_EVDEV
-                       case IN_DRVID_EVDEV:
-                               ret |= in_evdev_update(dev->drv_data, dev->binds, result);
-                               break;
-#endif
-#ifdef IN_GP2X
-                       case IN_DRVID_GP2X:
-                               ret |= in_gp2x_update(dev->drv_data, dev->binds, result);
-                               break;
-#endif
-                       case IN_DRVID_VK:
-                               ret |= in_vk_update(dev->drv_data, dev->binds, result);
-                               break;
-                       }
-               }
+               if (dev->probed && dev->binds != NULL)
+                       ret |= DRV(dev->drv_id).update(dev->drv_data, dev->binds, result);
        }
 
        return ret;
 }
 
-void in_set_blocking(int is_blocking)
+static in_dev_t *get_dev(int dev_id)
 {
-       int i, ret;
+       if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
+               return NULL;
 
-       /* have_async_devs means we will have to do all reads async anyway.. */
-       if (!in_have_async_devs) {
-               for (i = 0; i < in_dev_count; i++) {
-                       if (in_devices[i].probed)
-                               DRV(in_devices[i].drv_id).set_blocking(in_devices[i].drv_data, is_blocking);
-               }
-       }
+       return &in_devices[dev_id];
+}
 
-       menu_key_state = 0;
+int in_update_analog(int dev_id, int axis_id, int *result)
+{
+       in_dev_t *dev = get_dev(dev_id);
 
-       /* flush events */
-       do {
-               ret = in_update_keycode(NULL, NULL, 0);
-       } while (ret >= 0);
+       if (dev == NULL || !dev->probed)
+               return -1;
+
+       return DRV(dev->drv_id).update_analog(dev->drv_data, axis_id, result);
 }
 
 static int in_update_kc_async(int *dev_id_out, int *is_down_out, int timeout_ms)
@@ -362,12 +376,15 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms)
 
                drv = &DRV(in_devices[dev_id].drv_id);
                result = drv->update_keycode(in_devices[dev_id].drv_data, &is_down);
-
-               /* update_keycode() might return -1 when some not interesting
-                * event happened, like sync event for evdev. */
                if (result >= 0)
                        break;
 
+               if (result == -2) {
+                       lprintf("input: \"%s\" errored out, removing.\n", in_devices[dev_id].name);
+                       in_unprobe(&in_devices[dev_id]);
+                       break;
+               }
+
                if (timeout_ms >= 0) {
                        unsigned int ticks2 = plat_get_ticks_ms();
                        timeout_ms -= ticks2 - ticks;
@@ -377,12 +394,12 @@ int in_update_keycode(int *dev_id_out, int *is_down_out, int timeout_ms)
                }
        }
 
-       if (result == -1)
+       if (result < 0)
                return -1;
 finish:
        /* keep track of menu key state, to allow mixing
         * in_update_keycode() and in_menu_wait_any() calls */
-       result_menu = drv->menu_translate(result);
+       result_menu = drv->menu_translate(in_devices[dev_id].drv_data, result);
        if (result_menu != 0) {
                if (is_down)
                        menu_key_state |=  result_menu;
@@ -407,16 +424,13 @@ int in_menu_wait_any(int timeout_ms)
                int code, is_down = 0, dev_id = 0;
 
                code = in_update_keycode(&dev_id, &is_down, timeout_ms);
-               if (code >= 0)
-                       code = DRV(in_devices[dev_id].drv_id).menu_translate(code);
-
-               if (timeout_ms >= 0)
-                       break;
                if (code < 0)
-                       continue;
-               menu_last_used_dev = dev_id;
-               if (keys_old != menu_key_state)
                        break;
+
+               if (keys_old != menu_key_state) {
+                       menu_last_used_dev = dev_id;
+                       break;
+               }
        }
 
        return menu_key_state;
@@ -457,46 +471,113 @@ int in_menu_wait(int interesting, int autorep_delay_ms)
 
 const int *in_get_dev_binds(int dev_id)
 {
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
-               return NULL;
+       in_dev_t *dev = get_dev(dev_id);
 
-       return in_devices[dev_id].binds;
+       return dev ? dev->binds : NULL;
 }
 
 const int *in_get_dev_def_binds(int dev_id)
 {
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
+       in_dev_t *dev = get_dev(dev_id);
+       if (dev == NULL)
                return NULL;
 
-       return in_devices[dev_id].binds + in_devices[dev_id].key_count * IN_BINDTYPE_COUNT;
+       return dev->binds + dev->key_count * IN_BINDTYPE_COUNT;
 }
 
-int in_get_dev_info(int dev_id, int what)
+int in_get_config(int dev_id, int what, void *val)
 {
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
-               return 0;
+       int *ival = val;
+       in_dev_t *dev;
+
+       dev = get_dev(dev_id);
+       if (dev == NULL || val == NULL)
+               return -1;
 
        switch (what) {
-       case IN_INFO_BIND_COUNT:
-               return in_devices[dev_id].key_count;
-       case IN_INFO_DOES_COMBOS:
-               return in_devices[dev_id].does_combos;
+       case IN_CFG_BIND_COUNT:
+               *ival = dev->key_count;
+               break;
+       case IN_CFG_DOES_COMBOS:
+               *ival = dev->does_combos;
+               break;
+       case IN_CFG_BLOCKING:
+       case IN_CFG_KEY_NAMES:
+               return -1; /* not implemented */
+       default:
+               return DRV(dev->drv_id).get_config(dev->drv_data, what, ival);
        }
 
        return 0;
 }
 
+static int in_set_blocking(int is_blocking)
+{
+       int i, ret;
+
+       /* have_async_devs means we will have to do all reads async anyway.. */
+       if (!in_have_async_devs) {
+               for (i = 0; i < in_dev_count; i++) {
+                       if (in_devices[i].probed)
+                               DRV(in_devices[i].drv_id).set_config(in_devices[i].drv_data,
+                                                                    IN_CFG_BLOCKING, is_blocking);
+               }
+       }
+
+       menu_key_state = 0;
+
+       /* flush events */
+       do {
+               ret = in_update_keycode(NULL, NULL, 0);
+       } while (ret >= 0);
+
+       return 0;
+}
+
+int in_set_config(int dev_id, int what, const void *val, int size)
+{
+       const int *ival = val;
+       in_dev_t *dev;
+
+       if (what == IN_CFG_BLOCKING)
+               return in_set_blocking(*ival);
+
+       dev = get_dev(dev_id);
+       if (dev == NULL)
+               return -1;
+
+       if (what == IN_CFG_KEY_NAMES) {
+               const char * const *names = val;
+               int count = size / sizeof(names[0]);
+
+               if (count < dev->key_count) {
+                       lprintf("input: set_key_names: not enough keys\n");
+                       return -1;
+               }
+
+               dev->key_names = names;
+               return 0;
+       }
+
+       if (dev->probed)
+               return DRV(dev->drv_id).set_config(dev->drv_data, what, *ival);
+
+       return -1;
+}
+
 const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix)
 {
        const char *name, *tmp;
+       in_dev_t *dev;
 
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
+       dev = get_dev(dev_id);
+       if (dev == NULL)
                return NULL;
 
-       if (must_be_active && !in_devices[dev_id].probed)
+       if (must_be_active && !dev->probed)
                return NULL;
 
-       name = in_devices[dev_id].name;
+       name = dev->name;
        if (name == NULL || !skip_pfix)
                return name;
 
@@ -508,22 +589,48 @@ const char *in_get_dev_name(int dev_id, int must_be_active, int skip_pfix)
        return name;
 }
 
+int in_name_to_id(const char *dev_name)
+{
+       int i;
+
+       for (i = 0; i < in_dev_count; i++)
+               if (strcmp(dev_name, in_devices[i].name) == 0)
+                       break;
+
+       if (i >= in_dev_count) {
+               lprintf("input: in_name_to_id: no such device: %s\n", dev_name);
+               return -1;
+       }
+
+       return i;
+}
+
 /* never returns NULL */
 const char *in_get_key_name(int dev_id, int keycode)
 {
+       const char *name = NULL;
        static char xname[16];
-       const char *name;
+       in_drv_t *drv;
+       in_dev_t *dev;
 
        if (dev_id < 0)         /* want last used dev? */
                dev_id = menu_last_used_dev;
 
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS)
+       dev = get_dev(dev_id);
+       if (dev == NULL)
                return "Unkn0";
 
+       drv = &DRV(dev->drv_id);
        if (keycode < 0)        /* want name for menu key? */
-               keycode = DRV(in_devices[dev_id].drv_id).menu_translate(keycode);
+               keycode = drv->menu_translate(dev->drv_data, keycode);
+
+       if (dev->key_names != NULL && 0 <= keycode && keycode < dev->key_count)
+               name = dev->key_names[keycode];
+       if (name != NULL)
+               return name;
 
-       name = DRV(in_devices[dev_id].drv_id).get_key_name(keycode);
+       if (drv->get_key_name != NULL)
+               name = drv->get_key_name(keycode);
        if (name != NULL)
                return name;
 
@@ -536,15 +643,37 @@ const char *in_get_key_name(int dev_id, int keycode)
        return xname;
 }
 
+int in_get_key_code(int dev_id, const char *key_name)
+{
+       in_dev_t *dev;
+       int i;
+
+       if (dev_id < 0)         /* want last used dev? */
+               dev_id = menu_last_used_dev;
+
+       dev = get_dev(dev_id);
+       if (dev == NULL)
+               return -1;
+
+       if (dev->key_names == NULL)
+               return -1;
+
+       for (i = 0; i < dev->key_count; i++)
+               if (dev->key_names[i] && strcasecmp(dev->key_names[i], key_name) == 0)
+                       return i;
+
+       return -1;
+}
+
 int in_bind_key(int dev_id, int keycode, int mask, int bind_type, int force_unbind)
 {
        int ret, count;
        in_dev_t *dev;
 
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
+       dev = get_dev(dev_id);
+       if (dev == NULL || bind_type >= IN_BINDTYPE_COUNT)
                return -1;
 
-       dev = &in_devices[dev_id];
        count = dev->key_count;
 
        if (dev->binds == NULL) {
@@ -573,22 +702,39 @@ int in_bind_key(int dev_id, int keycode, int mask, int bind_type, int force_unbi
        return 0;
 }
 
-void in_unbind_all(int dev_id, int act_mask, int bind_type)
+/*
+ * Unbind act_mask on binds with type bind_type
+ * - if dev_id_ < 0, affects all devices
+ *   else only affects dev_id_
+ * - if act_mask == -1, unbind all keys
+ *   else only actions in mask
+ */
+void in_unbind_all(int dev_id_, int act_mask, int bind_type)
 {
+       int dev_id = 0, dev_last = IN_MAX_DEVS - 1;
        int i, count;
        in_dev_t *dev;
 
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
+       if (dev_id_ >= 0)
+               dev_id = dev_last = dev_id_;
+
+       if (bind_type >= IN_BINDTYPE_COUNT)
                return;
 
-       dev = &in_devices[dev_id];
-       count = dev->key_count;
+       for (; dev_id <= dev_last; dev_id++) {
+               dev = &in_devices[dev_id];
+               count = dev->key_count;
 
-       if (dev->binds == NULL)
-               return;
+               if (dev->binds == NULL)
+                       continue;
 
-       for (i = 0; i < count; i++)
-               dev->binds[IN_BIND_OFFS(i, bind_type)] &= ~act_mask;
+               if (act_mask != -1) {
+                       for (i = 0; i < count; i++)
+                               dev->binds[IN_BIND_OFFS(i, bind_type)] &= ~act_mask;
+               }
+               else
+                       memset(dev->binds, 0, sizeof(dev->binds[0]) * count * IN_BINDTYPE_COUNT);
+       }
 }
 
 /* returns device id, or -1 on error */
@@ -596,7 +742,7 @@ int in_config_parse_dev(const char *name)
 {
        int drv_id = -1, i;
 
-       for (i = 0; i < IN_DRVID_COUNT; i++) {
+       for (i = 0; i < in_driver_count; i++) {
                int len = strlen(in_drivers[i].prefix);
                if (strncmp(name, in_drivers[i].prefix, len) == 0) {
                        drv_id = i;
@@ -634,7 +780,7 @@ int in_config_parse_dev(const char *name)
        if (in_devices[i].name == NULL)
                return -1;
 
-       in_devices[i].key_count = DRV(drv_id).get_bind_count();
+       in_devices[i].key_names = DRV(drv_id).get_key_names(&in_devices[i].key_count);
        in_devices[i].drv_id = drv_id;
 
        if (i + 1 > in_dev_count)
@@ -643,40 +789,14 @@ int in_config_parse_dev(const char *name)
        return i;
 }
 
-/*
- * To reduce size of game specific configs, default binds are not saved.
- * So we mark default binds in in_config_start(), override them in in_config_bind_key(),
- * and restore whatever default binds are left in in_config_end().
- */
-void in_config_start(void)
-{
-       int i;
-
-       /* mark all default binds, so they get overwritten by func below */
-       for (i = 0; i < IN_MAX_DEVS; i++) {
-               int n, count, *binds, *def_binds;
-
-               binds = in_devices[i].binds;
-               if (binds == NULL)
-                       continue;
-
-               count = in_devices[i].key_count;
-               def_binds = binds + count * IN_BINDTYPE_COUNT;
-
-               for (n = 0; n < count * IN_BINDTYPE_COUNT; n++)
-                       if (binds[n] == def_binds[n])
-                               binds[n] = -1;
-       }
-}
-
 int in_config_bind_key(int dev_id, const char *key, int acts, int bind_type)
 {
        in_dev_t *dev;
        int i, offs, kc;
 
-       if (dev_id < 0 || dev_id >= IN_MAX_DEVS || bind_type >= IN_BINDTYPE_COUNT)
+       dev = get_dev(dev_id);
+       if (dev == NULL || bind_type >= IN_BINDTYPE_COUNT)
                return -1;
-       dev = &in_devices[dev_id];
 
        /* maybe a raw code? */
        if (key[0] == '\\' && key[1] == 'x') {
@@ -691,10 +811,21 @@ int in_config_bind_key(int dev_id, const char *key, int acts, int bind_type)
                        dev->binds = in_alloc_binds(dev->drv_id, dev->key_count);
                        if (dev->binds == NULL)
                                return -1;
-                       in_config_start();
                }
 
-               kc = DRV(dev->drv_id).get_key_code(key);
+               kc = -1;
+               if (dev->key_names != NULL) {
+                       for (i = 0; i < dev->key_count; i++) {
+                               const char *k = dev->key_names[i];
+                               if (k != NULL && strcasecmp(k, key) == 0) {
+                                       kc = i;
+                                       break;
+                               }
+                       }
+               }
+
+               if (kc < 0)
+                       kc = DRV(dev->drv_id).get_key_code(key);
                if (kc < 0 && strlen(key) == 1) {
                        /* assume scancode */
                        kc = key[0];
@@ -719,37 +850,21 @@ int in_config_bind_key(int dev_id, const char *key, int acts, int bind_type)
        return 0;
 }
 
-void in_config_end(void)
+void in_clean_binds(void)
 {
        int i;
 
        for (i = 0; i < IN_MAX_DEVS; i++) {
-               int n, t, ret, count, *binds, *def_binds;
+               int ret, count, *binds, *def_binds;
                in_dev_t *dev = &in_devices[i];
 
-               if (dev->binds == NULL)
+               if (dev->binds == NULL || dev->drv_data == NULL)
                        continue;
 
                count = dev->key_count;
                binds = dev->binds;
                def_binds = binds + count * IN_BINDTYPE_COUNT;
 
-               for (n = 0; n < count; n++) {
-                       int is_default = 1;
-                       for (t = 0; t < IN_BINDTYPE_COUNT; t++)
-                               if (binds[IN_BIND_OFFS(n, t)] == -1)
-                                       binds[IN_BIND_OFFS(n, t)] = 0;
-                               else
-                                       is_default = 0;
-
-                       if (is_default)
-                               for (t = 0; t < IN_BINDTYPE_COUNT; t++)
-                                       binds[IN_BIND_OFFS(n, t)] = def_binds[IN_BIND_OFFS(n, t)];
-               }
-
-               if (dev->drv_data == NULL)
-                       continue;
-
                ret = DRV(dev->drv_id).clean_binds(dev->drv_data, binds, def_binds);
                if (ret == 0) {
                        /* no useable binds */
@@ -773,48 +888,58 @@ void in_debug_dump(void)
        }
 }
 
-/* handlers for unknown/not_preset drivers */
+/* stubs for drivers that choose not to implement something */
 
-static void in_def_probe(void) {}
 static void in_def_free(void *drv_data) {}
-static int  in_def_get_bind_count(void) { return 0; }
 static void in_def_get_def_binds(int *binds) {}
-static int  in_def_clean_binds(void *drv_data, int *b, int *db) { return 0; }
-static void in_def_set_blocking(void *data, int y) {}
+static int  in_def_clean_binds(void *drv_data, int *b, int *db) { return 1; }
+static int  in_def_get_config(void *drv_data, int what, int *val) { return -1; }
+static int  in_def_set_config(void *drv_data, int what, int val) { return -1; }
+static int  in_def_update_analog(void *drv_data, int axis_id, int *result) { return -1; }
 static int  in_def_update_keycode(void *drv_data, int *is_down) { return 0; }
-static int  in_def_menu_translate(int keycode) { return keycode; }
-static int  in_def_get_key_code(const char *key_name) { return 0; }
+static int  in_def_menu_translate(void *drv_data, int keycode) { return 0; }
+static int  in_def_get_key_code(const char *key_name) { return -1; }
 static const char *in_def_get_key_name(int keycode) { return NULL; }
 
-void in_init(void)
-{
-       int i;
+#define CHECK_ADD_STUB(d, f) \
+       if (d.f == NULL) d.f = in_def_##f
 
-       memset(in_drivers, 0, sizeof(in_drivers));
-       memset(in_devices, 0, sizeof(in_devices));
-       in_dev_count = 0;
+/* to be called by drivers */
+int in_register_driver(const in_drv_t *drv)
+{
+       int count_new = in_driver_count + 1;
+       in_drv_t *new_drivers;
 
-       for (i = 0; i < IN_DRVID_COUNT; i++) {
-               in_drivers[i].prefix = "none:";
-               in_drivers[i].probe = in_def_probe;
-               in_drivers[i].free = in_def_free;
-               in_drivers[i].get_bind_count = in_def_get_bind_count;
-               in_drivers[i].get_def_binds = in_def_get_def_binds;
-               in_drivers[i].clean_binds = in_def_clean_binds;
-               in_drivers[i].set_blocking = in_def_set_blocking;
-               in_drivers[i].update_keycode = in_def_update_keycode;
-               in_drivers[i].menu_translate = in_def_menu_translate;
-               in_drivers[i].get_key_code = in_def_get_key_code;
-               in_drivers[i].get_key_name = in_def_get_key_name;
+       new_drivers = realloc(in_drivers, count_new * sizeof(in_drivers[0]));
+       if (new_drivers == NULL) {
+               lprintf("input: in_register_driver OOM\n");
+               return -1;
        }
 
-#ifdef IN_GP2X
-       in_gp2x_init(&in_drivers[IN_DRVID_GP2X]);
-#endif
-#ifdef IN_EVDEV
-       in_evdev_init(&in_drivers[IN_DRVID_EVDEV]);
-#endif
-       in_vk_init(&in_drivers[IN_DRVID_VK]);
+       memcpy(&new_drivers[in_driver_count], drv, sizeof(new_drivers[0]));
+
+       CHECK_ADD_STUB(new_drivers[in_driver_count], free);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], get_def_binds);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], clean_binds);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], get_config);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], set_config);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], update_analog);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], update_keycode);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], menu_translate);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], get_key_code);
+       CHECK_ADD_STUB(new_drivers[in_driver_count], get_key_name);
+       in_drivers = new_drivers;
+       in_driver_count = count_new;
+
+       return 0;
+}
+
+void in_init(void)
+{
+       in_drivers = NULL;
+       memset(in_devices, 0, sizeof(in_devices));
+       in_driver_count = 0;
+       in_dev_count = 0;
 }
 
 #if 0