Changes in uspace/drv/uhci-rhd/port.c [dced52a:87157982] in mainline

File:

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

uspace/drv/uhci-rhd/port.c

@@ -34 +34 @@
 #include <errno.h>
 #include <str_error.h>
-#include <fibril_synch.h>
 
 #include <usb/usb.h>    /* usb_address_t */
@@ -46 +45 @@
 #include "port_status.h"
 
-static int uhci_port_new_device(uhci_port_t *port, uint16_t status);
+static int uhci_port_new_device(uhci_port_t *port);
 static int uhci_port_remove_device(uhci_port_t *port);
 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(
   uhci_port_t *port, port_status_t *address, unsigned number,
-  unsigned usec, ddf_dev_t *rh)
+  unsigned usec, ddf_dev_t *rh, int parent_phone)
 {
         assert(port);
@@ -71 +69 @@
         port->checker = fibril_create(uhci_port_check, port);
         if (port->checker == 0) {
-                usb_log_error("Port(%p - %d): failed to launch root hub fibril.",
-                    port->address, port->number);
+                usb_log_error(": failed to launch root hub fibril.");
                 return ENOMEM;
         }
         fibril_add_ready(port->checker);
-        usb_log_debug("Port(%p - %d): Added fibril. %x\n",
-            port->address, port->number, port->checker);
+        usb_log_debug(
+          "Added fibril for port %d: %p.\n", number, port->checker);
         return EOK;
 }
@@ -93 +90 @@
         uhci_port_t *port_instance = port;
         assert(port_instance);
-//      port_status_write(port_instance->address, 0);
-
-        unsigned count = 0;
 
         while (1) {
-                async_usleep(port_instance->wait_period_usec);
-
                 /* read register value */
                 port_status_t port_status =
@@ -105 +97 @@
 
                 /* debug print */
-                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",
-                  port_instance->address, port_instance->number, port_status, count++);
-//              print_port_status(port_status);
-                fibril_mutex_unlock(&dbg_mtx);
-
-                if ((port_status & STATUS_CONNECTED_CHANGED) != 0) {
-                        usb_log_debug("Port(%p - %d): Connected change detected: %x.\n",
-                            port_instance->address, port_instance->number, port_status);
-
-
+                usb_log_debug("Port %d status at %p: 0x%04x.\n",
+                  port_instance->number, port_instance->address, port_status);
+                print_port_status(port_status);
+
+                if (port_status & STATUS_CONNECTED_CHANGED) {
                         int rc = usb_hc_connection_open(
                             &port_instance->hc_connection);
                         if (rc != EOK) {
-                                usb_log_error("Port(%p - %d): Failed to connect to HC.",
-                                    port_instance->address, port_instance->number);
-                                continue;
+                                usb_log_error("Failed to connect to HC.");
+                                goto next;
                         }
 
-                        /* remove any old device */
-                        if (port_instance->attached_device) {
-                                usb_log_debug("Port(%p - %d): Removing device.\n",
-                                    port_instance->address, port_instance->number);
+                        if (port_status & STATUS_CONNECTED) {
+                                /* new device */
+                                uhci_port_new_device(port_instance);
+                        } else {
                                 uhci_port_remove_device(port_instance);
-                        }
-
-                        if ((port_status & STATUS_CONNECTED) != 0) {
-                                /* new device */
-                                uhci_port_new_device(port_instance, port_status);
-                        } else {
-                                /* ack changes by writing one to WC bits */
-                                port_status_write(port_instance->address, port_status);
-                                usb_log_debug("Port(%p - %d): Change status ACK.\n",
-                                                port_instance->address, port_instance->number);
                         }
 
@@ -145 +119 @@
                             &port_instance->hc_connection);
                         if (rc != EOK) {
-                                usb_log_error("Port(%p - %d): Failed to disconnect from HC.",
-                                    port_instance->address, port_instance->number);
+                                usb_log_error("Failed to disconnect from HC.");
+                                goto next;
                         }
                 }
+        next:
+                async_usleep(port_instance->wait_period_usec);
         }
         return EOK;
@@ -163 +139 @@
         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_debug("new_device_enable_port(%d)\n", port->number);
 
         /*
@@ -172 +147 @@
         async_usleep(100000);
 
+        /* Enable the port. */
+        uhci_port_set_enabled(port, true);
 
         /* The hub maintains the reset signal to that port for 10 ms
@@ -177 +154 @@
          */
         {
-                usb_log_debug("Port(%p - %d): Reset Signal start.\n",
-                    port->address, port->number);
+                usb_log_debug("Reset Signal start on port %d.\n",
+                    port->number);
                 port_status_t port_status =
                         port_status_read(port->address);
@@ -188 +165 @@
                 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);
-        }
-
-        /* Enable the port. */
-        uhci_port_set_enabled(port, true);
-
-        return EOK;
-}
-
-/*----------------------------------------------------------------------------*/
-static int uhci_port_new_device(uhci_port_t *port, uint16_t status)
+                usb_log_debug("Reset Signal stop on port %d.\n",
+                    port->number);
+        }
+
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+static int uhci_port_new_device(uhci_port_t *port)
 {
         assert(port);
         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("Detected new device on port %u.\n", port->number);
 
         usb_address_t dev_addr;
         int rc = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
-            ((status & STATUS_LOW_SPEED) != 0) ? USB_SPEED_LOW : USB_SPEED_FULL,
+            USB_SPEED_FULL,
             new_device_enable_port, port->number, port,
             &dev_addr, &port->attached_device, NULL, NULL, NULL);
-
         if (rc != EOK) {
-                usb_log_error("Port(%p-%d): Failed(%d) adding new device: %s.\n",
-                    port->address, port->number, rc, str_error(rc));
+                usb_log_error("Failed adding new device on port %u: %s.\n",
+                    port->number, 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("New device on port %u has address %d (handle %zu).\n",
+            port->number, dev_addr, port->attached_device);
 
         return EOK;
@@ -229 +201 @@
 static 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("Don't know how to remove device %#x.\n",
+                (unsigned int)port->attached_device);
 //      uhci_port_set_enabled(port, false);
         return EOK;
@@ -251 +223 @@
         port_status_write(port->address, port_status);
 
-        usb_log_info("Port(%p-%d): %sabled port.\n",
-                port->address, port->number, enabled ? "En" : "Dis");
+        usb_log_info("%s port %d.\n",
+          enabled ? "Enabled" : "Disabled", port->number);
         return EOK;
 }