[haiku-commits] r42405 - haiku/trunk/headers/private/shared

Author: stpere
Date: 2011-07-10 23:03:53 +0200 (Sun, 10 Jul 2011)
New Revision: 42405
Changeset: https://dev.haiku-os.org/changeset/42405
Ticket: https://dev.haiku-os.org/ticket/4427
Ticket: https://dev.haiku-os.org/ticket/6136

Modified:
   haiku/trunk/headers/private/shared/cpu_type.h
Log:
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.


Modified: haiku/trunk/headers/private/shared/cpu_type.h
===================================================================
--- haiku/trunk/headers/private/shared/cpu_type.h       2011-07-10 21:02:12 UTC 
(rev 42404)
+++ haiku/trunk/headers/private/shared/cpu_type.h       2011-07-10 21:03:53 UTC 
(rev 42405)
@@ -191,12 +191,13 @@
                        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:

Other related posts:

  • » [haiku-commits] r42405 - haiku/trunk/headers/private/shared - stpere