Changeset e68de30 in mainline

Timestamp:

2011-01-28T23:30:37Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

44d8853

Parents:

f0e25e8

Message:

Fixed: use proper device enumeration procedure

File:

• uspace/drv/uhci/root_hub/port.c (modified) (2 diffs)

uspace/drv/uhci/root_hub/port.c

@@ -37 +37 @@
                         if (port_status & STATUS_CONNECTED) {
                                 /* new device */
-                                port_status |= STATUS_IN_RESET;
-                                port_status_write(port_instance->address, port_status);
-                                async_usleep(1000);
-                                port_status =
-                                        port_status_read(port_instance->address);
-                                port_status &= ~STATUS_IN_RESET;
-                                port_status_write(port_instance->address, port_status);
                                 uhci_port_new_device(port_instance);
                         } else {
@@ -72 +65 @@
                 return usb_address;
         }
+        /*
+         * 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);
 
         /* enable port */
         uhci_port_set_enabled(port, true);
+
+        /* The hub maintains the reset signal to that port for 10 ms
+         * (See Section 11.5.1.5)
+         */
+        port_status_t port_status =
+                port_status_read(port->address);
+        port_status |= STATUS_IN_RESET;
+        port_status_write(port->address, port_status);
+        async_usleep(10000);
+        port_status =
+                port_status_read(port->address);
+        port_status &= ~STATUS_IN_RESET;
+        port_status_write(port->address, port_status);
 
         /* assign address to device */