From b0488dca688c290144911fe9dfe0c216a13fb553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 6 Oct 2009 17:08:24 +0000 Subject: [PATCH] Patch by "v" to fix ticket #4733, there are Core and Core 2 Celerons. I enhanced it to also say Core 2 Quad and Core 2 Duo again, instead of just Core 2. Thanks! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33470 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/shared/cpu_type.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/headers/private/shared/cpu_type.h b/headers/private/shared/cpu_type.h index 67bf9060cb..6ff227d7d4 100644 --- a/headers/private/shared/cpu_type.h +++ b/headers/private/shared/cpu_type.h @@ -176,18 +176,25 @@ get_cpu_model_string(system_info *info) case B_CPU_INTEL_ATOM: return "Atom"; case B_CPU_INTEL_PENTIUM_CORE: + get_cpuid_model_string(cpuidName); + if (strcasestr(cpuidName, "Celeron") != NULL) + return "Core Celeron"; return "Core"; case B_CPU_INTEL_PENTIUM_CORE_2: get_cpuid_model_string(cpuidName); + if (strcasestr(cpuidName, "Celeron") != NULL) + return "Core 2 Celeron"; if (strcasestr(cpuidName, "Xeon") != NULL) return "Core 2 Xeon"; return "Core 2"; case B_CPU_INTEL_PENTIUM_CORE_2_45_NM: get_cpuid_model_string(cpuidName); - if (strcasestr(cpuidName, "Duo") != NULL - || strcasestr(cpuidName, "Quad") != NULL) { - return "Core 2"; - } + if (strcasestr(cpuidName, "Celeron") != NULL) + return "Core 2 Celeron"; + if (strcasestr(cpuidName, "Duo") != NULL) + return "Core 2 Duo"; + if (strcasestr(cpuidName, "Quad") != NULL) + return "Core 2 Quad"; if (strcasestr(cpuidName, "Xeon") != NULL) return "Core 2 Xeon"; return "Core 2 Extreme";