Changes in uspace/drv/usbhid/usbhid.c [aaf6155:e3b5129] in mainline

File:

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

uspace/drv/usbhid/usbhid.c

@@ -67 +67 @@
 static int usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev)
 {
-        assert(hid_dev->subdriver_count == 0);
+        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
         
         hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
@@ -97 +97 @@
 static int usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev)
 {
-        assert(hid_dev->subdriver_count == 0);
+        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
         
         hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
@@ -127 +127 @@
 static int usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev)
 {
-        assert(hid_dev->subdriver_count == 0);
+        assert(hid_dev != NULL && hid_dev->subdriver_count == 0);
         
         hid_dev->subdrivers = (usb_hid_subdriver_t *)malloc(
@@ -164 +164 @@
 
 static bool usb_hid_path_matches(usb_hid_dev_t *hid_dev, 
-    const usb_hid_subdriver_usage_t *path, int path_size, int compare)
+    const usb_hid_subdriver_mapping_t *mapping)
 {
         assert(hid_dev != NULL);
-        assert(path != NULL);
+        assert(mapping != NULL);
         
         usb_hid_report_path_t *usage_path = usb_hid_report_path();
@@ -174 +174 @@
                 return false;
         }
-        int i;
-        for (i = 0; i < path_size; ++i) {
+        int i = 0;
+        while (mapping->usage_path[i].usage != 0 
+            || mapping->usage_path[i].usage_page != 0) {
                 if (usb_hid_report_path_append_item(usage_path, 
-                    path[i].usage_page, path[i].usage) != EOK) {
+                    mapping->usage_path[i].usage_page, 
+                    mapping->usage_path[i].usage) != EOK) {
                         usb_log_debug("Failed to append to usage path.\n");
                         usb_hid_report_path_free(usage_path);
                         return false;
                 }
+                ++i;
+        }
+        
+        if (mapping->report_id >= 0) {
+                usb_hid_report_path_set_report_id(usage_path, 
+                    mapping->report_id);
         }
         
         assert(hid_dev->parser != NULL);
         
-        usb_log_debug("Compare flags: %d\n", compare);
+        usb_log_debug("Compare flags: %d\n", mapping->compare);
         size_t size = usb_hid_report_input_length(hid_dev->parser, usage_path, 
-            compare);
+            mapping->compare);
         usb_log_debug("Size of the input report: %d\n", size);
         
@@ -231 +239 @@
 static int usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev)
 {
+        assert(hid_dev != NULL);
+        
         const usb_hid_subdriver_t *subdrivers[USB_HID_MAX_SUBDRIVERS];
         
         int i = 0, count = 0;
         const usb_hid_subdriver_mapping_t *mapping = &usb_hid_subdrivers[i];
+
+        bool ids_matched;
+        bool matched;
         
         while (count < USB_HID_MAX_SUBDRIVERS &&
             (mapping->usage_path != NULL
-            || mapping->vendor_id != NULL
-            || mapping->product_id != NULL)) {
+            || mapping->vendor_id != 0 || mapping->product_id != 0)) {
                 // check the vendor & product ID
-                if (mapping->vendor_id != NULL && mapping->product_id == NULL) {
-                        usb_log_warning("Missing Product ID for Vendor ID %s\n",
+                if (mapping->vendor_id != 0 && mapping->product_id == 0) {
+                        usb_log_warning("Missing Product ID for Vendor ID %u\n",
                             mapping->vendor_id);
                         return EINVAL;
                 }
-                if (mapping->product_id != NULL && mapping->vendor_id == NULL) {
-                        usb_log_warning("Missing Vendor ID for Product ID %s\n",
+                if (mapping->product_id != 0 && mapping->vendor_id == 0) {
+                        usb_log_warning("Missing Vendor ID for Product ID %u\n",
                             mapping->product_id);
                         return EINVAL;
                 }
                 
-                if (mapping->vendor_id != NULL) {
-                        assert(mapping->product_id != NULL);
-                        usb_log_debug("Comparing device against vendor ID %s"
-                            " and product ID %s.\n", mapping->vendor_id,
+                ids_matched = false;
+                matched = false;
+                
+                if (mapping->vendor_id != 0) {
+                        assert(mapping->product_id != 0);
+                        usb_log_debug("Comparing device against vendor ID %u"
+                            " and product ID %u.\n", mapping->vendor_id,
                             mapping->product_id);
                         if (usb_hid_ids_match(hid_dev, mapping)) {
-                                usb_log_debug("Matched.\n");
-                                subdrivers[count++] = &mapping->subdriver;
-                                // skip the checking of usage path
-                                goto next;
+                                usb_log_debug("IDs matched.\n");
+                                ids_matched = true;
                         }
                 }
@@ -267 +280 @@
                 if (mapping->usage_path != NULL) {
                         usb_log_debug("Comparing device against usage path.\n");
-                        if (usb_hid_path_matches(hid_dev, 
-                            mapping->usage_path, mapping->path_size,
-                            mapping->compare)) {
-                                subdrivers[count++] = &mapping->subdriver;
-                        } else {
-                                usb_log_debug("Not matched.\n");
+                        if (usb_hid_path_matches(hid_dev, mapping)) {
+                                // does not matter if IDs were matched
+                                matched = true;
                         }
-                }
-        next:
+                } else {
+                        // matched only if IDs were matched and there is no path
+                        matched = ids_matched;
+                }
+                
+                if (matched) {
+                        subdrivers[count++] = &mapping->subdriver;
+                }
+                
                 mapping = &usb_hid_subdrivers[++i];
         }
@@ -287 +304 @@
 static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
 {
+        assert(hid_dev != NULL && dev != NULL);
+        
         int rc = EOK;
         
@@ -360 +379 @@
         rc = usb_hid_check_pipes(hid_dev, dev);
         if (rc != EOK) {
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -368 +387 @@
         if (rc != EOK) {
                 usb_log_error("Failed to initialize report parser.\n");
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
                 return rc;
         }
@@ -386 +405 @@
                             " device.\n");
                         fallback = true;
-                        assert(hid_dev->subdrivers == NULL);
-                        assert(hid_dev->subdriver_count == 0);
                 }
         } else {
@@ -428 +445 @@
                 usb_log_error("No subdriver for handling this device could be"
                     " initialized: %s.\n", str_error(rc));
-                usb_log_debug("Subdriver count: %d\n", 
-                    hid_dev->subdriver_count);
-                //usb_hid_free(&hid_dev);
+                usb_hid_free(&hid_dev);
         } else {
                 bool ok = false;
@@ -554 +569 @@
         }
         
-        usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 
-            (*hid_dev)->subdrivers, (*hid_dev)->subdriver_count);
-        
         assert((*hid_dev)->subdrivers != NULL 
             || (*hid_dev)->subdriver_count == 0);