[src/trunk]: src/sys/arch/vax/vax Reorganize a bit. Add QVSS (from Charles D...

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

details:   https://anonhg.NetBSD.org/src/rev/79bfd232d6f6
branches:  trunk
changeset: 339209:79bfd232d6f6
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Jul 05 02:10:53 2015 +0000

description:
Reorganize a bit.  Add QVSS (from Charles Dickman).

diffstat:

 sys/arch/vax/vax/conf.c |  68 ++++++++++++++++++++++++++++++------------------
 1 files changed, 42 insertions(+), 26 deletions(-)

diffs (129 lines):

diff -r 38bd1406b727 -r 79bfd232d6f6 sys/arch/vax/vax/conf.c
--- a/sys/arch/vax/vax/conf.c   Sun Jul 05 02:03:36 2015 +0000
+++ b/sys/arch/vax/vax/conf.c   Sun Jul 05 02:10:53 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.67 2010/12/14 23:44:49 matt Exp $   */
+/*     $NetBSD: conf.c,v 1.68 2015/07/05 02:10:53 matt Exp $   */
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.67 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.68 2015/07/05 02:10:53 matt Exp $");
 
 #include "opt_cputype.h"
 
@@ -45,10 +45,40 @@
  */
 #include <dev/cons.h>
 
+#include "lcg.h"
+#include "qv.h"
 #include "smg.h"
 #include "spx.h"
-#include "lcg.h"
 #include "wskbd.h"
+
+#if NLCG > 0
+#if NWSKBD > 0
+#define lcgcngetc wskbd_cngetc
+#else
+static int
+lcgcngetc(dev_t dev)
+{
+       return 0;
+}
+#endif
+
+#define lcgcnputc wsdisplay_cnputc
+#define lcgcnpollc nullcnpollc
+#endif /* NLCG > 0 */
+#if NQV > 0
+#if NWSKBD > 0
+#define qvcngetc wskbd_cngetc
+#else
+static int
+qvcngetc(dev_t dev)
+{
+       return 0;
+}
+#endif
+
+#define qvcnputc wsdisplay_cnputc
+#define qvcnpollc nullcnpollc
+#endif /* NQV > 0 */
 #if NSMG > 0
 #if NWSKBD > 0
 #define smgcngetc wskbd_cngetc
@@ -62,7 +92,7 @@
 
 #define smgcnputc wsdisplay_cnputc
 #define        smgcnpollc nullcnpollc
-#endif
+#endif /* NSMG > 0 */
 #if NSPX > 0
 #if NWSKBD > 0
 #define spxcngetc wskbd_cngetc
@@ -76,29 +106,15 @@
 
 #define spxcnputc wsdisplay_cnputc
 #define spxcnpollc nullcnpollc
-#endif
-#if NLCG > 0
-#if NWSKBD > 0
-#define lcgcngetc wskbd_cngetc
-#else
-static int
-lcgcngetc(dev_t dev)
-{
-       return 0;
-}
-#endif
-
-#define lcgcnputc wsdisplay_cnputc
-#define lcgcnpollc nullcnpollc
-#endif
+#endif /* NSPX > 0 */
 
 cons_decl(gen);
 cons_decl(dz);
 cons_decl(qd);
-cons_decl(smg);
+cons_decl(lcg);
+cons_decl(qv);
 cons_decl(spx);
-cons_decl(lcg);
-#include "qv.h"
+cons_decl(smg);
 #include "qd.h"
 
 struct consdev constab[]={
@@ -111,21 +127,21 @@
 #endif
 #if VAX650 || VAX630 || VAXANY
 #if NQV
-       cons_init(qv),  /* QVSS/QDSS bit-mapped console driver */
+       cons_init(qv),  /* QVSS bit-mapped console driver */
 #endif
 #if NQD
        cons_init(qd),
 #endif
 #endif
+#if NLCG
+       cons_init(lcg),
+#endif
 #if NSMG
        cons_init(smg),
 #endif
 #if NSPX
        cons_init(spx),
 #endif
-#if NLCG
-       cons_init(lcg),
-#endif
 
 #ifdef notyet
 /* We may not always use builtin console, sometimes RD */