Changeset 666f492 in mainline for kernel/arch

Timestamp:

2010-05-24T18:42:44Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

da1bafb

Parents:

c555155

Message:

cstyle changes

Location:

kernel/arch

Files:

• mips32/src/panic.S (modified) (3 diffs)
• ppc32/src/ppc32.c (modified) (3 diffs)

kernel/arch/mips32/src/panic.S

@@ -27 +27 @@
 #
 
-.text   
+.text
 
 .set noat
@@ -34 +34 @@
 
 #include <arch/asm/regname.h>
-        
+
 .global panic_printf
 
-/* From printf return directly to halt() */     
+/* From printf return directly to halt() */
 panic_printf:
         jal printf
@@ -43 +43 @@
         j halt
         nop
-/* This code does not work, god knows why */            
-/*      lui $ra, %hi(halt)
+        
+        /* This code does not work, god knows why
+        lui $ra, %hi(halt)
         j printf
         ori $ra, %lo(halt) */

kernel/arch/ppc32/src/ppc32.c

@@ -201 +201 @@
                 pic_init(assigned_address[0].addr, PAGE_SIZE, &pic_cir,
                     &pic_cir_arg);
-
+                
 #ifdef CONFIG_MAC_KBD
                 uintptr_t pa = assigned_address[0].addr + 0x16000;
@@ -223 +223 @@
                         }
                 }
-
+                
                 /*
                  * This is the necessary evil until the userspace driver is entirely
@@ -284 +284 @@
 {
         // TODO
-        while (1);
+        while (true);
 }