Changeset eb522e8 in mainline for kernel/arch/ia32/src/cpu/cpu.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

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

@@ -49 +49 @@
  * 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  UINT32_C(0x68747541)
+#define AMD_CPUID_ECX  UINT32_C(0x444d4163)
+#define AMD_CPUID_EDX  UINT32_C(0x69746e65)
 
-#define INTEL_CPUID_EBX  0x756e6547
-#define INTEL_CPUID_ECX  0x6c65746e
-#define INTEL_CPUID_EDX  0x49656e69
+#define INTEL_CPUID_EBX  UINT32_C(0x756e6547)
+#define INTEL_CPUID_ECX  UINT32_C(0x6c65746e)
+#define INTEL_CPUID_EDX  UINT32_C(0x49656e69)
 
 
@@ -92 +92 @@
 void cpu_arch_init(void)
 {
-        cpuid_extended_feature_info efi;
         cpu_info_t info;
         uint32_t help = 0;
@@ -104 +103 @@
         
         CPU->arch.fi.word = info.cpuid_edx;
-        efi.word = info.cpuid_ecx;
         
         if (CPU->arch.fi.bits.fxsr)
@@ -140 +138 @@
                 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) & 0x0f;
-                CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f;
-                CPU->arch.stepping = (info.cpuid_eax >> 0) & 0x0f;                                              
+                CPU->arch.family = (info.cpuid_eax >> 8) & 0x0fU;
+                CPU->arch.model = (info.cpuid_eax >> 4) & 0x0fU;
+                CPU->arch.stepping = (info.cpuid_eax >> 0) & 0x0fU;
         }
 }