Changes in / [39db23f:0c311d5] in mainline

File:

• uspace/lib/usb/src/hub.c (modified) (8 diffs)

uspace/lib/usb/src/hub.c

@@ -178 +178 @@
  * error codes than those listed as return codes by this function itself).
  *
- * The @p connection representing connection with host controller does not
- * need to be started.
- * This function duplicates the connection to allow simultaneous calls of
- * this function (i.e. from different fibrils).
- *
  * @param[in] parent Parent device (i.e. the hub device).
- * @param[in] connection Connection to host controller.
+ * @param[in] connection Opened connection to host controller.
  * @param[in] dev_speed New device speed.
  * @param[in] enable_port Function for enabling signaling through the port the
@@ -211 +206 @@
     ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
 {
-        assert(connection != NULL);
-        // FIXME: this is awful, we are accessing directly the structure.
-        usb_hc_connection_t hc_conn = {
-                .hc_handle = connection->hc_handle,
-                .hc_phone = -1
-        };
+        CHECK_CONNECTION(connection);
+
+        /*
+         * Request new address.
+         */
+        usb_address_t dev_addr = usb_hc_request_address(connection, dev_speed);
+        if (dev_addr < 0) {
+                return EADDRNOTAVAIL;
+        }
 
         int rc;
 
-        rc = usb_hc_connection_open(&hc_conn);
-        if (rc != EOK) {
-                return rc;
-        }
-
-
-        /*
-         * Request new address.
-         */
-        usb_address_t dev_addr = usb_hc_request_address(&hc_conn, dev_speed);
-        if (dev_addr < 0) {
-                usb_hc_connection_close(&hc_conn);
-                return EADDRNOTAVAIL;
-        }
-
-
         /*
          * Reserve the default address.
          */
-        rc = usb_hc_reserve_default_address(&hc_conn, dev_speed);
+        rc = usb_hc_reserve_default_address(connection, dev_speed);
         if (rc != EOK) {
                 rc = EBUSY;
@@ -259 +241 @@
         usb_device_connection_t dev_conn;
         rc = usb_device_connection_initialize_on_default_address(&dev_conn,
-            &hc_conn);
+            connection);
         if (rc != EOK) {
                 rc = ENOTCONN;
@@ -276 +258 @@
          * endpoint.
          */
-        rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn);
+        rc = usb_pipe_register(&ctrl_pipe, 0, connection);
         if (rc != EOK) {
                 rc = EREFUSED;
@@ -304 +286 @@
          * Register the control endpoint for the new device.
          */
-        rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn);
+        rc = usb_pipe_register(&ctrl_pipe, 0, connection);
         if (rc != EOK) {
                 rc = EREFUSED;
@@ -313 +295 @@
          * Release the original endpoint.
          */
-        unregister_control_endpoint_on_default_address(&hc_conn);
+        unregister_control_endpoint_on_default_address(connection);
 
         /*
          * Once the address is changed, we can return the default address.
          */
-        usb_hc_release_default_address(&hc_conn);
+        usb_hc_release_default_address(connection);
 
 
@@ -343 +325 @@
                 .handle = child_handle
         };
-        rc = usb_hc_register_device(&hc_conn, &new_device);
+        rc = usb_hc_register_device(connection, &new_device);
         if (rc != EOK) {
                 rc = EDESTADDRREQ;
@@ -372 +354 @@
 
 leave_unregister_endpoint:
-        usb_pipe_unregister(&ctrl_pipe, &hc_conn);
+        usb_pipe_unregister(&ctrl_pipe, connection);
 
 leave_release_default_address:
-        usb_hc_release_default_address(&hc_conn);
+        usb_hc_release_default_address(connection);
 
 leave_release_free_address:
-        usb_hc_unregister_device(&hc_conn, dev_addr);
-
-        usb_hc_connection_close(&hc_conn);
+        usb_hc_unregister_device(connection, dev_addr);
 
         return rc;