Changeset e099f26 in mainline for uspace/lib/usb/src/devdrv.c

Timestamp:

2011-03-21T20:22:50Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c56c5b5b

Parents:

4fb6d9ee (diff), 31b568e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development branch changes (including OHCI)

File:

• uspace/lib/usb/src/devdrv.c (modified) (9 diffs)

uspace/lib/usb/src/devdrv.c

@@ -126 +126 @@
 
         for (i = 0; i < pipe_count; i++) {
-                dev->pipes[i].pipe = malloc(sizeof(usb_endpoint_pipe_t));
+                dev->pipes[i].pipe = malloc(sizeof(usb_pipe_t));
                 if (dev->pipes[i].pipe == NULL) {
                         usb_log_oom(dev->ddf_dev);
@@ -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_endpoint_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",
@@ -172 +163 @@
         for (i = 0; i < pipe_count; i++) {
                 if (dev->pipes[i].present) {
-                        rc = usb_endpoint_pipe_register(dev->pipes[i].pipe,
+                        rc = usb_pipe_register(dev->pipes[i].pipe,
                             dev->pipes[i].descriptor->poll_interval,
                             &hc_conn);
@@ -206 +197 @@
  * @return Error code.
  */
-static int initialize_pipes(usb_driver_t *drv, usb_device_t *dev)
+static int initialize_pipes(usb_device_t *dev)
 {
         int rc;
@@ -219 +210 @@
         }
 
-        rc = usb_endpoint_pipe_initialize_default_control(&dev->ctrl_pipe,
+        rc = usb_pipe_initialize_default_control(&dev->ctrl_pipe,
             &dev->wire);
         if (rc != EOK) {
@@ -228 +219 @@
         }
 
-        rc = usb_endpoint_pipe_probe_default_control(&dev->ctrl_pipe);
+        rc = usb_pipe_probe_default_control(&dev->ctrl_pipe);
         if (rc != EOK) {
                 usb_log_error(
@@ -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_endpoint_pipe_start_session(&dev->ctrl_pipe);
+        rc = usb_pipe_start_session(&dev->ctrl_pipe);
         if (rc != EOK) {
                 usb_log_error("Failed to start an IPC session: %s.\n",
                     str_error(rc));
+                return rc;
+        }
+
+        /* 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;
         }
@@ -252 +261 @@
 
         /* No checking here. */
-        usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+        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;
-
-        rc = initialize_pipes(driver, dev);
+        dev->descriptors.configuration = NULL;
+
+        rc = initialize_pipes(dev);
         if (rc != EOK) {
                 free(dev);