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

Timestamp:

2011-05-27T07:10:12Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ffca03c

Parents:

8bb61e6 (diff), 1889786 (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 with usb/development

File:

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

uspace/drv/uhci-rhd/port.c

@@ -36 +36 @@
 #include <errno.h>
 #include <str_error.h>
-#include <time.h>
 #include <async.h>
 
@@ -82 +81 @@
  * @param[in] number Port number.
  * @param[in] usec Polling interval.
- * @param[in] rh Pointer to ddf instance fo the root hub driver.
+ * @param[in] rh Pointer to ddf instance of the root hub driver.
  * @return Error code.
  *
@@ -91 +90 @@
 {
         assert(port);
-        asprintf(&port->id_string, "Port (%p - %u)", port, number);
-        if (port->id_string == NULL) {
+        char *id_string;
+        asprintf(&id_string, "Port (%p - %u)", port, number);
+        if (id_string == NULL) {
                 return ENOMEM;
         }
 
+        port->id_string = id_string;
         port->address = address;
         port->number = number;
@@ -105 +106 @@
             usb_hc_connection_initialize_from_device(&port->hc_connection, rh);
         if (ret != EOK) {
-                usb_log_error("Failed to initialize connection to HC.");
+                usb_log_error("%s: failed to initialize connection to HC.",
+                    port->id_string);
+                free(id_string);
                 return ret;
         }
@@ -113 +116 @@
                 usb_log_error("%s: failed to create polling fibril.",
                     port->id_string);
+                free(id_string);
                 return ENOMEM;
         }
@@ -132 +136 @@
         assert(port);
         free(port->id_string);
-        /* TODO: Kill fibril here */
+        // TODO: Kill fibril here
         return;
 }
@@ -150 +154 @@
 
                 /* Read register value */
-                port_status_t port_status = uhci_port_read_status(instance);
+                const port_status_t port_status =
+                    uhci_port_read_status(instance);
 
                 /* Print the value if it's interesting */
@@ -161 +166 @@
                 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("%s: Failed to connect to HC.",
-                            instance->id_string);
-                        continue;
-                }
 
                 /* Remove any old device */
@@ -175 +172 @@
                             instance->id_string);
                         uhci_port_remove_device(instance);
+                }
+
+                int ret =
+                    usb_hc_connection_open(&instance->hc_connection);
+                if (ret != EOK) {
+                        usb_log_error("%s: Failed to connect to HC.",
+                            instance->id_string);
+                        continue;
                 }
 
@@ -190 +195 @@
                 }
 
-                rc = usb_hc_connection_close(&instance->hc_connection);
-                if (rc != EOK) {
+                ret = usb_hc_connection_close(&instance->hc_connection);
+                if (ret != EOK) {
                         usb_log_error("%s: Failed to disconnect.",
                             instance->id_string);
@@ -209 +214 @@
 int uhci_port_reset_enable(int portno, void *arg)
 {
-        uhci_port_t *port = (uhci_port_t *) arg;
+        uhci_port_t *port = arg;
+        assert(port);
 
         usb_log_debug2("%s: new_device_enable_port.\n", port->id_string);
@@ -283 +289 @@
         usb_log_error("%s: Don't know how to remove device %" PRIun ".\n",
             port->id_string, port->attached_device);
+        port->attached_device = 0;
         return ENOTSUP;
 }