Changeset 6f05705 in mainline

Timestamp:

2011-10-07T17:12:30Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fec6bf2

Parents:

75f9dcd

Message:

usbhub: Declare iteration variables inside for loops.

Codestyle.

Location:

uspace/drv/bus/usb/usbhub

Files:

• port.c (modified) (1 diff)
• usbhub.c (modified) (3 diffs)

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

@@ -469 +469 @@
         assert(port);
         struct add_device_phase1 *data
-            = malloc(sizeof (struct add_device_phase1));
+            = malloc(sizeof(struct add_device_phase1));
         if (data == NULL) {
                 return ENOMEM;

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

@@ -212 +212 @@
         info->ports = NULL;
         info->port_count = -1;
+        info->pending_ops_count = 0;
         fibril_mutex_initialize(&info->pending_ops_mutex);
         fibril_condvar_initialize(&info->pending_ops_cv);
-        info->pending_ops_count = 0;
 
         return info;
@@ -254 +254 @@
         // TODO: +1 hack is no longer necessary
         hub_info->ports =
-            malloc(sizeof(usb_hub_port_t) * (hub_info->port_count + 1));
+            calloc(hub_info->port_count + 1, sizeof(usb_hub_port_t));
         if (!hub_info->ports) {
                 return ENOMEM;
         }
 
-        size_t port;
-        for (port = 0; port < hub_info->port_count + 1; ++port) {
+        for (size_t port = 1; port < hub_info->port_count + 1; ++port) {
                 usb_hub_port_init(&hub_info->ports[port], port, control_pipe);
         }
@@ -271 +270 @@
                     & HUB_CHAR_POWER_PER_PORT_FLAG;
 
-                for (port = 1; port <= hub_info->port_count; ++port) {
+                for (size_t port = 1; port <= hub_info->port_count; ++port) {
                         usb_log_debug("Powering port %zu.\n", port);
                         opResult = usb_hub_port_set_feature(