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

Timestamp:

2011-05-19T15:20:48Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

4939490

Parents:

df44fa2 (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:

Development changes.

File:

• uspace/drv/uhci-rhd/port.c (modified) (4 diffs)

uspace/drv/uhci-rhd/port.c

@@ -36 +36 @@
 #include <errno.h>
 #include <str_error.h>
+#include <time.h>
+#include <async.h>
 
 #include <usb/usb.h>    /* usb_address_t */
-#include <usb/hub.h>    /* usb_hc_new_device_wrapper */
+#include <usb/dev/hub.h>    /* usb_hc_new_device_wrapper */
 #include <usb/debug.h>
 
@@ -65 +67 @@
  *
  * @param[in] port Structure to use.
- * @param[in] value New register value.
+ * @param[in] val New register value.
  * @return Error code. (Always EOK)
  */
@@ -77 +79 @@
  *
  * @param[in] port Memory structure to use.
- * @param[in] addr Address of I/O register.
+ * @param[in] address Address of I/O register.
  * @param[in] number Port number.
  * @param[in] usec Polling interval.
@@ -224 +226 @@
                 uhci_port_write_status(port, port_status);
                 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);
-        }
+        }
+        /* 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;
 }