[src/trunk]: src/sys/arch/i386/i386 cosmetic change in brand string handling ...

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

details:   https://anonhg.NetBSD.org/src/rev/1957bafeb8c1
branches:  trunk
changeset: 499422:1957bafeb8c1
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Nov 19 23:38:22 2000 +0000

description:
cosmetic change in brand string handling (NULL vs. "")

drop Xeon from PIII Cascades entry, it should be handled by the brand id
support (pointed out by Scott Telford in private e-mail).

diffstat:

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

diffs (36 lines):

diff -r 000ac899173a -r 1957bafeb8c1 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Sun Nov 19 22:34:56 2000 +0000
+++ b/sys/arch/i386/i386/machdep.c      Sun Nov 19 23:38:22 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.418 2000/11/16 17:00:17 jdolecek Exp $   */
+/*     $NetBSD: machdep.c,v 1.419 2000/11/19 23:38:22 jdolecek Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -286,7 +286,7 @@
  * Source: Intel Processor Identification and the CPUID Instruction, AP-485
  */
 const char * const i386_p3_brand[] = {
-       NULL,           /* Unsupported */
+       "",             /* Unsupported */
        "Celeron",      /* Intel (R) Celeron (TM) processor */
        "",             /* Intel (R) Pentium (R) III processor */       
        "Xeon",         /* Intel (R) Pentium (R) III Xeon (TM) processor */
@@ -640,7 +640,7 @@
                                "Celeron (Mendocino)",
                                "Pentium III (Katmai)",
                                "Pentium III (Coppermine)",
-                               0, "Pentium III Xeon (Cascades)", 0, 0,
+                               0, "Pentium III (Cascades)", 0, 0,
                                0, 0,
                                "Pentium Pro, II or III"        /* Default */
                        },
@@ -953,7 +953,7 @@
        }
 
        sprintf(cpu_model, "%s %s%s%s%s (%s-class)", vendorname, modifier, name,
-               (brand && *brand) ? " " : "", brand,
+               (*brand) ? " " : "", brand,
                classnames[class]);
 
        cpu_class = class;