Changeset 33eb919 in mainline

Timestamp:

2009-10-22T14:03:35Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c696ad1a

Parents:

50989793

Message:

Use defined macros instead of magic constants.

Location:

kernel/arch

Files:

• amd64/src/cpu/cpu.c (modified) (2 diffs)
• ia32/src/cpu/cpu.c (modified) (3 diffs)

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

@@ -130 +130 @@
         CPU->arch.vendor = VendorUnknown;
         if (has_cpuid()) {
-                cpuid(0, &info);
+                cpuid(INTEL_CPUID_LEVEL, &info);
 
                 /*
@@ -150 +150 @@
                 }
                                 
-                cpuid(1, &info);
+                cpuid(INTEL_CPUID_STANDARD, &info);
                 CPU->arch.family = (info.cpuid_eax >> 8) & 0xf;
                 CPU->arch.model = (info.cpuid_eax >> 4) & 0xf;

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

@@ -102 +102 @@
         CPU->fpu_owner = NULL;
         
-        cpuid(1, &info);
+        cpuid(INTEL_CPUID_STANDARD, &info);
         
         fi.word = info.cpuid_edx;
@@ -132 +132 @@
         CPU->arch.vendor = VendorUnknown;
         if (has_cpuid()) {
-                cpuid(0, &info);
+                cpuid(INTEL_CPUID_LEVEL, &info);
 
                 /*
@@ -150 +150 @@
                         CPU->arch.vendor = VendorIntel;
                 
-                cpuid(1, &info);
+                cpuid(INTEL_CPUID_STANDARD, &info);
                 CPU->arch.family = (info.cpuid_eax >> 8) & 0x0f;
                 CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f;