[Mplayer-cvslog] CVS: main/loader win32.c,1.79,1.80

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/loader
In directory mail:/var/tmp.root/cvs-serv29692

Modified Files:
	win32.c 
Log Message:
changed cpudetection code to support newer pentiums

Index: win32.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/win32.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- win32.c	9 Apr 2003 21:34:05 -0000	1.79
+++ win32.c	28 Apr 2003 16:34:35 -0000	1.80
@@ -929,26 +929,23 @@
 	if (gCpuCaps.has3DNow)
 	    PF[PF_AMD3D_INSTRUCTIONS_AVAILABLE] = TRUE;
 
-	    switch(gCpuCaps.cpuType)
+	    if (gCpuCaps.cpuType == 4)
 	    {
-		case CPUTYPE_I686:
-		case CPUTYPE_I586:
-		    cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
-		    cachedsi.wProcessorLevel = 5;
-		    break;
-		case CPUTYPE_I486:
-		    cachedsi.dwProcessorType = PROCESSOR_INTEL_486;
-		    cachedsi.wProcessorLevel = 4;
-		    break;
-		case CPUTYPE_I386:
-		default:
-		    cachedsi.dwProcessorType = PROCESSOR_INTEL_386;
-		    cachedsi.wProcessorLevel = 3;
-		    break;
+	        cachedsi.dwProcessorType = PROCESSOR_INTEL_486;
+		cachedsi.wProcessorLevel = 4;
+	    }
+	    else if (gCpuCaps.cpuType > 5)
+	    {
+		cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
+		cachedsi.wProcessorLevel = 5;
+	    }
+	    else
+	    {
+	        cachedsi.dwProcessorType = PROCESSOR_INTEL_386;
+		cachedsi.wProcessorLevel = 3;
 	    }
 	    cachedsi.wProcessorRevision = gCpuCaps.cpuStepping;
     	    cachedsi.dwNumberOfProcessors = 1;	/* hardcoded */
-
     }
 #endif