Changeset f20f9e2 in mainline

Timestamp:

2011-02-25T16:38:21Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4d37c42

Parents:

b4875e6

Message:

Disable ports on startup

remove device on connection change

Location:

uspace/drv

Files:

• uhci-hcd/main.c (modified) (1 diff)
• uhci-rhd/port.c (modified) (2 diffs)

uspace/drv/uhci-hcd/main.c

@@ -91 +91 @@
         int ret =
             pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq);
+        io_reg_size = sizeof(regs_t);
 
         CHECK_RET_RETURN(ret,

uspace/drv/uhci-rhd/port.c

@@ -91 +91 @@
         assert(port_instance);
 
+        /* disable port, to avoid device confusion */
+        uhci_port_set_enabled(port, false);
+
         while (1) {
                 /* read register value */
@@ -109 +112 @@
                         }
 
+                        /* remove any old device */
+                        if (port_instance->attached_device) {
+                                uhci_port_remove_device(port_instance);
+                        }
+
                         if (port_status & STATUS_CONNECTED) {
                                 /* new device */
                                 uhci_port_new_device(port_instance);
-                        } else {
-                                uhci_port_remove_device(port_instance);
                         }