Changeset c621f4aa in mainline for kernel/arch/amd64/src/cpu/cpu.c

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/arch/amd64/src/cpu/cpu.c (modified) (4 diffs)

kernel/arch/amd64/src/cpu/cpu.c

@@ -39 +39 @@
 
 #include <arch.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <fpu_context.h>
@@ -47 +47 @@
  * Contains only non-MP-Specification specific SMP code.
  */
-#define AMD_CPUID_EBX   0x68747541
-#define AMD_CPUID_ECX   0x444d4163
-#define AMD_CPUID_EDX   0x69746e65
+#define AMD_CPUID_EBX  0x68747541
+#define AMD_CPUID_ECX  0x444d4163
+#define AMD_CPUID_EDX  0x69746e65
 
-#define INTEL_CPUID_EBX 0x756e6547
-#define INTEL_CPUID_ECX 0x6c65746e
-#define INTEL_CPUID_EDX 0x49656e69
+#define INTEL_CPUID_EBX  0x756e6547
+#define INTEL_CPUID_ECX  0x6c65746e
+#define INTEL_CPUID_EDX  0x49656e69
 
 
@@ -62 +62 @@
 };
 
-static char *vendor_str[] = {
+static const char *vendor_str[] = {
         "Unknown Vendor",
         "AuthenticAMD",
@@ -127 +127 @@
 {
         cpu_info_t info;
-
+        
         CPU->arch.vendor = VendorUnknown;
         if (has_cpuid()) {
                 cpuid(INTEL_CPUID_LEVEL, &info);
-
+                
                 /*
                  * Check for AMD processor.
                  */
-                if (info.cpuid_ebx == AMD_CPUID_EBX &&
-                    info.cpuid_ecx == AMD_CPUID_ECX &&
-                    info.cpuid_edx == AMD_CPUID_EDX) {
+                if ((info.cpuid_ebx == AMD_CPUID_EBX) &&
+                    (info.cpuid_ecx == AMD_CPUID_ECX) &&
+                    (info.cpuid_edx == AMD_CPUID_EDX)) {
                         CPU->arch.vendor = VendorAMD;
                 }
-
+                
                 /*
                  * Check for Intel processor.
-                 */             
-                if (info.cpuid_ebx == INTEL_CPUID_EBX &&
-                    info.cpuid_ecx == INTEL_CPUID_ECX &&
-                    info.cpuid_edx == INTEL_CPUID_EDX) {
+                 */
+                if ((info.cpuid_ebx == INTEL_CPUID_EBX) &&
+                    (info.cpuid_ecx == INTEL_CPUID_ECX) &&
+                    (info.cpuid_edx == INTEL_CPUID_EDX)) {
                         CPU->arch.vendor = VendorIntel;
                 }
-                                
+                
                 cpuid(INTEL_CPUID_STANDARD, &info);
                 CPU->arch.family = (info.cpuid_eax >> 8) & 0xf;
                 CPU->arch.model = (info.cpuid_eax >> 4) & 0xf;
-                CPU->arch.stepping = (info.cpuid_eax >> 0) & 0xf;                                               
+                CPU->arch.stepping = (info.cpuid_eax >> 0) & 0xf;
         }
 }