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

Timestamp:

2011-05-06T15:40:46Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

3b543d5

Parents:

26f6094

Message:

bugfix candidates: ohci: detecting devices connected on startup
hub driver: status change clearing

File:

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

uspace/drv/usbhub/ports.c

@@ -137 +137 @@
             &status, USB_HUB_FEATURE_C_PORT_OVER_CURRENT,false);
         /// \TODO what about port power change?
+        unsigned int bit_idx;
+        for(bit_idx = 16;bit_idx<32;++bit_idx){
+                if(status & (1<<bit_idx)){
+                        usb_log_info(
+                            "there was unsupported change on port %d: %d\n",
+                        port, bit_idx);
+                        int opResult = usb_hub_clear_port_feature(
+                            hub->control_pipe,
+                            port, USB_HUB_FEATURE_C_PORT_CONNECTION);
+                        if (opResult != EOK) {
+                                usb_log_warning(
+                                    "could not clear port flag %d: %d\n",
+                                    bit_idx, opResult
+                                    );
+                        }
+                        usb_port_status_set_bit(
+                            &status, bit_idx,false);
+                }
+        }
         if (status >> 16) {
                 usb_log_info("there was unsupported change on port %d: %X\n",
                         port, status);
-
         }
 }
@@ -222 +240 @@
                     "Port %zu reset complete but port not enabled.\n",
                     (size_t) port);
+        }
+        /* Clear the port reset change. */
+        int rc = usb_hub_clear_port_feature(hub->control_pipe,
+            port, USB_HUB_FEATURE_C_PORT_RESET);
+        if (rc != EOK) {
+                usb_log_error("Failed to clear port %d reset feature: %s.\n",
+                    port, str_error(rc));
         }
 }
@@ -319 +344 @@
         fibril_mutex_unlock(&my_port->reset_mutex);
 
-        /* Clear the port reset change. */
-        rc = usb_hub_clear_port_feature(hub->control_pipe,
-            port_no, USB_HUB_FEATURE_C_PORT_RESET);
-        if (rc != EOK) {
-                usb_log_error("Failed to clear port %d reset feature: %s.\n",
-                    port_no, str_error(rc));
-                return rc;
-        }
-
         if (my_port->reset_okay) {
                 return EOK;