diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-20 18:57:09 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-20 18:57:09 +0000 |
commit | 3b97b07397ce9213adca9d0819a5a01648201369 (patch) | |
tree | c72ecdc5dd01732dd64461fdfe771744afde95b1 | |
parent | 1b06491e1f71e050e02245550515a29fc09b8e26 (diff) | |
download | mpv-3b97b07397ce9213adca9d0819a5a01648201369.tar.bz2 mpv-3b97b07397ce9213adca9d0819a5a01648201369.tar.xz |
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
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | cpuinfo.c | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -1641,7 +1641,7 @@ case "$host_arch" in 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 @@ -241,10 +241,9 @@ main(int argc, char **argv) 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" |