Changes in uspace/drv/uhci-rhd/port.c [c0cea918:f9c03b5] in mainline

File:

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

uspace/drv/uhci-rhd/port.c

@@ -68 +68 @@
  * @return Error code. (Always EOK)
  */
-static inline void uhci_port_write_status(uhci_port_t *port, port_status_t val)
-{
-        assert(port);
-        pio_write_16(port->address, val);
+static inline void uhci_port_write_status(
+    uhci_port_t *port, port_status_t value)
+{
+        assert(port);
+        pio_write_16(port->address, value);
 }
 /*----------------------------------------------------------------------------*/
@@ -100 +101 @@
         port->rh = rh;
 
-        int ret =
-            usb_hc_connection_initialize_from_device(&port->hc_connection, rh);
-        if (ret != EOK) {
+        int rc = usb_hc_connection_initialize_from_device(
+            &port->hc_connection, rh);
+        if (rc != EOK) {
                 usb_log_error("Failed to initialize connection to HC.");
-                return ret;
+                return rc;
         }
 
@@ -237 +238 @@
         /* Enable the port. */
         uhci_port_set_enabled(port, true);
+
         return EOK;
 }
@@ -269 +271 @@
         usb_log_info("New device at port %u, address %d (handle %llu).\n",
             port->number, dev_addr, port->attached_device);
+
         return EOK;
 }
@@ -310 +313 @@
         /* Write new value. */
         uhci_port_write_status(port, port_status);
-
-        /* Wait for port to become enabled */
-        do {
-                async_usleep(1000);
-                port_status = uhci_port_read_status(port);
-        } while ((port_status & STATUS_CONNECTED) &&
-            !(port_status & STATUS_ENABLED));
 
         usb_log_debug("%s: %sabled port.\n",