Changeset 7be3638 in mainline

Timestamp:

2011-10-12T18:19:01Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

844f4ef

Parents:

96fde65

Message:

uhcirh: Handle ghost device removal, improve output.

File:

• uspace/drv/bus/usb/uhcirh/port.c (modified) (2 diffs)

uspace/drv/bus/usb/uhcirh/port.c

@@ -285 +285 @@
 int uhci_port_remove_device(uhci_port_t *port)
 {
-        usb_log_debug("Removing device on port %zu.\n", port->number);
+        assert(port);
+        /* There is nothing to remove. */
+        if (port->attached_device.handle == 0) {
+                usb_log_warning("%s: Removed a ghost device.\n",
+                    port->id_string);
+                assert(port->attached_device.address == -1);
+                return EOK;
+        }
+
+        usb_log_debug("%s: Removing device.\n", port->id_string);
 
         /* Stop driver first */
         int ret = devman_remove_function(port->attached_device.handle);
         if (ret != EOK) {
-                usb_log_error("Failed to remove child function on port"
-                   " %zu: %s.\n", port->number, str_error(ret));
+                usb_log_error("%s: Failed to remove child function: %s.\n",
+                   port->id_string, str_error(ret));
                 return ret;
         }
@@ -300 +309 @@
             port->attached_device.address);
         if (ret != EOK) {
-                usb_log_error("Failed to unregister address of removed device: "
-                    "%s.\n", str_error(ret));
+                usb_log_error("%s: Failed to unregister address of removed "
+                    "device: %s.\n", port->id_string, str_error(ret));
                 return ret;
         }
-
         port->attached_device.address = -1;
-        usb_log_info("Removed device on port %zu.\n", port->number);
+
+        usb_log_info("%s: Removed attached device.\n", port->id_string);
         return EOK;
 }