[src/trunk]: src/sys/arch/vax/vax Let smg be probed as all other possible con...

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

details:   https://anonhg.NetBSD.org/src/rev/83a2935be284
branches:  trunk
changeset: 477687:83a2935be284
user:      ragge <ragge%NetBSD.org@localhost>
date:      Wed Oct 27 16:38:54 1999 +0000

description:
Let smg be probed as all other possible consoles.

diffstat:

 sys/arch/vax/vax/conf.c    |   5 +++--
 sys/arch/vax/vax/machdep.c |  12 +-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diffs (65 lines):

diff -r 5ef5bb5b4771 -r 83a2935be284 sys/arch/vax/vax/conf.c
--- a/sys/arch/vax/vax/conf.c   Wed Oct 27 16:37:54 1999 +0000
+++ b/sys/arch/vax/vax/conf.c   Wed Oct 27 16:38:54 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.43 1999/07/29 19:14:37 augustss Exp $       */
+/*     $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $  */
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -161,6 +161,7 @@
 #endif
 
 #define smgcnputc wsdisplay_cnputc
+#define        smgcnpollc nullcnpollc
 
 cons_decl(gen);
 cons_decl(dz);
@@ -188,7 +189,7 @@
        cons_init(qd),
 #endif
 #endif
-#if 0 /* NSMG XXX fails due to wscons */
+#if NSMG
        cons_init(smg),
 #endif
 
diff -r 5ef5bb5b4771 -r 83a2935be284 sys/arch/vax/vax/machdep.c
--- a/sys/arch/vax/vax/machdep.c        Wed Oct 27 16:37:54 1999 +0000
+++ b/sys/arch/vax/vax/machdep.c        Wed Oct 27 16:38:54 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.88 1999/10/22 21:14:34 ragge Exp $    */
+/* $NetBSD: machdep.c,v 1.89 1999/10/27 16:38:54 ragge Exp $    */
 
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -306,8 +306,6 @@
 void
 consinit()
 {
-       extern int smgprobe(void), smgcninit(void);
-
        /*
         * Init I/O memory resource map. Must be done before cninit()
         * is called; we may want to use iospace in the console routines.
@@ -316,20 +314,12 @@
 #ifdef DEBUG
        iospace_inited = 1;
 #endif
-
        cninit();
-#if NSMG
-       /* XXX - do this probe after everything else due to wscons trouble */
-       if (smgprobe())
-               smgcninit();
-#endif
 #ifdef DDB
        {
                extern int end; /* Contains pointer to symsize also */
                extern int *esym;
 
-//             extern void ksym_init(int *, int *);
-//             ksym_init(&end, esym);
                ddb_init(*(int *)&end, ((int *)&end) + 1, esym);
        }
 #ifdef DEBUG