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

File:

• uspace/drv/uhci-rhd/port.c (modified) (8 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);
@@ -92 +90 @@
         uhci_port_t *port_instance = port;
         assert(port_instance);
-        port_status_write(port_instance->address, 0);
-
-        uint64_t count = 0;
 
         while (1) {
-                async_usleep(port_instance->wait_period_usec);
-
                 /* read register value */
                 port_status_t port_status =
@@ -104 +97 @@
 
                 /* debug print */
-                static fibril_mutex_t dbg_mtx = FIBRIL_MUTEX_INITIALIZER(dbg_mtx);
-                fibril_mutex_lock(&dbg_mtx);
-                usb_log_debug("Port %d status at %p: 0x%04x. === %llu\n",
-                  port_instance->number, port_instance->address, port_status, count++);
-//              print_port_status(port_status);
-                fibril_mutex_unlock(&dbg_mtx);
-
-                if ((port_status & STATUS_CONNECTED_CHANGED) != 0) {
-                        usb_log_debug("Change detected on port %d: %x.\n",
-                            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("Failed to connect to HC.");
-                                continue;
+                                goto next;
                         }
 
-                        /* remove any old device */
-                        if (port_instance->attached_device) {
-                                usb_log_debug("Removing device on port %d.\n",
-                                    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("Change status ack on port %d.\n",
-                                                port_instance->number);
                         }
 
@@ -144 +120 @@
                         if (rc != EOK) {
                                 usb_log_error("Failed to disconnect from HC.");
+                                goto next;
                         }
                 }
+        next:
+                async_usleep(port_instance->wait_period_usec);
         }
         return EOK;
@@ -168 +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
@@ -188 +169 @@
         }
 
-        /* Enable the port. */
-        uhci_port_set_enabled(port, true);
-
-        return EOK;
-}
-
-/*----------------------------------------------------------------------------*/
-static int uhci_port_new_device(uhci_port_t *port, uint16_t status)
+        return EOK;
+}
+
+/*----------------------------------------------------------------------------*/
+static int uhci_port_new_device(uhci_port_t *port)
 {
         assert(port);
@@ -204 +182 @@
         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("Failed adding new device on port %u: %s.\n",