Changeset 5f94a0c in mainline

Timestamp:

2011-05-17T10:46:00Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

28d9c95

Parents:

2aaf804

Message:

Add timeouts to the enumeration routine

Location:

uspace

Files:

• drv/uhci-rhd/port.c (modified) (1 diff)
• lib/usbdev/src/hub.c (modified) (4 diffs)

uspace/drv/uhci-rhd/port.c

@@ -227 +227 @@
                 while (uhci_port_read_status(port) & STATUS_IN_RESET);
         }
+        /* PIO delay, should not be longer than 3ms as the device might
+         * enter suspend state. */
         udelay(10);
         /* Enable the port. */
         uhci_port_set_enabled(port, true);
-
-        /* Reset recovery period,
-         * devices do not have to respond during this period
-         */
-        async_usleep(10000);
         return EOK;
 }

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.
@@ -218 +219 @@
 
         int rc;
+        struct timeval start_time;
+
+        rc = gettimeofday(&start_time, NULL);
+        if (rc != EOK) {
+                return rc;
+        }
 
         rc = usb_hc_connection_open(&hc_conn);
@@ -264 +271 @@
                 }
         } 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 +296 @@
                 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);