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

Timestamp:

2011-12-11T18:17:47Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0681c06

Parents:

7267fa1

Message:

libusbdev: Pre open hc connection. Drop support for dev_rem.

hc_connection will be used for both descriptor retrieval and pipe registration,
so it's better to do it in advance.

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (6 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -170 +170 @@
                 return ENOTSUP;
         /* Just tell the driver to stop whatever it is doing, keep structures */
-        return driver->ops->device_rem(gen_dev->driver_data);
+        const int ret = driver->ops->device_rem(gen_dev->driver_data);
+        if (ret != EOK)
+                return ret;
+        return ENOTSUP;
 }
 /*----------------------------------------------------------------------------*/
@@ -481 +484 @@
         usb_dev->pipes = NULL;
 
+        /* Initialize hc connection. */
         usb_hc_connection_initialize_from_device(&usb_dev->hc_conn, ddf_dev);
         const usb_address_t address =
             usb_get_address_by_handle(ddf_dev->handle);
+
         /* Initialize backing wire and control pipe. */
         int rc = usb_device_connection_initialize(
@@ -494 +499 @@
         /* This pipe was registered by the hub driver,
          * during device initialization. */
-        rc = usb_pipe_initialize_default_control(&usb_dev->ctrl_pipe,
-            &usb_dev->wire);
+        rc = usb_pipe_initialize_default_control(
+            &usb_dev->ctrl_pipe, &usb_dev->wire);
         if (rc != EOK) {
                 *errstr_ptr = "default control pipe initialization";
+                return rc;
+        }
+
+        rc = usb_hc_connection_open(&usb_dev->hc_conn);
+        if (rc != EOK) {
+                *errstr_ptr = "hc connection open";
                 return rc;
         }
@@ -503 +514 @@
         /* Get our interface. */
         usb_dev->interface_no = usb_device_get_assigned_interface(ddf_dev);
-
         /* Retrieve standard descriptors. */
-        rc = usb_device_retrieve_descriptors(&usb_dev->ctrl_pipe,
-            &usb_dev->descriptors);
+        rc = usb_device_retrieve_descriptors(
+            &usb_dev->ctrl_pipe, &usb_dev->descriptors);
         if (rc != EOK) {
                 *errstr_ptr = "descriptor retrieval";
+                usb_hc_connection_close(&usb_dev->hc_conn);
                 return rc;
         }
@@ -525 +536 @@
         rc = initialize_other_pipes(endpoints, usb_dev, alternate_iface);
         if (rc != EOK) {
+                usb_hc_connection_close(&usb_dev->hc_conn);
                 /* Full configuration descriptor is allocated. */
                 usb_device_release_descriptors(&usb_dev->descriptors);
@@ -533 +545 @@
         }
 
+        usb_hc_connection_close(&usb_dev->hc_conn);
         return EOK;
 }