Changeset a14d6a7 in mainline

Timestamp:

2011-10-13T12:54:36Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3875af65

Parents:

eda7a4e0

Message:

usbhub: Remove +1 port_count hack

File:

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

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

@@ -178 +178 @@
 
         opResult = usb_device_auto_poll(hub_dev->usb_device, 0,
-            hub_port_changes_callback, ((hub_dev->port_count + 1) / 8) + 1,
+            hub_port_changes_callback, ((hub_dev->port_count + 1 + 8) / 8),
             usb_hub_polling_terminated_callback, hub_dev);
         if (opResult != EOK) {
@@ -223 +223 @@
 
         /* N + 1 bit indicates change on port N */
-        size_t port = 1;
-        for (; port < hub->port_count + 1; port++) {
-                const bool change = (change_bitmap[port / 8] >> (port % 8)) & 1;
+        for (size_t port = 0; port < hub->port_count + 1; port++) {
+                const size_t bit = port + 1;
+                const bool change = (change_bitmap[bit / 8] >> (bit % 8)) & 1;
                 if (change) {
                         usb_hub_port_process_interrupt(&hub->ports[port], hub);
@@ -250 +250 @@
 
         hub_dev->ports = NULL;
-        hub_dev->port_count = -1;
+        hub_dev->port_count = 0;
         hub_dev->pending_ops_count = 0;
         hub_dev->running = false;
@@ -293 +293 @@
         hub_dev->port_count = descriptor.port_count;
 
-        // TODO: +1 hack is no longer necessary
-        hub_dev->ports =
-            calloc(hub_dev->port_count + 1, sizeof(usb_hub_port_t));
+        hub_dev->ports = calloc(hub_dev->port_count, sizeof(usb_hub_port_t));
         if (!hub_dev->ports) {
                 return ENOMEM;
         }
 
-        for (size_t port = 1; port < hub_dev->port_count + 1; ++port) {
-                usb_hub_port_init(&hub_dev->ports[port], port, control_pipe);
+        for (size_t port = 0; port < hub_dev->port_count; ++port) {
+                usb_hub_port_init(
+                    &hub_dev->ports[port], port + 1, control_pipe);
         }
 
@@ -311 +310 @@
                     & HUB_CHAR_POWER_PER_PORT_FLAG;
 
-                for (size_t port = 1; port <= hub_dev->port_count; ++port) {
+                for (size_t port = 0; port < hub_dev->port_count; ++port) {
                         usb_log_debug("Powering port %zu.\n", port);
                         opResult = usb_hub_port_set_feature(
@@ -398 +397 @@
                 /* Over-current condition is gone, it is safe to turn the
                  * ports on. */
-                size_t port;
-                for (port = 1; port <= hub_dev->port_count; ++port) {
+                for (size_t port = 0; port < hub_dev->port_count; ++port) {
                         const int opResult = usb_hub_port_set_feature(
                             &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
+                        // TODO: consider power policy here
                         if (opResult != EOK) {
                                 usb_log_warning(
@@ -507 +506 @@
          */
         if (hub->pending_ops_count > 0) {
-                size_t port;
-                for (port = 0; port < hub->port_count; port++) {
+                for (size_t port = 0; port < hub->port_count; ++port) {
                         usb_hub_port_reset_fail(&hub->ports[port]);
                 }