[src/trunk]: src/sys/arch/i386/i386 Update cpuid table according to informati...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e414a9b30541
branches:  trunk
changeset: 499300:e414a9b30541
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Thu Nov 16 09:06:17 2000 +0000

description:
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

diffstat:

 sys/arch/i386/i386/machdep.c |  20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r dc37f294921f -r e414a9b30541 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Thu Nov 16 08:57:15 2000 +0000
+++ b/sys/arch/i386/i386/machdep.c      Thu Nov 16 09:06:17 2000 +0000
@@ -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 @@
                        {
                                "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 @@
                        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 @@
                {
                        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