Changeset f4c2b6a in mainline for kernel/arch/sparc64

Timestamp:

2008-06-03T14:59:48Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2c4fb51

Parents:

b63f8569

Message:

reflect changes in generic code
proper formatting directives
coding style

Location:

kernel/arch/sparc64

Files:

• include/asm.h (modified) (1 diff)
• include/cpu.h (modified) (1 diff)
• src/cpu/cpu.c (modified) (1 diff)
• src/smp/smp.c (modified) (1 diff)
• src/trap/exception.c (modified) (1 diff)
• src/trap/interrupt.c (modified) (1 diff)

kernel/arch/sparc64/include/asm.h

@@ -38 +38 @@
 #include <arch/arch.h>
 #include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <arch/register.h>

kernel/arch/sparc64/include/cpu.h

@@ -37 +37 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/asm.h>

kernel/arch/sparc64/src/cpu/cpu.c

@@ -136 +136 @@
         }
 
-        printf("cpu%d: manuf=%s, impl=%s, mask=%d (%dMHz)\n", m->id, manuf,
+        printf("cpu%d: manuf=%s, impl=%s, mask=%d (%d MHz)\n", m->id, manuf,
                 impl, m->arch.ver.mask, m->arch.clock_frequency / 1000000);
 }

kernel/arch/sparc64/src/smp/smp.c

@@ -100 +100 @@
                 
                 if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT)
-                        printf("%s: waiting for processor (mid = %d) timed out\n",
+                        printf("%s: waiting for processor (mid = %" PRIu32 ") timed out\n",
                             __func__, mid);
         }

kernel/arch/sparc64/src/trap/exception.c

@@ -46 +46 @@
 void dump_istate(istate_t *istate)
 {
-        printf("TSTATE=%#llx\n", istate->tstate);
-        printf("TPC=%#llx (%s)\n", istate->tpc, get_symtab_entry(istate->tpc));
-        printf("TNPC=%#llx (%s)\n", istate->tnpc, get_symtab_entry(istate->tnpc));
+        printf("TSTATE=%#" PRIx64 "\n", istate->tstate);
+        printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, get_symtab_entry(istate->tpc));
+        printf("TNPC=%#" PRIx64 " (%s)\n", istate->tnpc, get_symtab_entry(istate->tnpc));
 }
 

kernel/arch/sparc64/src/trap/interrupt.c

@@ -98 +98 @@
                  */
 #ifdef CONFIG_DEBUG
-                printf("cpu%d: spurious interrupt (intrcv=%#llx, "
-                        "data0=%#llx)\n", CPU->id, intrcv, data0);
+                printf("cpu%u: spurious interrupt (intrcv=%#" PRIx64
+                        ", data0=%#" PRIx64 ")\n", CPU->id, intrcv, data0);
 #endif
         }