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

Timestamp:

2011-03-12T12:44:59Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0f3e68c

Parents:

df949c5 (diff), 0db3ad6 (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 in initialization routine and hc interrupt handling

File:

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

uspace/drv/uhci-rhd/port.c

@@ -181 +181 @@
         uhci_port_t *port = (uhci_port_t *) arg;
 
-        usb_log_debug2("%s: new_device_enable_port.\n",
-            port->id_string);
+        usb_log_debug2("%s: new_device_enable_port.\n", port->id_string);
 
         /*
@@ -190 +189 @@
         async_usleep(100000);
 
-
-        /* The hub maintains the reset signal to that port for 10 ms
-         * (See Section 11.5.1.5)
+        /*
+         * Resets from root ports should be nominally 50ms
          */
         {
-                usb_log_debug("%s: Reset Signal start.\n",
-                    port->id_string);
+                usb_log_debug("%s: Reset Signal start.\n", port->id_string);
                 port_status_t port_status = uhci_port_read_status(port);
                 port_status |= STATUS_IN_RESET;
                 uhci_port_write_status(port, port_status);
-                async_usleep(10000);
+                async_usleep(50000);
                 port_status = uhci_port_read_status(port);
                 port_status &= ~STATUS_IN_RESET;
                 uhci_port_write_status(port, port_status);
-                usb_log_debug("%s: Reset Signal stop.\n",
-                    port->id_string);
-        }
+                usb_log_debug("%s: Reset Signal stop.\n", port->id_string);
+        }
+
+        /* the reset recovery time 10ms */
+        async_usleep(10000);
 
         /* Enable the port. */
         uhci_port_set_enabled(port, true);
+
         return EOK;
 }
@@ -226 +226 @@
         assert(usb_hc_connection_is_opened(&port->hc_connection));
 
-        usb_log_info("%s: Detected new device.\n",
-            port->id_string);
+        usb_log_info("%s: Detected new device.\n", port->id_string);
 
         usb_address_t dev_addr;