Changeset daf199f in mainline

Timestamp:

2013-01-04T14:18:49Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

237df2f

Parents:

b4c1c95

Message:

libusbdev: Drop special handling of multiinterface device match id generation.

Add class matchid even if class is USB_CLASS_USE_INTERFACE.
usbmid match id will handle this.

Location:

uspace

Files:

• drv/bus/usb/usbmid/usbmid.ma (modified) (1 diff)
• lib/usbdev/src/recognise.c (modified) (1 diff)

uspace/drv/bus/usb/usbmid/usbmid.ma

@@ +1 @@
+100 usb&class=use-interface
 100 usb&mid

uspace/lib/usbdev/src/recognise.c

@@ -250 +250 @@
         }       
 
-        /*
-         * If the device class points to interface we skip adding
-         * class directly but we add a multi interface device.
-         */
-        if (device_descriptor->device_class != USB_CLASS_USE_INTERFACE) {
-                ADD_MATCHID_OR_RETURN(matches, 50, "usb&class=%s",
-                    usb_str_class(device_descriptor->device_class));
-        } else {
-                ADD_MATCHID_OR_RETURN(matches, 50, "usb&mid");
-        }
+        /* Class match id */
+        ADD_MATCHID_OR_RETURN(matches, 50, "usb&class=%s",
+            usb_str_class(device_descriptor->device_class));
         
         /* As a last resort, try fallback driver. */