From 1acf5ace29601e272670313568c630f858122015 Mon Sep 17 00:00:00 2001 From: Xianyi Zhang Date: Tue, 3 May 2011 17:19:36 +0800 Subject: [PATCH] Fixed a bug when detecting Intel CPU. --- cpuid_x86.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/cpuid_x86.c b/cpuid_x86.c index 0d091b37c..6e3e74f82 100644 --- a/cpuid_x86.c +++ b/cpuid_x86.c @@ -1302,24 +1302,25 @@ int get_coretype(void){ case 13: return CORE_DUNNINGTON; } - break; - case 2: - switch (model) { - case 5: - //Intel Core (Clarkdale) / Core (Arrandale) - // Pentium (Clarkdale) / Pentium Mobile (Arrandale) - // Xeon (Clarkdale), 32nm - return CORE_NEHALEM; - case 12: - //Xeon Processor 5600 (Westmere-EP) - return CORE_NEHALEM; - } - break; - + break; + case 2: + switch (model) { + case 5: + //Intel Core (Clarkdale) / Core (Arrandale) + // Pentium (Clarkdale) / Pentium Mobile (Arrandale) + // Xeon (Clarkdale), 32nm + return CORE_NEHALEM; + case 12: + //Xeon Processor 5600 (Westmere-EP) + return CORE_NEHALEM; + } + break; } + break; + case 15: - if (model <= 0x2) return CORE_NORTHWOOD; - return CORE_PRESCOTT; + if (model <= 0x2) return CORE_NORTHWOOD; + else return CORE_PRESCOTT; } }