[src/netbsd-1-5]: src/sys/arch/pmax/pmax Pull up revision 1.175 from trunk: f...

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

details:   https://anonhg.NetBSD.org/src/rev/e1cb865c3509
branches:  netbsd-1-5
changeset: 488323:e1cb865c3509
user:      ad <ad%NetBSD.org@localhost>
date:      Thu Jun 29 15:05:57 2000 +0000

description:
Pull up revision 1.175 from trunk: fix console output on PMAG-D.

Approved by releng.

diffstat:

 sys/arch/pmax/pmax/machdep.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (59 lines):

diff -r 712fc7c0434e -r e1cb865c3509 sys/arch/pmax/pmax/machdep.c
--- a/sys/arch/pmax/pmax/machdep.c      Thu Jun 29 15:04:55 2000 +0000
+++ b/sys/arch/pmax/pmax/machdep.c      Thu Jun 29 15:05:57 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.173 2000/06/06 00:47:21 nisimura Exp $   */
+/*     $NetBSD: machdep.c,v 1.173.2.1 2000/06/29 15:05:57 ad Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.173 2000/06/06 00:47:21 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.173.2.1 2000/06/29 15:05:57 ad Exp $");
 
 #include "fs_mfs.h"
 #include "opt_ddb.h"
@@ -177,12 +177,6 @@
 #endif
        extern char edata[], end[];     /* XXX */
 
-       /* Initialize callv so we can do PROM output... */
-       callv = (code == DEC_PROM_MAGIC) ? (void *)cv : &callvec;
-
-       /* Use PROM console output until we initialize a console driver. */
-       cn_tab = &promcd;
-
        /* Set up bootinfo structure looking at stack. */
        if (bim == BOOTINFO_MAGIC) {
                struct btinfo_magic *bi_magic;
@@ -197,10 +191,6 @@
        }
        else
                bootinfo_msg = "invalid bootinfo pointer (old bootblocks?)\n";
-#if 0
-       if (bootinfo_msg != NULL)
-               printf(bootinfo_msg);
-#endif
 
        /* clear the BSS segment */
 #ifdef DDB
@@ -233,6 +223,16 @@
                memset(edata, 0, kernend - edata);
        }
 
+       /* Initialize callv so we can do PROM output... */
+       callv = (code == DEC_PROM_MAGIC) ? (void *)cv : &callvec;
+
+       /* Use PROM console output until we initialize a console driver. */
+       cn_tab = &promcd;
+
+#if 0
+       if (bootinfo_msg != NULL)
+               printf(bootinfo_msg);
+#endif
        /*
         * Set the VM page size.
         */