Changeset a83e138 in mainline

Timestamp:

2011-03-18T14:43:09Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

a7528a16

Parents:

b495a93

Message:

sollution for bug 138 (deadlock caused by incorrect asking for default address)

Location:

uspace/drv/usbhub

Files:

• usbhub.c (modified) (10 diffs)
• usbhub.h (modified) (1 diff)

uspace/drv/usbhub/usbhub.c

@@ -233 +233 @@
         result->port_count = -1;
         result->device = device;
+        result->is_default_address_used = false;
 
         //result->usb_device = usb_new(usb_hcd_attached_device_info_t);
@@ -377 +378 @@
 
 /**
+ * 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
+ */
+static 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",opResult);
+                return opResult;
+        }
+        hub->is_default_address_used = false;
+        return EOK;
+}
+
+/**
  * Reset the port with new device and reserve the default address.
  * @param hc
@@ -384 +403 @@
 static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port,
                 bool isLowSpeed) {
+        //if this hub already uses default address, it cannot request it once more
+        if(hub->is_default_address_used) return;
+
         usb_device_request_setup_packet_t request;
         int opResult;
@@ -397 +419 @@
                 return;
         }
+        hub->is_default_address_used = true;
         //reset port
         usb_hub_set_reset_port_request(&request, port);
@@ -407 +430 @@
                 usb_log_error("something went wrong when reseting a port %d",opResult);
                 //usb_hub_release_default_address(hc);
-                usb_hc_release_default_address(&hub->connection);
+                usb_hub_release_default_address(hub);
         }
 }
@@ -427 +450 @@
         if (opResult != EOK) {
                 usb_log_error("failed to clear port reset feature");
-                usb_hc_release_default_address(&hub->connection);
+                usb_hub_release_default_address(hub);
                 return;
         }
@@ -453 +476 @@
                 usb_log_error("failed to get free USB address");
                 opResult = new_device_address;
-                usb_hc_release_default_address(&hub->connection);
+                usb_hub_release_default_address(hub);
                 return;
         }
@@ -464 +487 @@
         if (opResult != EOK) {
                 usb_log_error("could not set address for new device %d",opResult);
-                usb_hc_release_default_address(&hub->connection);
+                usb_hub_release_default_address(hub);
                 return;
         }
@@ -470 +493 @@
 
         //opResult = usb_hub_release_default_address(hc);
-        opResult = usb_hc_release_default_address(&hub->connection);
+        opResult = usb_hub_release_default_address(hub);
         if(opResult!=EOK){
                 return;
@@ -529 +552 @@
                 usb_log_warning("this is strange, disconnected device had no address");
                 //device was disconnected before it`s port was reset - return default address
-                //usb_drv_release_default_address(hc);
-                usb_hc_release_default_address(&hub->connection);
+                usb_hub_release_default_address(hub);
         }
 }

uspace/drv/usbhub/usbhub.h

@@ -71 +71 @@
         /** hub endpoints */
         usb_hub_endpoints_t endpoints;
+
+        bool is_default_address_used;
 } usb_hub_info_t;