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

Timestamp:

2011-12-11T16:30:42Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7d5ef94

Parents:

2c202c5

Message:

libusbdev: Use shared hc_connection for pipes.

File:

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

uspace/lib/usbdev/src/devdrv.c

@@ -373 +373 @@
         }
 
-        /* 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 +382 @@
                 }
         }
-
-        if (usb_hc_connection_close(&hc_conn) != EOK)
-                usb_log_warning("%s: Failed to close connection.\n",
-                    __FUNCTION__);
 
         *pipes_ptr = pipes;
@@ -415 +399 @@
         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 +450 @@
                     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 +481 @@
         usb_dev->pipes = NULL;
 
+        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";