Changes in / [7941bd6:d09f3720] in mainline

Location:

uspace/drv/usbhid

Files:

• subdrivers.c (modified) (4 diffs)
• usbhid.c (modified) (2 diffs)

uspace/drv/usbhid/subdrivers.c

@@ -38 +38 @@
 #include <usb/hid/hidpath.h>
 
-//#include "lgtch-ultrax/lgtch-ultrax.h"
 #include "multimedia/multimedia.h"
 #include "mouse/mousedev.h"
+#include "generic/hiddev.h"
 
 static usb_hid_subdriver_usage_t path_kbd[] = {
@@ -58 +58 @@
 };
 
+static usb_hid_subdriver_usage_t generic_hid_key_path[] = {
+        {0, 0}
+};
+
 const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
         {
                 path_kbd,
-                -1,
+                0,
                 USB_HID_PATH_COMPARE_BEGIN,
                 -1,
@@ -88 +92 @@
         {
                 path_mouse,
-                -1,
+                0,
                 USB_HID_PATH_COMPARE_BEGIN,
                 -1,
@@ -99 +103 @@
                 }
         },
+        {
+                generic_hid_key_path,
+                0,
+                USB_HID_PATH_COMPARE_ANYWHERE,
+                -1,
+                -1,
+                {
+                        .init = usb_generic_hid_init,
+                        .deinit = NULL,
+                        .poll = usb_generic_hid_polling_callback,
+                        .poll_end = NULL
+                }
+        },
         {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL, NULL}}
 };

uspace/drv/usbhid/usbhid.c

@@ -234 +234 @@
         }
         
-        hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(count * 
+        // add one generic HID subdriver per device
+        
+        hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc((count + 1) * 
             sizeof(usb_hid_subdriver_t));
         if (hid_dev->subdrivers == NULL) {
@@ -247 +249 @@
         }
         
-        hid_dev->subdriver_count = count;
+        hid_dev->subdrivers[count].init = usb_generic_hid_init;
+        hid_dev->subdrivers[count].poll = usb_generic_hid_polling_callback;
+        hid_dev->subdrivers[count].deinit = NULL;
+        hid_dev->subdrivers[count].poll_end = NULL;
+        
+        hid_dev->subdriver_count = count + 1;
         
         return EOK;