Changeset f6f22cdb in mainline for boot/arch/sparc32/src/ambapp.c

Timestamp:

2013-12-27T18:45:56Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

32e8cd1

Parents:

e47ed05

Message:

code revision
coding style changes

File:

• boot/arch/sparc32/src/ambapp.c (modified) (7 diffs)

boot/arch/sparc32/src/ambapp.c

@@ -50 +50 @@
 #include <errno.h>
 
-static void ambapp_scan_area(uintptr_t, int);
+static void ambapp_scan_area(uintptr_t, unsigned int);
 
 void ambapp_scan()
 {
         amba_fake = false;
-
+        
         /* Scan for AHB masters & slaves */
         ambapp_scan_area(AMBAPP_AHBMASTER_AREA, 64);
         ambapp_scan_area(AMBAPP_AHBSLAVE_AREA, 63);
-
+        
         /* Scan for APB slaves on APBMST */
         amba_device_t *apbmst = ambapp_lookup_first(GAISLER, GAISLER_APBMST);
         if (apbmst != NULL)
                 ambapp_scan_area(apbmst->bars[0].start, 16);
-
+        
         /* If we found nothing, fake device entries */
         if (amba_devices_found == 0)
@@ -70 +70 @@
 }
 
-static void ambapp_scan_area(uintptr_t master_bar, int max_entries)
+static void ambapp_scan_area(uintptr_t master_bar, unsigned int max_entries)
 {
         ambapp_entry_t *entry = (ambapp_entry_t *) (master_bar | AMBAPP_CONF_AREA);
-
-        for (int i = 0; i < max_entries; i++) {
+        
+        for (unsigned int i = 0; i < max_entries; i++) {
                 if (amba_devices_found == AMBAPP_MAX_DEVICES)
                         return;
-
+                
                 if (entry->vendor_id == 0xff)
                         continue;
-
+                
                 amba_device_t *device = &amba_devices[amba_devices_found];
-                device->vendor_id = (amba_vendor_id_t)entry->vendor_id;
-        device->device_id = (amba_device_id_t)entry->device_id;
+                device->vendor_id = (amba_vendor_id_t) entry->vendor_id;
+                device->device_id = (amba_device_id_t) entry->device_id;
                 device->version = entry->version;
                 device->irq = entry->irq;
-        
-                for (int bar = 0; bar < 4; bar++) {
+                
+                for (unsigned int bar = 0; bar < 4; bar++) {
                         device->bars[bar].start = entry->bar[bar].addr << 20;
                         device->bars[bar].size = entry->bar[bar].mask;
-                        device->bars[bar].prefetchable = (bool)entry->bar[bar].prefetchable;
-                        device->bars[bar].cacheable = (bool)entry->bar[bar].cacheable;
+                        device->bars[bar].prefetchable = (bool) entry->bar[bar].prefetchable;
+                        device->bars[bar].cacheable = (bool) entry->bar[bar].cacheable;
                 }
-
+                
                 amba_devices_found++;
         }
@@ -107 +107 @@
         amba_devices[0].bars[0].start = 0x80000100;
         amba_devices[0].bars[0].size = 0x100;
-
+        
         /* IRQMP */
         amba_devices[1].vendor_id = GAISLER;
@@ -115 +115 @@
         amba_devices[1].bars[0].start = 0x80000200;
         amba_devices[1].bars[0].size = 0x100;
-
+        
         /* GPTIMER */
         amba_devices[2].vendor_id = GAISLER;
@@ -123 +123 @@
         amba_devices[2].bars[0].start = 0x80000300;
         amba_devices[2].bars[0].size = 0x100;
-
+        
         amba_fake = true;
         amba_devices_found = 3;
@@ -136 +136 @@
 {
         printf("ABMA devices:\n");
-
-        for (int i = 0; i < amba_devices_found; i++) {
+        
+        for (unsigned int i = 0; i < amba_devices_found; i++) {
                 amba_device_t *dev = &amba_devices[i];
-                printf("<%1x:%03x> at 0x%08x ", dev->vendor_id, dev->device_id, dev->bars[0].start);
+                
+                printf("<%1x:%03x> at 0x%08x ", dev->vendor_id, dev->device_id,
+                    dev->bars[0].start);
+                
                 if (dev->irq == -1)
                         printf("\n");
@@ -147 +150 @@
 }
 
-amba_device_t *ambapp_lookup_first(amba_vendor_id_t vendor, amba_device_id_t device)
+amba_device_t *ambapp_lookup_first(amba_vendor_id_t vendor,
+    amba_device_id_t device)
 {
-        for (int i = 0; i < amba_devices_found; i++) {
-                if (amba_devices[i].vendor_id == vendor &&
-                    amba_devices[i].device_id == device)
+        for (unsigned int i = 0; i < amba_devices_found; i++) {
+                if ((amba_devices[i].vendor_id == vendor) &&
+                    (amba_devices[i].device_id == device))
                         return &amba_devices[i];
         }
-
+        
         return NULL;
 }