Changeset 4bb9fd2 in mainline

Timestamp:

2011-04-12T16:35:19Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8f8f34ad

Parents:

caed7843

Message:

Improved matching of subdrivers.

File:

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

uspace/drv/usbhid/usbhid.c

@@ -238 +238 @@
         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 &&
@@ -254 +257 @@
                 }
                 
+                ids_matched = false;
+                matched = false;
+                
                 if (mapping->vendor_id != 0) {
                         assert(mapping->product_id != 0);
@@ -260 +266 @@
                             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;
                         }
                 }
@@ -271 +275 @@
                         if (usb_hid_path_matches(hid_dev, 
                             mapping->usage_path, mapping->compare)) {
-                                subdrivers[count++] = &mapping->subdriver;
-                        } else {
-                                usb_log_debug("Not matched.\n");
+                                // 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];
         }