diff options
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 57 | ||||
| -rw-r--r-- | sys/arch/i386/include/cputypes.h | 3 |
2 files changed, 50 insertions, 10 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 1d73c8c2bab..825574d7c39 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.111 1999/08/12 07:25:12 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.112 1999/08/20 10:33:34 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -676,9 +676,11 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { { CPUCLASS_586, { - 0, "Pentium", "Pentium (P54C)", - "Pentium (P24T)", "Pentium/MMX", "Pentium", 0, - "Pentium (P54C)", 0, 0, 0, 0, 0, 0, 0, 0, + "Pentium (P5 A-step)", "Pentium (P5)", + "Pentium (P54C)", "Pentium (P24T)", + "Pentium/MMX", "Pentium", 0, + "Pentium (P54C)", "Pentium/MMX (Tillamook)", + 0, 0, 0, 0, 0, 0, 0, "Pentium" /* Default */ }, intel586_cpu_setup @@ -687,8 +689,10 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { { CPUCLASS_686, { - 0, "Pentium Pro", 0, "Pentium II", - "Pentium Pro", "Pentium II", "Celeron", + "Pentium Pro (A-step)", "Pentium Pro", 0, + "Pentium II (Klamath)", "Pentium Pro", + "Pentium II (Deschutes)", + "Pentium II (Celeron)", "Pentium III", 0, 0, 0, 0, 0, 0, 0, 0, "Pentium Pro" /* Default */ }, @@ -723,13 +727,13 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { }, NULL }, - /* Family 6, not yet available from AMD */ + /* Family 6 */ { CPUCLASS_686, { - 0, 0, 0, 0, 0, 0, 0, + 0, "K7 (Athlon)", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - "686 class" /* Default */ + "K7 (Athlon)" /* Default */ }, NULL } } @@ -803,6 +807,41 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { }, NULL } } + }, + { + "RiseRiseRise", + CPUVENDOR_RISE, + "Rise", + /* Family 4, not yet available from Rise */ + { { + CPUCLASS_486, + { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + "486 class" /* Default */ + }, + NULL + }, + /* Family 5 */ + { + CPUCLASS_586, + { + "mP6", 0, "mP6", 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + "mP6" /* Default */ + }, + NULL + }, + /* Family 6, not yet available from Rise */ + { + CPUCLASS_686, + { + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + "686 class" /* Default */ + }, + NULL + } } } }; diff --git a/sys/arch/i386/include/cputypes.h b/sys/arch/i386/include/cputypes.h index e4badbbf93f..0d55c54bc68 100644 --- a/sys/arch/i386/include/cputypes.h +++ b/sys/arch/i386/include/cputypes.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cputypes.h,v 1.4 1999/08/12 07:25:12 deraadt Exp $ */ +/* $OpenBSD: cputypes.h,v 1.5 1999/08/20 10:33:35 deraadt Exp $ */ /* $NetBSD: cputypes.h,v 1.10 1997/10/18 04:51:03 mikel Exp $ */ /* @@ -65,6 +65,7 @@ #define CPUVENDOR_NEXGEN 2 #define CPUVENDOR_AMD 3 #define CPUVENDOR_IDT 4 +#define CPUVENDOR_RISE 5 /* * Some other defines, dealing with values returned by cpuid. |