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

Timestamp:

2011-04-29T13:43:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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) (8 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 value)
-{
-        assert(port);
-        pio_write_16(port->address, value);
+static inline void uhci_port_write_status(uhci_port_t *port, port_status_t val)
+{
+        assert(port);
+        pio_write_16(port->address, val);
 }
 /*----------------------------------------------------------------------------*/
@@ -90 +89 @@
 {
         assert(port);
-        asprintf(&port->id_string, "Port (%p - %d)", port, number);
+        asprintf(&port->id_string, "Port (%p - %u)", port, number);
         if (port->id_string == NULL) {
                 return ENOMEM;
@@ -101 +100 @@
         port->rh = rh;
 
-        int rc = usb_hc_connection_initialize_from_device(
-            &port->hc_connection, rh);
-        if (rc != EOK) {
+        int ret =
+            usb_hc_connection_initialize_from_device(&port->hc_connection, rh);
+        if (ret != EOK) {
                 usb_log_error("Failed to initialize connection to HC.");
-                return rc;
+                return ret;
         }
 
@@ -116 +115 @@
 
         fibril_add_ready(port->checker);
-        usb_log_debug("%s: Started polling fibril(%x).\n",
+        usb_log_debug("%s: Started polling fibril (%" PRIun ").\n",
             port->id_string, port->checker);
         return EOK;
@@ -238 +237 @@
         /* Enable the port. */
         uhci_port_set_enabled(port, true);
-
         return EOK;
 }
@@ -269 +267 @@
         }
 
-        usb_log_info("New device at port %u, address %d (handle %llu).\n",
+        usb_log_info("New device at port %u, address %d (handle %" PRIun ").\n",
             port->number, dev_addr, port->attached_device);
-
         return EOK;
 }
@@ -286 +283 @@
 int uhci_port_remove_device(uhci_port_t *port)
 {
-        usb_log_error("%s: Don't know how to remove device %llu.\n",
+        usb_log_error("%s: Don't know how to remove device %" PRIun ".\n",
             port->id_string, port->attached_device);
         return ENOTSUP;
@@ -313 +310 @@
         /* 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",