[src/netbsd-1-4]: src/sys/arch/alpha/alpha pullup 1.176->1.177 (ross)

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

details:   https://anonhg.NetBSD.org/src/rev/f83e168e762d
branches:  netbsd-1-4
changeset: 469176:f83e168e762d
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Jul 02 17:53:31 1999 +0000

description:
pullup 1.176->1.177 (ross)

diffstat:

 sys/arch/alpha/alpha/machdep.c |  36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diffs (65 lines):

diff -r 12bf108c46a6 -r f83e168e762d sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c    Fri Jul 02 17:52:01 1999 +0000
+++ b/sys/arch/alpha/alpha/machdep.c    Fri Jul 02 17:53:31 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.167.2.5 1999/06/21 19:19:37 cgd Exp $ */
+/* $NetBSD: machdep.c,v 1.167.2.6 1999/07/02 17:53:31 perry Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.167.2.5 1999/06/21 19:19:37 cgd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.167.2.6 1999/07/02 17:53:31 perry Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1184,12 +1184,18 @@
 void
 identifycpu()
 {
+       char *s;
 
        /*
         * print out CPU identification information.
         */
-       printf("%s, %ldMHz\n", cpu_model,
-           hwrpb->rpb_cc_freq / 1000000);      /* XXX true for 21164? */
+       printf("%s", cpu_model);
+       for(s = cpu_model; *s; ++s)
+               if(strncasecmp(s, "MHz", 3) == 0)
+                       goto skipMHz;
+       printf(", %ldMHz", hwrpb->rpb_cc_freq / 1000000);
+skipMHz:
+       printf("\n");
        printf("%ld byte page size, %d processor%s.\n",
            hwrpb->rpb_page_size, ncpus, ncpus == 1 ? "" : "s");
 #if 0
@@ -2229,3 +2235,25 @@
                return &startup_info;
        return mchkinfo_all_cpus + alpha_pal_whami();
 }
+
+char *
+dot_conv(x)
+       unsigned long x;
+{
+       int i;
+       char *xc;
+       static int next;
+       static char space[2][20];
+
+       xc = space[next ^= 1] + sizeof space[0];
+       *--xc = '\0';
+       for (i = 0;; ++i) {
+               if (i && (i & 3) == 0)
+                       *--xc = '.';
+               *--xc = "0123456789abcdef"[x & 0xf];
+               x >>= 4;
+               if (x == 0)
+                       break;
+       }
+       return xc;
+}