Changes in uspace/lib/usbdev/src/hub.c [160b75e:0edf7c7] in mainline

File:

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

uspace/lib/usbdev/src/hub.c

@@ -41 +41 @@
 #include <assert.h>
 #include <usb/debug.h>
+#include <time.h>
 
 /** How much time to wait between attempts to register endpoint 0:0.
@@ -119 +120 @@
 }
 
-/** Get handle of USB device with given address.
- *
- * @param[in] connection Opened connection to host controller.
- * @param[in] address Address of device in question.
- * @param[out] handle Where to write the device handle.
- * @return Error code.
- */
-int usb_hc_get_handle_by_address(usb_hc_connection_t *connection,
-    usb_address_t address, devman_handle_t *handle)
-{
-        CHECK_CONNECTION(connection);
-
-        sysarg_t tmp;
-        int rc = async_req_2_1(connection->hc_phone,
-            DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
-            address, &tmp);
-        if ((rc == EOK) && (handle != NULL)) {
-                *handle = tmp;
-        }
-
-        return rc;
-}
 
 static void unregister_control_endpoint_on_default_address(
@@ -218 +196 @@
 
         int rc;
+        struct timeval start_time;
+
+        rc = gettimeofday(&start_time, NULL);
+        if (rc != EOK) {
+                return rc;
+        }
 
         rc = usb_hc_connection_open(&hc_conn);
@@ -264 +248 @@
                 }
         } while (rc != EOK);
+        struct timeval end_time;
+
+        rc = gettimeofday(&end_time, NULL);
+        if (rc != EOK) {
+                goto leave_release_default_address;
+        }
+
+        /* According to the USB spec part 9.1.2 host allows 100ms time for
+         * the insertion process to complete. According to 7.1.7.1 this is the
+         * time between attach detected and port reset. However, the setup done
+         * above might use much of this time so we should only wait to fill
+         * up the 100ms quota*/
+        suseconds_t elapsed = tv_sub(&end_time, &start_time);
+        if (elapsed < 100000) {
+                async_usleep(100000 - elapsed);
+        }
 
         /*
@@ -273 +273 @@
                 goto leave_release_default_address;
         }
+        /* USB spec 7.1.7.1: The USB System Software guarantees a minimum of
+         * 10ms for reset recovery. Device response to any bus transactions
+         * addressed to the default device address during the reset recovery
+         * time is undefined.
+         */
+        async_usleep(10000);
 
         rc = usb_pipe_probe_default_control(&ctrl_pipe);