From f8ce675a2f7c1ef33047aa4035f1123f3302181d Mon Sep 17 00:00:00 2001 From: pontscho Date: Fri, 19 Oct 2001 13:01:31 +0000 Subject: amd fix git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2281 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cpudetect.c | 7 ++++--- cpudetect.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cpudetect.c b/cpudetect.c index dacc6b95e7..6846d68270 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -91,7 +91,8 @@ void GetCpuCaps( CpuCaps *caps) return;*/ do_cpuid(0x00000000, regs); printf("CPU vendor name: %.4s%.4s%.4s\n",®s[1],®s[3],®s[2]); - if (regs[0]>0x00000001) { +// if (regs[0]>0x00000001) + { do_cpuid(0x00000001, regs2); printf("CPU family: %d\n",(regs2[0] >> 8)&0xf); switch ((regs2[0] >> 8)&0xf) { @@ -105,7 +106,7 @@ void GetCpuCaps( CpuCaps *caps) caps->cpuType=CPUTYPE_I586; break; case 6: - caps->cpuType=CPUTYPE_I586; + caps->cpuType=CPUTYPE_I686; break; default: printf("Unknown cpu type, default to i386\n"); @@ -292,4 +293,4 @@ static void check_os_katmai_support( void ) gCpuCaps.hasSSE=0; #endif /* __linux__ */ } -#endif /* ARCH_X86 */ \ No newline at end of file +#endif /* ARCH_X86 */ diff --git a/cpudetect.h b/cpudetect.h index 0fd5ec9e72..55e975fedf 100644 --- a/cpudetect.h +++ b/cpudetect.h @@ -3,6 +3,7 @@ #define CPUTYPE_I386 0 #define CPUTYPE_I486 1 #define CPUTYPE_I586 2 +#define CPUTYPE_I686 3 typedef struct cpucaps_s { int cpuType; -- cgit v1.2.3