Changeset 4a7a8d4 in mainline for uspace/drv/uhci-rhd/port.c

Timestamp:

2011-05-13T10:31:54Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

aca3489

Parents:

05e21ffc (diff), c372e03 (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/drv/uhci-rhd/port.c (modified) (5 diffs)

uspace/drv/uhci-rhd/port.c

@@ -32 +32 @@
  * @brief UHCI root hub port routines
  */
-#include <libarch/ddi.h> /* pio_read and pio_write */
+#include <libarch/ddi.h>  /* pio_read and pio_write */
+#include <fibril_synch.h> /* async_usleep */
 #include <errno.h>
 #include <str_error.h>
-#include <fibril_synch.h>
 
 #include <usb/usb.h>    /* usb_address_t */
-#include <usb/hub.h>
+#include <usb/hub.h>    /* usb_hc_new_device_wrapper */
 #include <usb/debug.h>
 
@@ -212 +212 @@
 
         /*
-         * The host then waits for at least 100 ms to allow completion of
-         * an insertion process and for power at the device to become stable.
-         */
-        async_usleep(100000);
-
-        /*
-         * Resets from root ports should be nominally 50ms
+         * Resets from root ports should be nominally 50ms (USB spec 7.1.7.3)
          */
         {
@@ -229 +223 @@
                 port_status &= ~STATUS_IN_RESET;
                 uhci_port_write_status(port, port_status);
-                usb_log_debug("%s: Reset Signal stop.\n", port->id_string);
-        }
-
-        /* the reset recovery time 10ms */
-        async_usleep(10000);
-
+                while (uhci_port_read_status(port) & STATUS_IN_RESET);
+                // TODO: find a better way to waste time (it should be less than
+                // 10ms, if we reschedule it takes too much time (random
+                // interrupts can be solved by multiple attempts).
+                usb_log_debug2("%s: Reset Signal stop.\n", port->id_string);
+        }
         /* 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;
 }
@@ -255 +254 @@
         usb_log_debug("%s: Detected new device.\n", port->id_string);
 
+        int ret, count = 0;
         usb_address_t dev_addr;
-        int ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
-            speed, uhci_port_reset_enable, port->number, port,
-            &dev_addr, &port->attached_device, NULL, NULL, NULL);
+        do {
+                ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
+                    speed, uhci_port_reset_enable, port->number, port,
+                    &dev_addr, &port->attached_device, NULL, NULL, NULL);
+        } while (ret != EOK && ++count < 4);
 
         if (ret != EOK) {
@@ -313 +315 @@
         /* Wait for port to become enabled */
         do {
-                async_usleep(1000);
                 port_status = uhci_port_read_status(port);
         } while ((port_status & STATUS_CONNECTED) &&