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

File:

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

uspace/lib/usb/src/hub.c

@@ -40 +40 @@
 #include <errno.h>
 #include <assert.h>
+#include <usb/debug.h>
+
+/** How much time to wait between attempts to register endpoint 0:0.
+ * The value is based on typical value for port reset + some overhead.
+ */
+#define ENDPOINT_0_0_REGISTER_ATTEMPT_DELAY_USEC (1000 * (10 + 2))
 
 /** Check that HC connection is alright.
@@ -52 +58 @@
                 } \
         } while (false)
-
-
-/** Tell host controller to reserve default address.
- *
- * @param connection Opened connection to host controller.
- * @param speed Speed of the device that will respond on the default address.
- * @return Error code.
- */
-int usb_hc_reserve_default_address(usb_hc_connection_t *connection,
-    usb_speed_t speed)
-{
-        CHECK_CONNECTION(connection);
-
-        return async_req_2_0(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS, speed);
-}
-
-/** Tell host controller to release default address.
- *
- * @param connection Opened connection to host controller.
- * @return Error code.
- */
-int usb_hc_release_default_address(usb_hc_connection_t *connection)
-{
-        CHECK_CONNECTION(connection);
-
-        return async_req_1_0(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
-}
 
 /** Ask host controller for free address assignment.
@@ -235 +210 @@
         }
 
-
-        /*
-         * 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.
+        /*
+         * 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.)
          */
         usb_device_connection_t dev_conn;
@@ -262 +221 @@
         if (rc != EOK) {
                 rc = ENOTCONN;
-                goto leave_release_default_address;
+                goto leave_release_free_address;
         }
 
@@ -270 +229 @@
         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(ENDPOINT_0_0_REGISTER_ATTEMPT_DELAY_USEC);
+                }
+        } 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;
         }
 
-        /* Before sending any traffic, we need to register this
-         * endpoint.
+        rc = usb_pipe_probe_default_control(&ctrl_pipe);
+        if (rc != EOK) {
+                rc = ESTALL;
+                goto leave_release_default_address;
+        }
+
+        rc = usb_request_set_address(&ctrl_pipe, dev_addr);
+        if (rc != EOK) {
+                rc = ESTALL;
+                goto leave_release_default_address;
+        }
+
+        /*
+         * Address changed. We can release the original endpoint, thus
+         * allowing other to access the default address.
+         */
+        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) {
-                rc = EREFUSED;
-                goto leave_release_default_address;
-        }
-        rc = usb_pipe_probe_default_control(&ctrl_pipe);
-        if (rc != EOK) {
-                rc = ENOTCONN;
-                goto leave_release_default_address;
-        }
-
-        rc = usb_request_set_address(&ctrl_pipe, dev_addr);
-        if (rc != EOK) {
-                rc = ESTALL;
-                goto leave_stop_session;
-        }
-
-        /*
-         * 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);
-
-        /*
-         * Once the address is changed, we can return the default address.
-         */
-        usb_hc_release_default_address(&hc_conn);
-
+                goto leave_release_free_address;
+        }
 
         /*
@@ -326 +289 @@
         }
 
-
-
         /*
          * And now inform the host controller about the handle.
@@ -359 +320 @@
          * Completely ignoring errors here.
          */
-
-leave_stop_session:
-        usb_pipe_end_session(&ctrl_pipe);
-
-leave_unregister_endpoint:
+leave_release_default_address:
         usb_pipe_unregister(&ctrl_pipe, &hc_conn);
-
-leave_release_default_address:
-        usb_hc_release_default_address(&hc_conn);
 
 leave_release_free_address: