diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-03-28 19:50:08 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-03-28 19:50:08 +0000 |
| commit | 9c75950c6ebe7278d422f96e1902dc4c05e1b045 (patch) | |
| tree | e2e2c29021c0cd8770a16b0276528b8030df6bff /sys | |
| parent | a4619ed7dc5a06c0a922970ecbc03fc478f90092 (diff) | |
identify Cyrix III; from Armin Wolfermann <armin@wolfermann.org>
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 059ff37241d..21701656f0b 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.152 2001/03/22 23:36:51 niklas Exp $ */ +/* $OpenBSD: machdep.c,v 1.153 2001/03/28 19:50:07 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -912,15 +912,15 @@ const struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { }, winchip_cpu_setup }, - /* Family 6, not yet available from IDT */ + /* Family 6 */ { CPUCLASS_686, { + 0, 0, 0, 0, 0, 0, "VIA Cyrix III", 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - "686 class" /* Default */ + "VIA Cyrix III" /* Default */ }, - NULL + winchip_cpu_setup } } }, { @@ -1026,7 +1026,7 @@ winchip_cpu_setup(cpu_device, model, step) const char *cpu_device; int model, step; { -#if defined(I586_CPU) +#if defined(I586_CPU) || defined(I686_CPU) extern int cpu_feature; switch (model) { @@ -1037,6 +1037,10 @@ winchip_cpu_setup(cpu_device, model, step) printf("%s: broken TSC disabled\n", cpu_device); break; + case 6: /* VIA Cyrix III */ + cpu_feature |= CPUID_CX8; + cpu_feature |= CPUID_3DNOW; + break; } #endif } |