From a9ad986a9068e068f288a4efe9aa5926cb1bc7df Mon Sep 17 00:00:00 2001 From: jdolecek Date: Thu, 16 Nov 2000 09:06:17 +0000 Subject: [PATCH] Update cpuid table according to information sent by Scott Telford in port-i386/11502, with only sligh change for Coppermine entry - cpus with family 6, model 8 are not all Celerons, they can be either common PIII, Xeon or Celeron --- sys/arch/i386/i386/machdep.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index af280e92a030..e648ebcb5bb3 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.415 2000/11/15 21:13:58 jdolecek Exp $ */ +/* $NetBSD: machdep.c,v 1.416 2000/11/16 09:06:17 jdolecek Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -625,10 +625,12 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { { "Pentium Pro (A-step)", "Pentium Pro", 0, "Pentium II (Klamath)", "Pentium Pro", - "Pentium II (Deschutes)", - "Pentium II (Celeron)", - "Pentium III", "Pentium III (E)", - 0, 0, 0, 0, 0, 0, 0, + "Pentium II/Celeron (Deschutes)", + "Celeron (Mendocino)", + "Pentium III (Katmai)", + "Pentium III (Coppermine)", + 0, "Pentium III Xeon (Cascades)", 0, 0, + 0, 0, "Pentium Pro, II or III" /* Default */ }, NULL @@ -667,7 +669,8 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { CPUCLASS_586, { "K5", "K5", "K5", "K5", 0, 0, "K6", - "K6", "K6-2", "K6-III", 0, 0, 0, 0, 0, 0, + "K6", "K6-2", "K6-III", 0, 0, 0, + "K6-2+/III+", 0, 0, "K5 or K6" /* Default */ }, NULL @@ -676,8 +679,9 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = { { CPUCLASS_686, { - 0, "K7 (Athlon)", 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, "Athlon Model 1", "Athlon Model 2", + "Duron", "Athlon Model 4 (Thunderbird)", + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "K7 (Athlon)" /* Default */ }, NULL