Changeset 46e078a in mainline for uspace/drv/usbhub

Timestamp:

2011-04-09T23:50:05Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1c258d1

Parents:

0748854

Message:

USBHC iface: remove default address reservation

This functionality is now handled via endpoint registration.

Also removed references to this function from hub driver. Either they
were unreachable or would break things anyway.

Location:

uspace/drv/usbhub

Files:

• ports.c (modified) (3 diffs)
• ports.h (modified) (1 diff)
• usbhub.c (modified) (1 diff)
• usbhub.h (modified) (1 diff)

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;
+        }
 }
 

uspace/drv/usbhub/ports.h

@@ -51 +51 @@
          */
         bool reset_completed;
+        /** Whether to announce the port reset as successful. */
+        bool reset_okay;
 
         /** Information about attached device. */

uspace/drv/usbhub/usbhub.c

@@ -177 +177 @@
 
         return true;
-}
-
-/**
- * release default address used by given hub
- *
- * Also unsets hub->is_default_address_used. Convenience wrapper function.
- * @note hub->connection MUST be open for communication
- * @param hub hub representation
- * @return error code
- */
-int usb_hub_release_default_address(usb_hub_info_t * hub) {
-        int opResult = usb_hc_release_default_address(&hub->connection);
-        if (opResult != EOK) {
-                usb_log_error("could not release default address, errno %d\n",
-                    opResult);
-                return opResult;
-        }
-        hub->is_default_address_used = false;
-        return EOK;
 }
 

uspace/drv/usbhub/usbhub.h

@@ -98 +98 @@
     uint8_t *change_bitmap, size_t change_bitmap_size, void *arg);
 
-int usb_hub_release_default_address(usb_hub_info_t * hub);
-
 #endif
 /**