Changeset 4fe3b6d in mainline for uspace/lib/usbdev/src/hub.c

Timestamp:

2011-05-20T11:07:00Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 development

File:

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

uspace/lib/usbdev/src/hub.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb
+/** @addtogroup libusbdev
  * @{
  */
@@ -33 +33 @@
  * Functions needed by hub drivers.
  */
-#include <usb/hub.h>
-#include <usb/pipes.h>
-#include <usb/request.h>
-#include <usb/recognise.h>
+#include <usb/dev/hub.h>
+#include <usb/dev/pipes.h>
+#include <usb/dev/request.h>
+#include <usb/dev/recognise.h>
 #include <usbhc_iface.h>
 #include <errno.h>
 #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);