Changeset 945d66c in mainline for uspace/lib/usbdev/src/devdrv.c

Timestamp:

2013-01-25T22:55:22Z (12 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/lib/usbdev/src/devdrv.c (modified) (7 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -233 +233 @@
  * @return Error code.
  */
-int usb_device_retrieve_descriptors(usb_pipe_t *ctrl_pipe,
-    usb_device_descriptors_t *descriptors)
-{
-        assert(descriptors != NULL);
-
-        descriptors->configuration = NULL;
-
-        int rc;
+static int usb_device_retrieve_descriptors(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        assert(usb_dev->descriptors.configuration == NULL);
 
         /* It is worth to start a long transfer. */
-        usb_pipe_start_long_transfer(ctrl_pipe);
+        usb_pipe_start_long_transfer(&usb_dev->ctrl_pipe);
 
         /* Get the device descriptor. */
-        rc = usb_request_get_device_descriptor(ctrl_pipe, &descriptors->device);
+        int rc = usb_request_get_device_descriptor(&usb_dev->ctrl_pipe,
+            &usb_dev->descriptors.device);
         if (rc != EOK) {
                 goto leave;
@@ -253 +250 @@
         /* Get the full configuration descriptor. */
         rc = usb_request_get_full_configuration_descriptor_alloc(
-            ctrl_pipe, 0, (void **) &descriptors->configuration,
-            &descriptors->configuration_size);
+            &usb_dev->ctrl_pipe, 0,
+            (void **) &usb_dev->descriptors.configuration,
+            &usb_dev->descriptors.configuration_size);
 
 leave:
-        usb_pipe_end_long_transfer(ctrl_pipe);
+        usb_pipe_end_long_transfer(&usb_dev->ctrl_pipe);
 
         return rc;
@@ -266 +264 @@
  * @param[in] descriptors Where to store the descriptors.
  */
-void usb_device_release_descriptors(usb_device_descriptors_t *descriptors)
-{
-        assert(descriptors);
-        free(descriptors->configuration);
-        descriptors->configuration = NULL;
+static void usb_device_release_descriptors(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        free(usb_dev->descriptors.configuration);
+        usb_dev->descriptors.configuration = NULL;
+        usb_dev->descriptors.configuration_size = 0;
 }
 
@@ -394 +393 @@
 }
 
+const usb_standard_device_descriptor_t *
+usb_device_get_device_descriptor(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        return &usb_dev->descriptors.device;
+}
+
+const void * usb_device_get_configuration_descriptor(
+    usb_device_t *usb_dev, size_t *size)
+{
+        assert(usb_dev);
+        if (size)
+                *size = usb_dev->descriptors.configuration_size;
+        return usb_dev->descriptors.configuration;
+}
+
 /** Initialize new instance of USB device.
  *
@@ -462 +477 @@
 
         /* Retrieve standard descriptors. */
-        rc = usb_device_retrieve_descriptors(
-            &usb_dev->ctrl_pipe, &usb_dev->descriptors);
+        rc = usb_device_retrieve_descriptors(usb_dev);
         if (rc != EOK) {
                 *errstr_ptr = "descriptor retrieval";
@@ -489 +503 @@
                 usb_hc_connection_close(&usb_dev->hc_conn);
                 /* Full configuration descriptor is allocated. */
-                usb_device_release_descriptors(&usb_dev->descriptors);
+                usb_device_release_descriptors(usb_dev);
                 /* Alternate interfaces may be allocated */
                 usb_alternate_interfaces_deinit(&usb_dev->alternate_interfaces);
@@ -515 +529 @@
                 usb_hc_connection_deinitialize(&dev->hc_conn);
                 usb_alternate_interfaces_deinit(&dev->alternate_interfaces);
-                usb_device_release_descriptors(&dev->descriptors);
+                usb_device_release_descriptors(dev);
                 free(dev->driver_data);
                 dev->driver_data = NULL;