Mercurial > mplayer.hg

changeset 23009:41d042563508

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Intel's Conroe-L makes use of extended models, so adjust CPU detection routines accordingly. patch by Zuxy Meng, zuxy.meng gmail com
author diego
date Fri, 20 Apr 2007 18:57:09 +0000
parents 7fa1afcfb772
children 74efb0fa8a0b
files configure cpuinfo.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Fri Apr 20 14:23:27 2007 +0000
+++ b/configure	Fri Apr 20 18:57:09 2007 +0000
@@ -1641,7 +1641,7 @@
 	fi
 	;;
     6) iproc=686
-	if test "$pmodel" -eq 15; then
+	if test "$pmodel" -ge 15; then
 		proc=core2
 	elif test "$pmodel" -eq 9 -o "$pmodel" -ge 13; then
 		proc=pentium-m
--- a/cpuinfo.c	Fri Apr 20 14:23:27 2007 +0000
+++ b/cpuinfo.c	Fri Apr 20 18:57:09 2007 +0000
@@ -241,10 +241,9 @@
     stepping = regs.eax & 0xf;
 
     if (family == 0xf)
-    {
       family += (regs.eax >> 20) & 0xff;
+    if (family == 0xf || family == 6)
       model += ((regs.eax >> 16) & 0xf) << 4;
-    }
 
     printf("cpu family\t: %d\n"
            "model\t\t: %d\n"