Changes in kernel/arch/amd64/src/cpu/cpu.c [dc0b964:f24d300] in 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 <typedefs.h>
+#include <arch/types.h>
 #include <print.h>
 #include <fpu_context.h>
@@ -47 +47 @@
  * 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
+
 
 enum vendor {
@@ -61 +62 @@
 };
 
-static const char *vendor_str[] = {
+static char *vendor_str[] = {
         "Unknown Vendor",
         "AuthenticAMD",
@@ -126 +127 @@
 {
         cpu_info_t info;
-        
+
         CPU->arch.vendor = VendorUnknown;
         if (has_cpuid()) {
-                cpuid(INTEL_CPUID_LEVEL, &info);
-                
+                cpuid(0, &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);
+                                
+                cpuid(1, &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;                                               
         }
 }