Changeset e484f3b in mainline

Timestamp:

2011-03-21T16:27:49Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

625f1ba

Parents:

34eb135

Message:

USB framework remembers some descriptors

Currently, it is only device descriptor and full configuration descriptor
of configuration #0.

Location:

uspace/lib/usb

Files:

• include/usb/devdrv.h (modified) (2 diffs)
• src/devdrv.c (modified) (5 diffs)

uspace/lib/usb/include/usb/devdrv.h

@@ -38 +38 @@
 #include <usb/pipes.h>
 
+/** Descriptors for USB device. */
+typedef struct {
+        /** Standard device descriptor. */
+        usb_standard_device_descriptor_t device;
+        /** Full configuration descriptor of current configuration. */
+        uint8_t *configuration;
+        size_t configuration_size;
+} usb_device_descriptors_t;
+
 /** USB device structure. */
 typedef struct {
@@ -52 +61 @@
          */
         int interface_no;
+
+        /** Some useful descriptors. */
+        usb_device_descriptors_t descriptors;
+
         /** Generic DDF device backing this one. */
         ddf_dev_t *ddf_dev;

uspace/lib/usb/src/devdrv.c

@@ -137 +137 @@
         }
 
-        void *config_descriptor;
-        size_t config_descriptor_size;
-        rc = usb_request_get_full_configuration_descriptor_alloc(
-            &dev->ctrl_pipe, 0, &config_descriptor, &config_descriptor_size);
-        if (rc != EOK) {
-                usb_log_error("Failed retrieving configuration of `%s': %s.\n",
-                    dev->ddf_dev->name, str_error(rc));
-                goto rollback;
-        }
-
-        rc = usb_pipe_initialize_from_configuration(dev->pipes,
-           pipe_count, config_descriptor, config_descriptor_size, &dev->wire);
+        rc = usb_pipe_initialize_from_configuration(dev->pipes, pipe_count,
+            dev->descriptors.configuration, dev->descriptors.configuration_size,
+            &dev->wire);
         if (rc != EOK) {
                 usb_log_error("Failed initializing USB endpoints: %s.\n",
@@ -237 +228 @@
 
         /*
-         * Initialization of other pipes requires open session on
-         * default control pipe.
+         * For further actions, we need open session on default control pipe.
          */
         rc = usb_pipe_start_session(&dev->ctrl_pipe);
@@ -247 +237 @@
         }
 
+        /* Get the device descriptor. */
+        rc = usb_request_get_device_descriptor(&dev->ctrl_pipe,
+            &dev->descriptors.device);
+        if (rc != EOK) {
+                usb_log_error("Failed to retrieve device descriptor: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        /* Get the full configuration descriptor. */
+        rc = usb_request_get_full_configuration_descriptor_alloc(
+            &dev->ctrl_pipe, 0, (void **) &dev->descriptors.configuration,
+            &dev->descriptors.configuration_size);
+        if (rc != EOK) {
+                usb_log_error("Failed retrieving configuration descriptor: %s.\n",
+                    dev->ddf_dev->name, str_error(rc));
+                return rc;
+        }
+
         if (driver->endpoints != NULL) {
                 rc = initialize_other_pipes(driver, dev);
@@ -253 +262 @@
         /* No checking here. */
         usb_pipe_end_session(&dev->ctrl_pipe);
+
+        /* Rollback actions. */
+        if (rc != EOK) {
+                if (dev->descriptors.configuration != NULL) {
+                        free(dev->descriptors.configuration);
+                }
+        }
 
         return rc;
@@ -283 +299 @@
         dev->ddf_dev->driver_data = dev;
         dev->driver_data = NULL;
+        dev->descriptors.configuration = NULL;
 
         rc = initialize_pipes(dev);