From 8ec0a4a37d01e059b073c90d40c8b7d24779c146 Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Sun, 10 Jul 2011 21:03:53 +0000 Subject: [PATCH] Cpu Identification : * Don't return Core 2 Extreme as a fallback result, keep the more generic variant Core 2 for this. * Test the presence of "Pentium" in the name and in that case, use that word to identify, despite the family id/product name confusion. Might fix #6136, #4427. needs testing. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42405 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/shared/cpu_type.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/headers/private/shared/cpu_type.h b/headers/private/shared/cpu_type.h index 932b2e91bc..c3a7fb9cf8 100644 --- a/headers/private/shared/cpu_type.h +++ b/headers/private/shared/cpu_type.h @@ -191,12 +191,13 @@ get_cpu_model_string(system_info *info) get_cpuid_model_string(cpuidName); if (strcasestr(cpuidName, "Celeron") != NULL) return "Core 2 Celeron"; - if (strcasestr(cpuidName, "Duo") != NULL - || strcasestr(cpuidName, "Quad") != NULL) - return "Core 2"; if (strcasestr(cpuidName, "Xeon") != NULL) return "Core 2 Xeon"; - return "Core 2 Extreme"; + if (strcasestr(cpuidName, "Pentium") != NULL) + return "Pentium"; + if (strcasestr(cpuidName, "Extreme") != NULL) + return "Core 2 Extreme"; + return "Core 2"; case B_CPU_INTEL_PENTIUM_CORE_I5_M430: return "Core i5"; case B_CPU_INTEL_PENTIUM_CORE_I7: