Changeset 0d103aef in mainline

Timestamp:

2011-10-12T21:21:30Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

612af1a0

Parents:

32ec5671

Message:

uhcirh: make sure connection to hc is opoen during device removal.

Add error message and change error code to ENOTCONN if there is no connection to the hc.

Location:

uspace

Files:

• drv/bus/usb/uhcirh/port.c (modified) (2 diffs)
• lib/usbdev/src/hub.c (modified) (1 diff)

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

@@ -165 +165 @@
                         continue;
 
-                usb_log_debug("%s: Connected change detected: %x.\n",
-                    instance->id_string, port_status);
-
-                /* Remove any old device */
-                if (instance->attached_device.fun) {
-                        usb_log_debug2("%s: Removing device.\n",
-                            instance->id_string);
-                        uhci_port_remove_device(instance);
-                }
-
                 int ret =
                     usb_hc_connection_open(&instance->hc_connection);
@@ -182 +172 @@
                         continue;
                 }
+
+                usb_log_debug("%s: Connected change detected: %x.\n",
+                    instance->id_string, port_status);
+
+                /* Remove any old device */
+                if (instance->attached_device.fun) {
+                        usb_log_debug2("%s: Removing device.\n",
+                            instance->id_string);
+                        uhci_port_remove_device(instance);
+                }
+
 
                 if ((port_status & STATUS_CONNECTED) != 0) {

uspace/lib/usbdev/src/hub.c

@@ -57 +57 @@
                 assert((conn)); \
                 if (!usb_hc_connection_is_opened((conn))) { \
-                        return ENOENT; \
+                        usb_log_error("Connection not open.\n"); \
+                        return ENOTCONN; \
                 } \
         } while (false)