Changeset 98637224 in mainline

Timestamp:

2011-03-18T16:31:50Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

382f3266, 411d9fa, f0a1c86

Parents:

d8e61b0d (diff), e93e319 (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:

second fix of bug 138(multiple new devices deadlock), works in qemu

File:

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

uspace/drv/usbhub/usbhub.c

@@ -405 +405 @@
         //if this hub already uses default address, it cannot request it once more
         if(hub->is_default_address_used) return;
+        int opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+                                port, USB_HUB_FEATURE_C_PORT_CONNECTION);
+        if(opResult != EOK){
+                usb_log_warning("could not clear port-change-connection flag");
+        }
 
         usb_device_request_setup_packet_t request;
-        int opResult;
         usb_log_info("some connection changed");
         assert(hub->endpoints.control.hc_phone);
@@ -431 +435 @@
                 usb_hub_release_default_address(hub);
         }
+        return;
 }
 
@@ -531 +536 @@
 static void usb_hub_removed_device(
     usb_hub_info_t * hub,uint16_t port) {
-                
+
+        int opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+                                port, USB_HUB_FEATURE_C_PORT_CONNECTION);
+        if(opResult != EOK){
+                usb_log_warning("could not clear port-change-connection flag");
+        }
         /** \TODO remove device from device manager - not yet implemented in
          * devide manager
@@ -611 +621 @@
         //something connected/disconnected
         if (usb_port_connect_change(&status)) {
-                opResult = usb_hub_clear_port_feature(pipe,
-                    port, USB_HUB_FEATURE_C_PORT_CONNECTION);
-                // TODO: check opResult
                 if (usb_port_dev_connected(&status)) {
                         usb_log_info("some connection changed");