[patch] The patch cpu.patch there makes dosemu file config.c to work.

cpu.patch (text/plain), 1.55 KB, created by Gert Andersen on 2009-10-17 13:48:46 UTC

Index: src/base/init/config.c
===================================================================
--- src/base/init/config.c	(révision 1868)
+++ src/base/init/config.c	(révision 1870)
@@ -148,7 +148,7 @@
       default:  s = "386"; break;
     }
     (*print)("%s\n", s);
-    (*print)("CPUclock %gMHz\ncpu_spd 0x%lx\ncpu_tick_spd 0x%lx\n",
+    (*print)("CPUclock %g MHz\ncpu_spd 0x%lx\ncpu_tick_spd 0x%lx\n",
 	(((double)LLF_US)/config.cpu_spd), config.cpu_spd, config.cpu_tick_spd);
 
     (*print)("pci %d\nrdtsc %d\nmathco %d\nsmp %d\n",
@@ -471,15 +471,21 @@
 
 static void read_cpu_info(void)
 {
-    char *cpuflags;
-    int k = 386;
+    char *cpuflags, *cpu;
+    int k = 3;
 
     open_proc_scan("/proc/cpuinfo");
-    switch (get_proc_intvalue_by_key(
-          kernel_version_code > 0x20100+74 ? "cpu family" : "cpu" )) {
-      case 5: case 586:
-      case 6: case 686:
-      case 15:
+    cpu = get_proc_string_by_key("cpu family");
+    if (cpu) {
+      k = atoi(cpu);
+    } else { /* old kernels < 2.1.74 */
+      cpu = get_proc_string_by_key("cpu");
+      /* 386, 486, etc */
+      if (cpu) k = atoi(cpu) / 100;
+    }
+    if (k > 5) k = 5;
+    switch (k) {
+      case 5:
         config.realcpu = CPU_586;
         cpuflags = get_proc_string_by_key("features");
         if (!cpuflags) {
@@ -548,7 +554,9 @@
           }
         }
         /* fall thru */
-      case 4: case 486: config.realcpu = CPU_486;
+      case 4: config.realcpu = CPU_486;
+        /* fall thru */
+      case 3:
       	break;
       default:
         error("Unknown CPU type!\n");