Intel's Conroe-L makes use of extended models, so adjust CPU detection

routines accordingly.
patch by Zuxy Meng, zuxy.meng gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23027 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-04-20 18:57:09 +00:00
parent 1b06491e1f
commit 3b97b07397
2 changed files with 2 additions and 3 deletions

2
configure vendored
View File

@ -1641,7 +1641,7 @@ case "$host_arch" in
fi fi
;; ;;
6) iproc=686 6) iproc=686
if test "$pmodel" -eq 15; then if test "$pmodel" -ge 15; then
proc=core2 proc=core2
elif test "$pmodel" -eq 9 -o "$pmodel" -ge 13; then elif test "$pmodel" -eq 9 -o "$pmodel" -ge 13; then
proc=pentium-m proc=pentium-m

View File

@ -241,10 +241,9 @@ main(int argc, char **argv)
stepping = regs.eax & 0xf; stepping = regs.eax & 0xf;
if (family == 0xf) if (family == 0xf)
{
family += (regs.eax >> 20) & 0xff; family += (regs.eax >> 20) & 0xff;
if (family == 0xf || family == 6)
model += ((regs.eax >> 16) & 0xf) << 4; model += ((regs.eax >> 16) & 0xf) << 4;
}
printf("cpu family\t: %d\n" printf("cpu family\t: %d\n"
"model\t\t: %d\n" "model\t\t: %d\n"