Changes in uspace/lib/usb/src/hub.c [b6c9e1e:4ede178] in mainline

File:

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

uspace/lib/usb/src/hub.c

@@ -40 +40 @@
 #include <errno.h>
 #include <assert.h>
-#include <usb/debug.h>
 
 /** Check that HC connection is alright.
@@ -56 +55 @@
 
 /** Tell host controller to reserve default address.
- * @deprecated
  *
  * @param connection Opened connection to host controller.
@@ -67 +65 @@
         CHECK_CONNECTION(connection);
 
-        usb_log_warning("usb_hc_reserve_default_address() considered obsolete");
-
         return async_req_2_0(connection->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE),
@@ -75 +71 @@
 
 /** Tell host controller to release default address.
- * @deprecated
  *
  * @param connection Opened connection to host controller.
@@ -83 +78 @@
 {
         CHECK_CONNECTION(connection);
-
-        usb_log_warning("usb_hc_release_default_address() considered obsolete");
 
         return async_req_1_0(connection->hc_phone,
@@ -242 +235 @@
         }
 
-        /*
-         * We will not register control pipe on default address.
-         * The registration might fail. That means that someone else already
-         * registered that endpoint. We will simply wait and try again.
-         * (Someone else already wants to add a new device.)
+
+        /*
+         * Reserve the default address.
+         */
+        rc = usb_hc_reserve_default_address(&hc_conn, dev_speed);
+        if (rc != EOK) {
+                rc = EBUSY;
+                goto leave_release_free_address;
+        }
+
+        /*
+         * Enable the port (i.e. allow signaling through this port).
+         */
+        rc = enable_port(port_no, arg);
+        if (rc != EOK) {
+                goto leave_release_default_address;
+        }
+
+        /*
+         * Change the address from default to the free one.
+         * We need to create a new control pipe for that.
          */
         usb_device_connection_t dev_conn;
@@ -253 +262 @@
         if (rc != EOK) {
                 rc = ENOTCONN;
-                goto leave_release_free_address;
+                goto leave_release_default_address;
         }
 
@@ -261 +270 @@
         if (rc != EOK) {
                 rc = ENOTCONN;
-                goto leave_release_free_address;
-        }
-
-        do {
-                rc = usb_pipe_register_with_speed(&ctrl_pipe, dev_speed, 0,
-                    &hc_conn);
-                if (rc != EOK) {
-                        /* Do not overheat the CPU ;-). */
-                        async_usleep(10);
-                }
-        } while (rc != EOK);
-
-        /*
-         * Endpoint is registered. We can enable the port and change
-         * device address.
-         */
-        rc = enable_port(port_no, arg);
-        if (rc != EOK) {
-                goto leave_release_default_address;
-        }
-
+                goto leave_release_default_address;
+        }
+
+        /* Before sending any traffic, we need to register this
+         * endpoint.
+         */
+        rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn);
+        if (rc != EOK) {
+                rc = EREFUSED;
+                goto leave_release_default_address;
+        }
         rc = usb_pipe_probe_default_control(&ctrl_pipe);
-        if (rc != EOK) {
-                rc = ESTALL;
-                goto leave_release_default_address;
-        }
-
-
-        rc = usb_pipe_start_session(&ctrl_pipe);
         if (rc != EOK) {
                 rc = ENOTCONN;
@@ -301 +293 @@
         }
 
-        usb_pipe_end_session(&ctrl_pipe);
-
-        /*
-         * Address changed. We can release the original endpoint, thus
-         * allowing other to access the default address.
+        /*
+         * Register the control endpoint for the new device.
+         */
+        rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn);
+        if (rc != EOK) {
+                rc = EREFUSED;
+                goto leave_unregister_endpoint;
+        }
+
+        /*
+         * Release the original endpoint.
          */
         unregister_control_endpoint_on_default_address(&hc_conn);
 
         /*
-         * Time to register the new endpoint.
-         */
-        rc = usb_pipe_register(&ctrl_pipe, 0, &hc_conn);
-        if (rc != EOK) {
-                goto leave_release_free_address;
-        }
+         * Once the address is changed, we can return the default address.
+         */
+        usb_hc_release_default_address(&hc_conn);
+
 
         /*
@@ -330 +326 @@
         }
 
+
+
         /*
          * And now inform the host controller about the handle.
@@ -365 +363 @@
         usb_pipe_end_session(&ctrl_pipe);
 
+leave_unregister_endpoint:
+        usb_pipe_unregister(&ctrl_pipe, &hc_conn);
+
 leave_release_default_address:
-        usb_pipe_unregister(&ctrl_pipe, &hc_conn);
+        usb_hc_release_default_address(&hc_conn);
 
 leave_release_free_address: