Changeset edc4c66 in mainline for uspace/drv/usbhub/ports.c

Timestamp:

2011-04-10T08:16:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

86b4ee0

Parents:

a19a2d7 (diff), d824daf (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:

Development branch changes

File:

• uspace/drv/usbhub/ports.c (modified) (3 diffs)

uspace/drv/usbhub/ports.c

@@ -181 +181 @@
                  */
         } else {
-                usb_log_warning("this is strange, disconnected device had "
-                        "no address\n");
-                //device was disconnected before it`s port was reset -
-                //return default address
-                usb_hub_release_default_address(hub);
+                // TODO: is this really reason to print a warning?
+                usb_log_warning("Device removed before being registered.\n");
+
+                /*
+                 * Device was removed before port reset completed.
+                 * We will announce a failed port reset to unblock the
+                 * port reset callback from new device wrapper.
+                 */
+                usb_hub_port_t *the_port = hub->ports + port;
+                fibril_mutex_lock(&the_port->reset_mutex);
+                the_port->reset_completed = true;
+                the_port->reset_okay = false;
+                fibril_condvar_broadcast(&the_port->reset_cv);
+                fibril_mutex_unlock(&the_port->reset_mutex);
         }
 }
@@ -207 +216 @@
                 fibril_mutex_lock(&the_port->reset_mutex);
                 the_port->reset_completed = true;
+                the_port->reset_okay = true;
                 fibril_condvar_broadcast(&the_port->reset_cv);
                 fibril_mutex_unlock(&the_port->reset_mutex);
@@ -319 +329 @@
         }
 
-        return EOK;
+        if (my_port->reset_okay) {
+                return EOK;
+        } else {
+                return ESTALL;
+        }
 }