Changeset 9b8958b in mainline

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

75f9dcd

Parents:

58edcfb

Message:

ohci: Declare iteration variables inside for loops.

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (1 diff)
• ohci_batch.c (modified) (3 diffs)
• pci.c (modified) (1 diff)
• root_hub.c (modified) (1 diff)

uspace/drv/bus/usb/ohci/hc.c

@@ -571 +571 @@
         usb_log_debug2("OHCI HCCA initialized at %p.\n", instance->hcca);
 
-        unsigned i = 0;
-        for (; i < 32; ++i) {
+        for (unsigned i = 0; i < 32; ++i) {
                 instance->hcca->int_ep[i] =
                     instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa;

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -52 +52 @@
         if (!ohci_batch)
                 return;
-        unsigned i = 0;
         if (ohci_batch->tds) {
-                for (; i < ohci_batch->td_count; ++i) {
+                for (unsigned i = 0; i < ohci_batch->td_count; ++i) {
                         if (i != ohci_batch->leave_td)
                                 free32(ohci_batch->tds[i]);
@@ -107 +106 @@
         ohci_batch->tds[0] = ohci_endpoint_get(usb_batch->ep)->td;
         ohci_batch->leave_td = 0;
-        unsigned i = 1;
-        for (; i <= ohci_batch->td_count; ++i) {
+
+        for (unsigned i = 1; i <= ohci_batch->td_count; ++i) {
                 ohci_batch->tds[i] = malloc32(sizeof(td_t));
                 CHECK_NULL_DISPOSE_RET(ohci_batch->tds[i],
@@ -196 +195 @@
         ohci_batch->usb_batch->transfered_size =
             ohci_batch->usb_batch->buffer_size;
-        for (--i;i < ohci_batch->td_count; ++i)
+        for (--i;i < ohci_batch->td_count; ++i) {
                 ohci_batch->usb_batch->transfered_size
                     -= td_remain_size(ohci_batch->tds[i]);
+        }
 
         /* Clear possible ED HALT */

uspace/drv/bus/usb/ohci/pci.c

@@ -85 +85 @@
         bool irq_found = false;
 
-        size_t i;
-        for (i = 0; i < hw_resources.count; i++) {
+        for (size_t i = 0; i < hw_resources.count; i++) {
                 hw_resource_t *res = &hw_resources.resources[i];
                 switch (res->type) {

uspace/drv/bus/usb/ohci/root_hub.c

@@ -351 +351 @@
                 mask |= 1;
         }
-        size_t port = 1;
-        for (; port <= instance->port_count; ++port) {
+        for (size_t port = 1; port <= instance->port_count; ++port) {
                 /* Write-clean bits are those that indicate change */
                 if (RHPS_CHANGE_WC_MASK