summaryrefslogtreecommitdiffstats
path: root/cpuinfo.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-20 18:57:09 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-20 18:57:09 +0000
commit3b97b07397ce9213adca9d0819a5a01648201369 (patch)
treec72ecdc5dd01732dd64461fdfe771744afde95b1 /cpuinfo.c
parent1b06491e1f71e050e02245550515a29fc09b8e26 (diff)
downloadmpv-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
Diffstat (limited to 'cpuinfo.c')
-rw-r--r--cpuinfo.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/cpuinfo.c b/cpuinfo.c
index 50517696f9..1d5b3d3ab2 100644
--- a/cpuinfo.c
+++ b/cpuinfo.c
@@ -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"