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

Timestamp:

2011-03-13T22:02:44Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b7d8fd9

Parents:

67f54965 (diff), deb4ba7 (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:

Merge development/ changes

File:

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

uspace/drv/uhci-rhd/port.c

@@ -44 +44 @@
 
 #include "port.h"
-#include "port_status.h"
 
 static int uhci_port_new_device(uhci_port_t *port, usb_speed_t speed);
@@ -67 +66 @@
 {
         assert(port);
+        asprintf(&port->id_string, "Port (%p - %d)", port, number);
+        if (port->id_string == NULL) {
+                return ENOMEM;
+        }
 
         port->address = address;
@@ -116 +119 @@
         assert(instance);
 
-        /* Iteration count, for debug purposes only */
-        unsigned count = 0;
-
         while (1) {
                 async_usleep(instance->wait_period_usec);
 
                 /* read register value */
-                port_status_t port_status = port_status_read(instance->address);
-
-                /* debug print mutex */
-                static fibril_mutex_t dbg_mtx =
-                    FIBRIL_MUTEX_INITIALIZER(dbg_mtx);
-                fibril_mutex_lock(&dbg_mtx);
-                usb_log_debug2("Port(%p - %d): Status: %#04x. === %u\n",
-                  instance->address, instance->number, port_status, count++);
-//              print_port_status(port_status);
-                fibril_mutex_unlock(&dbg_mtx);
+                port_status_t port_status = uhci_port_read_status(instance);
+
+                /* print the value if it's interesting */
+                if (port_status & ~STATUS_ALWAYS_ONE)
+                        uhci_port_print_status(instance, port_status);
 
                 if ((port_status & STATUS_CONNECTED_CHANGED) == 0)
                         continue;
 
-                usb_log_debug("Port(%p - %d): Connected change detected: %x.\n",
-                    instance->address, instance->number, port_status);
+                usb_log_debug("%s: Connected change detected: %x.\n",
+                    instance->id_string, port_status);
 
                 int rc =
                     usb_hc_connection_open(&instance->hc_connection);
                 if (rc != EOK) {
-                        usb_log_error("Port(%p - %d): Failed to connect to HC.",
-                            instance->address, instance->number);
+                        usb_log_error("%s: Failed to connect to HC.",
+                            instance->id_string);
                         continue;
                 }
@@ -150 +145 @@
                 /* Remove any old device */
                 if (instance->attached_device) {
-                        usb_log_debug2("Port(%p - %d): Removing device.\n",
-                            instance->address, instance->number);
+                        usb_log_debug2("%s: Removing device.\n",
+                            instance->id_string);
                         uhci_port_remove_device(instance);
                 }
@@ -163 +158 @@
                 } else {
                         /* Write one to WC bits, to ack changes */
-                        port_status_write(instance->address, port_status);
-                        usb_log_debug("Port(%p - %d): Change status ACK.\n",
-                            instance->address, instance->number);
+                        uhci_port_write_status(instance, port_status);
+                        usb_log_debug("%s: status change ACK.\n",
+                            instance->id_string);
                 }
 
                 rc = usb_hc_connection_close(&instance->hc_connection);
                 if (rc != EOK) {
-                        usb_log_error("Port(%p - %d): Failed to disconnect.",
-                            instance->address, instance->number);
+                        usb_log_error("%s: Failed to disconnect.",
+                            instance->id_string);
                 }
         }
@@ -187 +182 @@
         uhci_port_t *port = (uhci_port_t *) arg;
 
-        usb_log_debug2("Port(%p - %d): new_device_enable_port.\n",
-            port->address, port->number);
+        usb_log_debug2("%s: new_device_enable_port.\n", port->id_string);
 
         /*
@@ -196 +190 @@
         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("Port(%p - %d): Reset Signal start.\n",
-                    port->address, port->number);
-                port_status_t port_status =
-                        port_status_read(port->address);
+                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;
-                port_status_write(port->address, port_status);
-                async_usleep(10000);
-                port_status = port_status_read(port->address);
+                uhci_port_write_status(port, port_status);
+                async_usleep(50000);
+                port_status = uhci_port_read_status(port);
                 port_status &= ~STATUS_IN_RESET;
-                port_status_write(port->address, port_status);
-                usb_log_debug("Port(%p - %d): Reset Signal stop.\n",
-                    port->address, port->number);
-        }
+                uhci_port_write_status(port, port_status);
+                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;
 }
@@ -233 +227 @@
         assert(usb_hc_connection_is_opened(&port->hc_connection));
 
-        usb_log_info("Port(%p-%d): Detected new device.\n",
-            port->address, port->number);
+        usb_log_info("%s: Detected new device.\n", port->id_string);
 
         usb_address_t dev_addr;
@@ -242 +235 @@
 
         if (rc != EOK) {
-                usb_log_error("Port(%p-%d): Failed(%d) to add device: %s.\n",
-                    port->address, port->number, rc, str_error(rc));
+                usb_log_error("%s: Failed(%d) to add device: %s.\n",
+                    port->id_string, rc, str_error(rc));
                 uhci_port_set_enabled(port, false);
                 return rc;
         }
 
-        usb_log_info("Port(%p-%d): New device has address %d (handle %zu).\n",
-            port->address, port->number, dev_addr, port->attached_device);
+        usb_log_info("%s: New device has address %d (handle %zu).\n",
+            port->id_string, dev_addr, port->attached_device);
 
         return EOK;
@@ -263 +256 @@
 int uhci_port_remove_device(uhci_port_t *port)
 {
-        usb_log_error("Port(%p-%d): Don't know how to remove device %#x.\n",
-            port->address, port->number, (unsigned int)port->attached_device);
+        usb_log_error("%s: Don't know how to remove device %d.\n",
+            port->id_string, (unsigned int)port->attached_device);
         return EOK;
 }
@@ -278 +271 @@
 
         /* Read register value */
-        port_status_t port_status = port_status_read(port->address);
+        port_status_t port_status = uhci_port_read_status(port);
 
         /* Set enabled bit */
@@ -288 +281 @@
 
         /* Write new value. */
-        port_status_write(port->address, port_status);
-
-        usb_log_info("Port(%p-%d): %sabled port.\n",
-                port->address, port->number, enabled ? "En" : "Dis");
+        uhci_port_write_status(port, port_status);
+
+        usb_log_info("%s: %sabled port.\n",
+                port->id_string, enabled ? "En" : "Dis");
         return EOK;
 }