Changeset 8b68bdf in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2013-01-27T00:42:35Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fd9b3a67

Parents:

35bc430

Message:

usbhub, libusbhid: Forgotten conversions to usb_device wrappers.

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -359 +359 @@
         /* Get number of possible configurations from device descriptor */
         const size_t configuration_count =
-            usb_device->descriptors.device.configuration_count;
+            usb_device_get_device_descriptor(usb_device)->configuration_count;
         usb_log_debug("Hub has %zu configurations.\n", configuration_count);
 
@@ -367 +367 @@
         }
 
-        if (usb_device->descriptors.configuration_size
-            < sizeof(usb_standard_configuration_descriptor_t)) {
+        // TODO: Make sure that the cast is correct
+        size_t config_size = 0;
+        const usb_standard_configuration_descriptor_t *config_descriptor =
+            usb_device_get_configuration_descriptor(usb_device, &config_size);
+
+        if (config_size < sizeof(usb_standard_configuration_descriptor_t)) {
             usb_log_error("Configuration descriptor is not big enough"
                 " to fit standard configuration descriptor.\n");
@@ -374 +378 @@
         }
 
-        // TODO: Make sure that the cast is correct
-        const usb_standard_configuration_descriptor_t *config_descriptor
-            = (usb_standard_configuration_descriptor_t *)
-            usb_device->descriptors.configuration;
 
         /* Set configuration. Use the configuration that was in