Changeset 78bfae9 in mainline for uspace/drv/usbhid/usbhid.c

Timestamp:

2011-05-17T22:28:03Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

df44fa2

Parents:

4880210

Message:

Running generic HID driver for each device

File:

• uspace/drv/usbhid/usbhid.c (modified) (2 diffs)

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;