Changeset 8b68bdf in mainline

Timestamp:

2013-01-27T00:42:35Z (11 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.

Location:

uspace

Files:

• drv/bus/usb/usbhub/usbhub.c (modified) (3 diffs)
• lib/usbhid/src/hidreport.c (modified) (5 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

uspace/lib/usbhid/src/hidreport.c

@@ -60 +60 @@
         };
         
+        size_t desc_size = 0;
+        const void *desc =
+            usb_device_get_configuration_descriptor(dev, &desc_size);
+
         usb_dp_parser_data_t parser_data = {
-                .data = dev->descriptors.configuration,
-                .size = dev->descriptors.configuration_size,
+                .data = desc,
+                .size = desc_size,
                 .arg = NULL
         };
@@ -70 +74 @@
          */
         const uint8_t *d =
-            usb_dp_get_nested_descriptor(&parser, &parser_data,
-            dev->descriptors.configuration);
+            usb_dp_get_nested_descriptor(&parser, &parser_data, desc);
         
         /*
@@ -77 +80 @@
          */
         int i = 0;
-        while (d != NULL && i < dev->interface_no) {
+        while (d != NULL && i < usb_device_get_iface_number(dev)) {
                 d = usb_dp_get_sibling_descriptor(&parser, &parser_data,
-                    dev->descriptors.configuration, d);
+                    desc, d);
                 ++i;
         }
@@ -85 +88 @@
         if (d == NULL) {
                 usb_log_error("The %d. interface descriptor not found!\n",
-                    dev->interface_no);
+                    usb_device_get_iface_number(dev));
                 return ENOENT;
         }
@@ -135 +138 @@
          * Get the descriptor from the device.
          */
-        int rc = usb_request_get_descriptor(&dev->ctrl_pipe,
+        int rc = usb_request_get_descriptor(usb_device_get_default_pipe(dev),
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_INTERFACE,
-            USB_DESCTYPE_HID_REPORT, 0, dev->interface_no,
+            USB_DESCTYPE_HID_REPORT, 0, usb_device_get_iface_number(dev),
             *report_desc, length, &actual_size);