Changeset 945d66c in mainline for uspace/drv/bus/usb

Timestamp:

2013-01-25T22:55:22Z (13 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.

Location:

uspace/drv/bus/usb

Files:

• usbhid/usbhid.c (modified) (1 diff)
• usbmid/explore.c (modified) (3 diffs)

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);
 }
 

uspace/drv/bus/usb/usbmid/explore.c

@@ -118 +118 @@
                 usbmid_interface_t *iface = NULL;
                 const int rc = usbmid_spawn_interface_child(usb_dev, &iface,
-                    &usb_dev->descriptors.device, interface);
+                        usb_device_get_device_descriptor(usb_dev), interface);
                 if (rc != EOK) {
                         //TODO: Do something about that failure.
@@ -142 +142 @@
 int usbmid_explore_device(usb_device_t *dev)
 {
-        const unsigned dev_class = dev->descriptors.device.device_class;
+        const unsigned dev_class =
+            usb_device_get_device_descriptor(dev)->device_class;
         if (dev_class != USB_CLASS_USE_INTERFACE) {
                 usb_log_warning(
@@ -152 +153 @@
         }
 
-        /* Shortcuts to save on typing ;-). */
-        const void *config_descriptor_raw = dev->descriptors.configuration;
-        size_t config_descriptor_size = dev->descriptors.configuration_size;
+        /* Get coonfiguration descriptor. */
+        size_t config_descriptor_size = 0;
+        const void *config_descriptor_raw =
+            usb_device_get_configuration_descriptor(dev,
+            &config_descriptor_size);
         const usb_standard_configuration_descriptor_t *config_descriptor =
             config_descriptor_raw;