Changeset 8351f9a4 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2015-08-25T04:17:36Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b4b534ac

Parents:

691130cf

Message:

usbhub: Rework port reset a bit.

return error if port reset did not end up with enabled port

File:

• uspace/drv/bus/usb/usbhub/port.c (modified) (4 diffs)

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

@@ -175 +175 @@
                 } else {
                         /* Handle the case we were in reset */
-                        usb_hub_port_reset_fail(port);
+                        //usb_hub_port_reset_fail(port);
                         /* If enabled change was reported leave the removal
                          * to that handler, it shall ACK the change too. */
@@ -353 +353 @@
 {
         if (enable) {
-                const int rc =
+                int rc =
                     usb_hub_port_set_feature(port, USB_HUB_FEATURE_PORT_RESET);
                 if (rc != EOK) {
-                        usb_log_error("(%p-%u): Port reset failed: %s.\n",
+                        usb_log_error("(%p-%u): Port reset request failed: %s.",
                             hub, port->port_number, str_error(rc));
                         return rc;
@@ -363 +363 @@
                 fibril_mutex_lock(&port->mutex);
                 port->reset_status = IN_RESET;
-                while (port->reset_status == IN_RESET) {
-                        fibril_condvar_wait(&port->reset_cv,
-                            &port->mutex);
-                }
+                while (port->reset_status == IN_RESET)
+                        fibril_condvar_wait(&port->reset_cv, &port->mutex);
+                rc = port->reset_status == RESET_OK ? EOK : ESTALL;
                 fibril_mutex_unlock(&port->mutex);
-                return port->reset_status == RESET_OK ? EOK : ESTALL;
+                return rc;
         } else {
                 return usb_hub_port_clear_feature(port,
@@ -394 +393 @@
         free(arg);
 
-        usb_log_debug("(%p-%u): New device detected.", hub,
-            port->port_number);
+        usb_log_debug("(%p-%u): New device sequence.", hub, port->port_number);
 
         async_exch_t *exch = usb_device_bus_exchange_begin(hub->usb_device);