Changeset a43f1d18 in mainline for uspace/lib/usb/src/hub.c

Timestamp:

2011-04-09T18:26:22Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

2ad98fd

Parents:

f35b294 (diff), 97e7e8a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with usb/development

File:

• uspace/lib/usb/src/hub.c (modified) (10 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.
@@ -55 +56 @@
 
 /** Tell host controller to reserve default address.
+ * @deprecated
  *
  * @param connection Opened connection to host controller.
@@ -65 +67 @@
         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),
@@ -71 +75 @@
 
 /** Tell host controller to release default address.
+ * @deprecated
  *
  * @param connection Opened connection to host controller.
@@ -78 +83 @@
 {
         CHECK_CONNECTION(connection);
+
+        usb_log_warning("usb_hc_release_default_address() considered obsolete");
 
         return async_req_1_0(connection->hc_phone,
@@ -235 +242 @@
         }
 
-
-        /*
-         * 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 +253 @@
         if (rc != EOK) {
                 rc = ENOTCONN;
-                goto leave_release_default_address;
+                goto leave_release_free_address;
         }
 
@@ -270 +261 @@
         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;
         }
 
-        /* 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_pipe_start_session(&ctrl_pipe);
-        if (rc != EOK) {
-                rc = ENOTCONN;
-                goto leave_unregister_endpoint;
-        }
-
-        rc = usb_request_set_address(&ctrl_pipe, dev_addr);
-        if (rc != EOK) {
-                rc = ESTALL;
-                goto leave_stop_session;
-        }
-
-        usb_pipe_end_session(&ctrl_pipe);
-
-        /*
-         * 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;
+        }
 
         /*
@@ -334 +321 @@
         }
 
-
-
         /*
          * And now inform the host controller about the handle.
@@ -367 +352 @@
          * 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: