Changes in uspace/drv/usbhid/usbhid.c [78bfae9:faa44e58] in mainline

File:

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

uspace/drv/usbhid/usbhid.c

@@ -37 +37 @@
 #include <usb/debug.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
-#include <usb/classes/hidparser.h>
-#include <usb/classes/hidreport.h>
-#include <usb/classes/hidreq.h>
+#include <usb/hid/hid.h>
+#include <usb/hid/hidparser.h>
+#include <usb/hid/hidreport.h>
+#include <usb/hid/request.h>
 #include <errno.h>
 #include <str_error.h>
@@ -203 +203 @@
         
         usb_log_debug("Compare flags: %d\n", mapping->compare);
-//      size_t size = usb_hid_report_size(hid_dev->report, 0, 
-//          USB_HID_REPORT_TYPE_INPUT);
-        size_t size = 0;
-        usb_hid_report_field_t *field = usb_hid_report_get_sibling (hid_dev->report,
-                NULL, usage_path, mapping->compare, USB_HID_REPORT_TYPE_INPUT);
-        while(field != NULL) {
-                size++;
-                field = usb_hid_report_get_sibling (hid_dev->report,
-                                        field, usage_path, mapping->compare, 
-                            USB_HID_REPORT_TYPE_INPUT);
-        }
-        
+        size_t size = usb_hid_report_input_length(hid_dev->report, usage_path, 
+            mapping->compare);
         usb_log_debug("Size of the input report: %zuB\n", size);
+        
         usb_hid_report_path_free(usage_path);
         
@@ -234 +225 @@
         }
         
-        // add one generic HID subdriver per device
-        
-        hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc((count + 1) * 
+        hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(count * 
             sizeof(usb_hid_subdriver_t));
         if (hid_dev->subdrivers == NULL) {
@@ -249 +238 @@
         }
         
-        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;
+        hid_dev->subdriver_count = count;
         
         return EOK;
@@ -473 +457 @@
                         if (hid_dev->subdrivers[i].init != NULL) {
                                 usb_log_debug("Initializing subdriver %d.\n",i);
-                                rc = hid_dev->subdrivers[i].init(hid_dev,
-                                    &hid_dev->subdrivers[i].data);
+                                rc = hid_dev->subdrivers[i].init(hid_dev);
                                 if (rc != EOK) {
                                         usb_log_warning("Failed to initialize"
@@ -539 +522 @@
         for (i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].poll != NULL
-                    && hid_dev->subdrivers[i].poll(hid_dev, 
-                        hid_dev->subdrivers[i].data, buffer, buffer_size)) {
+                    && hid_dev->subdrivers[i].poll(hid_dev, buffer, 
+                    buffer_size)) {
                         cont = true;
                 }
@@ -563 +546 @@
         for (i = 0; i < hid_dev->subdriver_count; ++i) {
                 if (hid_dev->subdrivers[i].poll_end != NULL) {
-                        hid_dev->subdrivers[i].poll_end(hid_dev,
-                            hid_dev->subdrivers[i].data, reason);
+                        hid_dev->subdrivers[i].poll_end(hid_dev, reason);
                 }
         }
@@ -645 +627 @@
         for (i = 0; i < (*hid_dev)->subdriver_count; ++i) {
                 if ((*hid_dev)->subdrivers[i].deinit != NULL) {
-                        (*hid_dev)->subdrivers[i].deinit(*hid_dev,
-                            (*hid_dev)->subdrivers[i].data);
+                        (*hid_dev)->subdrivers[i].deinit(*hid_dev);
                 }
         }