Changes in kernel/arch/ia32/src/cpu/cpu.c [dc0b964:4a537dd] in mainline

File:

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

kernel/arch/ia32/src/cpu/cpu.c

@@ -38 +38 @@
 
 #include <arch.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <print.h>
 #include <fpu_context.h>
@@ -49 +49 @@
  * Contains only non-MP-Specification specific SMP code.
  */
-#define AMD_CPUID_EBX  UINT32_C(0x68747541)
-#define AMD_CPUID_ECX  UINT32_C(0x444d4163)
-#define AMD_CPUID_EDX  UINT32_C(0x69746e65)
+#define AMD_CPUID_EBX  0x68747541
+#define AMD_CPUID_ECX  0x444d4163
+#define AMD_CPUID_EDX  0x69746e65
 
-#define INTEL_CPUID_EBX  UINT32_C(0x756e6547)
-#define INTEL_CPUID_ECX  UINT32_C(0x6c65746e)
-#define INTEL_CPUID_EDX  UINT32_C(0x49656e69)
+#define INTEL_CPUID_EBX  0x756e6547
+#define INTEL_CPUID_ECX  0x6c65746e
+#define INTEL_CPUID_EDX  0x49656e69
 
 
@@ -64 +64 @@
 };
 
-static const char *vendor_str[] = {
+static char *vendor_str[] = {
         "Unknown Vendor",
         "AMD",
@@ -140 +140 @@
                 if ((info.cpuid_ebx == AMD_CPUID_EBX)
                     && (info.cpuid_ecx == AMD_CPUID_ECX)
-                    && (info.cpuid_edx == AMD_CPUID_EDX))
+                        && (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))
+                        && (info.cpuid_edx == INTEL_CPUID_EDX))
                         CPU->arch.vendor = VendorIntel;
                 
                 cpuid(INTEL_CPUID_STANDARD, &info);
-                CPU->arch.family = (info.cpuid_eax >> 8) & 0x0fU;
-                CPU->arch.model = (info.cpuid_eax >> 4) & 0x0fU;
-                CPU->arch.stepping = (info.cpuid_eax >> 0) & 0x0fU;
+                CPU->arch.family = (info.cpuid_eax >> 8) & 0x0f;
+                CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f;
+                CPU->arch.stepping = (info.cpuid_eax >> 0) & 0x0f;                                              
         }
 }