[src/trunk]: src/sys/arch/pmax Apply patch supplied by Konrad Schroder in PR ...

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

details:   https://anonhg.NetBSD.org/src/rev/dcf662015e2b
branches:  trunk
changeset: 493980:dcf662015e2b
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Jun 28 11:03:25 2000 +0000

description:
Apply patch supplied by Konrad Schroder in PR 10452: fixes console output
on PMAG-D.

diffstat:

 sys/arch/pmax/dev/rcons.c    |   3 ++-
 sys/arch/pmax/pmax/machdep.c |  24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diffs (76 lines):

diff -r 65f0fcc6721d -r dcf662015e2b sys/arch/pmax/dev/rcons.c
--- a/sys/arch/pmax/dev/rcons.c Wed Jun 28 10:07:05 2000 +0000
+++ b/sys/arch/pmax/dev/rcons.c Wed Jun 28 11:03:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rcons.c,v 1.42 2000/06/26 04:55:55 simonb Exp $        */
+/*     $NetBSD: rcons.c,v 1.43 2000/06/28 11:03:26 ad Exp $    */
 
 /*
  * Copyright (c) 1995
@@ -188,6 +188,7 @@
        rc.rc_deffgcolor = WSCOL_WHITE;
        rc.rc_defbgcolor = WSCOL_BLACK;
        rcons_init(&rc, 1);
+       rcons_ttyinit(fbconstty);
 }
 #endif
 
diff -r 65f0fcc6721d -r dcf662015e2b sys/arch/pmax/pmax/machdep.c
--- a/sys/arch/pmax/pmax/machdep.c      Wed Jun 28 10:07:05 2000 +0000
+++ b/sys/arch/pmax/pmax/machdep.c      Wed Jun 28 11:03:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.174 2000/06/26 14:20:54 mrg Exp $        */
+/*     $NetBSD: machdep.c,v 1.175 2000/06/28 11:03:25 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.174 2000/06/26 14:20:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.175 2000/06/28 11:03:25 ad Exp $");
 
 #include "fs_mfs.h"
 #include "opt_ddb.h"
@@ -179,12 +179,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;
@@ -199,10 +193,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
@@ -235,6 +225,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.
         */