Changeset e2dfa86 in mainline for uspace/drv

Timestamp:

2013-01-27T13:54:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0eb2a0f

Parents:

06f9a9c9

Message:

usb_device: Change API to allow direct(RO) access to descriptors.

Location:

uspace/drv/bus/usb

Files:

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

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

@@ -120 +120 @@
         assert(mapping);
         const usb_standard_device_descriptor_t *d =
-            usb_device_get_device_descriptor(hid_dev->usb_dev);
+            &usb_device_descriptors(hid_dev->usb_dev)->device;
 
         return (d->vendor_id == mapping->vendor_id)

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

@@ -359 +359 @@
         /* Get number of possible configurations from device descriptor */
         const size_t configuration_count =
-            usb_device_get_device_descriptor(usb_device)->configuration_count;
+            usb_device_descriptors(usb_device)->device.configuration_count;
         usb_log_debug("Hub has %zu configurations.\n", configuration_count);
 
@@ -368 +368 @@
 
         // TODO: Make sure that the cast is correct
-        size_t config_size = 0;
+        const size_t config_size =
+            usb_device_descriptors(usb_device)->full_config_size;
         const usb_standard_configuration_descriptor_t *config_descriptor =
-            usb_device_get_configuration_descriptor(usb_device, &config_size);
+            usb_device_descriptors(usb_device)->full_config;
 
         if (config_size < sizeof(usb_standard_configuration_descriptor_t)) {
@@ -377 +378 @@
             return EOVERFLOW;
         }
-
 
         /* Set configuration. Use the configuration that was in

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_device_get_device_descriptor(usb_dev), interface);
+                        &usb_device_descriptors(usb_dev)->device, interface);
                 if (rc != EOK) {
                         //TODO: Do something about that failure.
@@ -142 +142 @@
 int usbmid_explore_device(usb_device_t *dev)
 {
+        assert(dev);
         const unsigned dev_class =
-            usb_device_get_device_descriptor(dev)->device_class;
+            usb_device_descriptors(dev)->device.device_class;
         if (dev_class != USB_CLASS_USE_INTERFACE) {
                 usb_log_warning(
@@ -154 +155 @@
 
         /* Get coonfiguration descriptor. */
-        size_t config_descriptor_size = 0;
+        const size_t config_descriptor_size =
+            usb_device_descriptors(dev)->full_config_size;
         const void *config_descriptor_raw =
-            usb_device_get_configuration_descriptor(dev,
-            &config_descriptor_size);
+            usb_device_descriptors(dev)->full_config;
         const usb_standard_configuration_descriptor_t *config_descriptor =
             config_descriptor_raw;