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

Timestamp:

2011-05-18T10:59:50Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

17fc40c

Parents:

b2995c3 (diff), aeca5a3 (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:

Minor fixes and comments

UHCI: use provided barrier defines (buffer allocator should be able to use cacheable memory)
libusb: make usb enumeration routine follow USB spec more closely (wait periods)
OHCI: handle hw errors
OHCI: use provided barrier defines (buffer allocator should be able to use cacheable memory)
OHCI: reduce maximum buffer size for one transaction, this relaxes requirements on allocator providing hw accessible buffers.(memory does not have to be continuous) The only requirement that stays is the 32bit pointers limit.

File:

• uspace/lib/usbdev/src/hub.c (modified) (4 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.
@@ -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);