Changeset 013e4ca4 in mainline

Timestamp:

2011-02-25T19:58:25Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2d33eb5

Parents:

4d37c42

Message:

Increase debug verbosity

Location:

uspace/drv/uhci-rhd

Files:

• main.c (modified) (1 diff)
• port.c (modified) (6 diffs)
• root_hub.h (modified) (1 diff)

uspace/drv/uhci-rhd/main.c

@@ -116 +116 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
         return ddf_driver_main(&uhci_rh_driver);
 }

uspace/drv/uhci-rhd/port.c

@@ -50 +50 @@
 static int uhci_port_set_enabled(uhci_port_t *port, bool enabled);
 static int uhci_port_check(void *port);
+static int new_device_enable_port(int portno, void *arg);
 
 int uhci_port_init(
@@ -92 +93 @@
         assert(port_instance);
 
-        /* disable port, to avoid device confusion */
-        uhci_port_set_enabled(port, false);
-
         while (1) {
                 /* read register value */
@@ -109 +107 @@
 
                 if (port_status & STATUS_CONNECTED_CHANGED) {
+                        usb_log_debug("Change detected on port %d.\n", port_instance->number);
                         int rc = usb_hc_connection_open(
                             &port_instance->hc_connection);
@@ -118 +117 @@
                         /* remove any old device */
                         if (port_instance->attached_device) {
+                                usb_log_debug("Removing device on port %d.\n",
+                                    port_instance->number);
                                 uhci_port_remove_device(port_instance);
                         }
+
+                        usb_log_debug("Change status erased on port %d.\n",
+                            port_instance->number);
+                        port_status_write(port_instance->address, STATUS_CONNECTED_CHANGED);
 
                         if (port_status & STATUS_CONNECTED) {
                                 /* new device */
                                 uhci_port_new_device(port_instance);
-                        } else {
-                                port_status_write(port_instance->address, STATUS_CONNECTED_CHANGED);
                         }
 
@@ -159 +162 @@
         async_usleep(100000);
 
-        /* Enable the port. */
-        uhci_port_set_enabled(port, true);
 
         /* The hub maintains the reset signal to that port for 10 ms
@@ -181 +182 @@
         }
 
+        /* Enable the port. */
+        uhci_port_set_enabled(port, true);
+
         return EOK;
 }

uspace/drv/uhci-rhd/root_hub.h

@@ -41 +41 @@
 
 #define UHCI_ROOT_HUB_PORT_COUNT 2
-#define UHCI_ROOT_HUB_PORT_REGISTERS_OFFSET 0x10
-#define ROOT_HUB_WAIT_USEC 10000000 /* 10 seconds */
+#define ROOT_HUB_WAIT_USEC 5000000 /* 5 seconds */
 
 typedef struct root_hub {