input: allow several probe calls for rescan

[libpicofe.git] / common / input.c

diff --git a/common/input.c b/common/input.c
index 7bbb39c..c5130c4 100644 (file)
--- a/common/input.c
+++ b/common/input.c
@@ -223,8 +223,14 @@ void in_probe(void)
        int i;
 
        in_have_async_devs = 0;
-       for (i = 0; i < in_dev_count; i++)
-               in_devices[i].probed = 0;
+       for (i = 0; i < in_dev_count; i++) {
+               in_dev_t *dev = &in_devices[i];
+               if (dev->probed) {
+                       DRV(dev->drv_id).free(dev->drv_data);
+                       dev->drv_data = NULL;
+                       dev->probed = 0;
+               }
+       }
 
        for (i = 1; i < IN_DRVID_COUNT; i++)
                in_drivers[i].probe();
@@ -677,22 +683,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 */