[Mplayer-cvslog] CVS: main cpudetect.c,1.2,1.3 cpudetect.h,1.1,1.2

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv32483

Modified Files:
	cpudetect.c cpudetect.h 
Log Message:
amd fix

Index: cpudetect.c
===================================================================
RCS file: /cvsroot/mplayer/main/cpudetect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cpudetect.c	19 Oct 2001 02:00:45 -0000	1.2
+++ cpudetect.c	19 Oct 2001 13:01:30 -0000	1.3
@@ -91,7 +91,8 @@
 		return;*/
 	do_cpuid(0x00000000, regs);
 	printf("CPU vendor name: %.4s%.4s%.4s\n",&regs[1],&regs[3],&regs[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 @@
 				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 @@
    gCpuCaps.hasSSE=0;
 #endif /* __linux__ */
 }
-#endif /* ARCH_X86 */
\ No newline at end of file
+#endif /* ARCH_X86 */

Index: cpudetect.h
===================================================================
RCS file: /cvsroot/mplayer/main/cpudetect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpudetect.h	19 Oct 2001 00:40:19 -0000	1.1
+++ cpudetect.h	19 Oct 2001 13:01:31 -0000	1.2
@@ -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;