Changeset 0212751 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2011-09-23T19:06:37Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

aefa0d5

Parents:

4559d89

Message:

usbhub: IMplement some easy TODOs

Convert process_intterrupt to use usb_hub_port_t structure instead of index.

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (5 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -170 +170 @@
         usb_log_debug("hub_port_changes_callback\n");
         usb_hub_info_t *hub = arg;
-
-        /* FIXME: check that we received enough bytes. */
+        assert(hub);
+
+        /* It is an error condition if we didn't receive enough data */
         if (change_bitmap_size == 0) {
-                goto leave;
+                return false;
         }
 
@@ -187 +188 @@
                 const bool change = (change_bitmap[port / 8] >> (port % 8)) & 1;
                 if (change) {
-                        usb_hub_port_process_interrupt(hub, port);
+                        usb_hub_port_process_interrupt(&hub->ports[port], hub);
                 }
         }
-leave:
-        /* FIXME: proper interval. */
-        // TODO Interval should be handled by USB HC scheduler not here
-        async_usleep(1000 * 250);
-
         return true;
 }
@@ -256 +252 @@
         hub_info->port_count = descriptor.port_count;
 
-        // TODO Why +1 ?
+        // TODO: +1 hack is no longer necessary
         hub_info->ports =
             malloc(sizeof(usb_hub_port_t) * (hub_info->port_count + 1));
@@ -349 +345 @@
 {
         if (status & USB_HUB_STATUS_OVER_CURRENT) {
-                /* Over-current detected on one or all ports,
-                 * switch them all off to prevent damage. */
-                //TODO Consider ganged power switching here.
-                //TODO Hub should have turned the ports off already,
-                //this is redundant.
-                size_t port;
-                for (port = 1; port <= hub_info->port_count; ++port) {
-                        const int opResult = usb_hub_port_clear_feature(
-                            &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
-                        if (opResult != EOK) {
-                                usb_log_warning(
-                                    "HUB OVER-CURRENT: Cannot power off port"
-                                    " %d:  %s\n",
-                                    port, str_error(opResult));
-                        }
-                }
+                /* Hub should remove power from all ports if it detects OC */
+                usb_log_warning("Detected hub over-current condition, "
+                    "all ports should be powered off.");
         } else {
                 /* Over-current condition is gone, it is safe to turn the
@@ -379 +362 @@
                         }
                 }
+        }
+        const int opResult = usb_request_clear_feature(
+            &hub_info->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS,
+            USB_REQUEST_RECIPIENT_DEVICE,
+            USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0);
+        if (opResult != EOK) {
+                usb_log_error(
+                    "Failed to clear hub over-current change flag: %s.\n",
+                    str_error(opResult));
         }
 }