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

Timestamp:

2013-12-27T18:45:56Z (11 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/mm.c (modified) (4 diffs)

boot/arch/sparc32/src/mm.c

@@ -50 +50 @@
 #include <inflate.h>
 
-#define OFF2SEC(_addr)  ((_addr) >> PTL0_SHIFT)
-#define SEC2OFF(_sec)   ((_sec) << PTL0_SHIFT)
+#define OFF2SEC(_addr)  ((_addr) >> PTL0_SHIFT)
+#define SEC2OFF(_sec)   ((_sec) << PTL0_SHIFT)
 
 static section_mapping_t mappings[] = {
@@ -60 +60 @@
 };
 
-extern uintptr_t boot_ctx_table;
-
-static void mmu_enable()
+static void mmu_enable(void)
 {
-        boot_ctx_table = ((uintptr_t)&boot_pt[0] >> 4) | PTE_ET_DESCRIPTOR;
-
+        boot_ctx_table = ((uintptr_t) &boot_pt[0] >> 4) | PTE_ET_DESCRIPTOR;
+        
         /* Set Context Table Pointer register */
-        asi_u32_write(ASI_MMUREGS, 0x100, ((uint32_t)&boot_ctx_table) >> 4);
-
+        asi_u32_write(ASI_MMUREGS, 0x100, ((uint32_t) &boot_ctx_table) >> 4);
+        
         /* Select context 0 */
         asi_u32_write(ASI_MMUREGS, 0x200, 0);
-
+        
         /* Enable MMU */
         uint32_t cr = asi_u32_read(ASI_MMUREGS, 0x000);
@@ -85 +83 @@
 }
 
-void mmu_init()
+void mmu_init(void)
 {
         mmu_disable();
-
-        for (int i = 0; mappings[i].size != 0; i++) {
-                int ptr = 0;
-                for (uint32_t sec = OFF2SEC(mappings[i].va); 
-                     sec < OFF2SEC(mappings[i].va + mappings[i].size);
-                     sec++) {
+        
+        for (unsigned int i = 0; mappings[i].size != 0; i++) {
+                unsigned int ptr = 0;
+                for (uint32_t sec = OFF2SEC(mappings[i].va);
+                    sec < OFF2SEC(mappings[i].va + mappings[i].size);
+                    sec++) {
                         boot_pt[sec].ppn = ((mappings[i].pa + SEC2OFF(ptr++)) >> 12) & 0xffffff;
                         boot_pt[sec].cacheable = mappings[i].cacheable;
@@ -100 +98 @@
                 }
         }
-
+        
         mmu_enable();
 }