Changeset 945d66c in mainline for uspace/drv/bus/usb/usbhid/usbhid.c

Timestamp:

2013-01-25T22:55:22Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9e79a2f

Parents:

c39e9fb

Message:

libusbdev: Don't use the descriptor field directly.

Make descriptor handling functions static.

File:

• uspace/drv/bus/usb/usbhid/usbhid.c (modified) (1 diff)

uspace/drv/bus/usb/usbhid/usbhid.c

@@ -114 +114 @@
     const usb_hid_subdriver_mapping_t *mapping)
 {
-        assert(hid_dev != NULL);
-        assert(hid_dev->usb_dev != NULL);
-
-        return (hid_dev->usb_dev->descriptors.device.vendor_id
-            == mapping->vendor_id
-            && hid_dev->usb_dev->descriptors.device.product_id
-            == mapping->product_id);
+        assert(hid_dev);
+        assert(hid_dev->usb_dev);
+        assert(mapping);
+        const usb_standard_device_descriptor_t *d =
+            usb_device_get_device_descriptor(hid_dev->usb_dev);
+
+        return (d->vendor_id == mapping->vendor_id)
+            && (d->product_id == mapping->product_id);
 }