Changes in uspace/lib/usbdev/src/devdrv.c [0c0f823b:c0fdc0e] in mainline

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (10 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;
 }
 /*----------------------------------------------------------------------------*/
@@ -373 +376 @@
         }
 
-        /* Register the endpoints with HC. */
-        usb_hc_connection_t hc_conn;
-        rc = usb_hc_connection_initialize_from_device(&hc_conn, dev);
-        if (rc != EOK) {
-                goto rollback_free_only;
-        }
-
-        rc = usb_hc_connection_open(&hc_conn);
-        if (rc != EOK) {
-                goto rollback_free_only;
-        }
-
         for (i = 0; i < pipe_count; i++) {
                 if (pipes[i].present) {
                         rc = usb_pipe_register(&pipes[i].pipe,
-                            pipes[i].descriptor->poll_interval, &hc_conn);
+                            pipes[i].descriptor->poll_interval);
                         if (rc != EOK) {
                                 goto rollback_unregister_endpoints;
@@ -394 +385 @@
                 }
         }
-
-        if (usb_hc_connection_close(&hc_conn) != EOK)
-                usb_log_warning("%s: Failed to close connection.\n",
-                    __FUNCTION__);
 
         *pipes_ptr = pipes;
@@ -415 +402 @@
         for (i = 0; i < pipe_count; i++) {
                 if (pipes[i].present) {
-                        usb_pipe_unregister(&pipes[i].pipe, &hc_conn);
+                        usb_pipe_unregister(&pipes[i].pipe);
                 }
         }
-
-        if (usb_hc_connection_close(&hc_conn) != EOK)
-                usb_log_warning("usb_device_create_pipes(): "
-                    "Failed to close connection.\n");
 
         /*
@@ -470 +453 @@
                     i, pipes[i].present ? "" : "not ");
                 if (pipes[i].present)
-                        usb_pipe_unregister(&pipes[i].pipe, &hc_conn);
-        }
-
-        if (usb_hc_connection_close(&hc_conn) != EOK)
-                usb_log_warning("usb_device_destroy_pipes(): "
-                    "Failed to close connection.\n");
+                        usb_pipe_unregister(&pipes[i].pipe);
+        }
 
         free(pipes);
@@ -505 +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_from_device(
-            &usb_dev->wire, ddf_dev);
+        int rc = usb_device_connection_initialize(
+            &usb_dev->wire, &usb_dev->hc_conn, address);
         if (rc != EOK) {
                 *errstr_ptr = "device connection initialization";
@@ -515 +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;
         }
@@ -524 +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;
         }
@@ -546 +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);
@@ -554 +545 @@
         }
 
+        usb_hc_connection_close(&usb_dev->hc_conn);
         return EOK;
 }