Changeset 46c20c8 in mainline for kernel/arch/ppc32/src/cpu/cpu.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ppc32/src/cpu/cpu.c (modified) (2 diffs)

kernel/arch/ppc32/src/cpu/cpu.c

@@ -34 +34 @@
 
 #include <arch/cpu.h>
-#include <arch/cpuid.h>
 #include <cpu.h>
 #include <arch.h>
@@ -45 +44 @@
 void cpu_identify(void)
 {
-        cpu_info_t info;
-        
-        cpu_version(&info);
-        CPU->arch.version = info.version;
-        CPU->arch.revision = info.revision;
+        cpu_version(&CPU->arch);
 }
 
-void cpu_print_report(cpu_t *m)
+void cpu_print_report(cpu_t *cpu)
 {
-        char *name;
+        const char *name;
         
-        switch (m->arch.version) {
+        switch (cpu->arch.version) {
                 case 8:
-                        name = " (PowerPC 750)";
+                        name = "PowerPC 750";
                         break;
                 case 9:
-                        name = " (PowerPC 604e)";
+                        name = "PowerPC 604e";
                         break;
                 case 0x81:
-                        name = " (PowerPC 8260)";
+                        name = "PowerPC 8260";
                         break;
                 case 0x8081:
-                        name = " (PowerPC 826xA)";
+                        name = "PowerPC 826xA";
                         break;
                 default:
-                        name = "";
+                        name = "unknown";
         }
         
-        printf("cpu%d: version=%d%s, revision=%d\n", m->id, m->arch.version, name, m->arch.revision);
+        printf("cpu%u: version=%" PRIu16" (%s), revision=%" PRIu16 "\n", cpu->id,
+            cpu->arch.version, name, cpu->arch.revision);
 }