From 35583341d8c9aa0e9b8fd669176b67fb3323a86d Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Sun, 5 Jul 2015 02:10:53 +0000
Subject: [PATCH] Reorganize a bit.  Add QVSS (from Charles Dickman).

---
 sys/arch/vax/vax/conf.c | 90 ++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index b2c5fe5a463d..1580eace2e12 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -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,38 +45,12 @@ __KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.67 2010/12/14 23:44:49 matt Exp $");
  */
 #include <dev/cons.h>
 
+#include "lcg.h"
+#include "qv.h"
 #include "smg.h"
 #include "spx.h"
-#include "lcg.h"
 #include "wskbd.h"
-#if NSMG > 0
-#if NWSKBD > 0
-#define smgcngetc wskbd_cngetc
-#else
-static int
-smgcngetc(dev_t dev)
-{
-	return 0;
-}
-#endif
 
-#define smgcnputc wsdisplay_cnputc
-#define	smgcnpollc nullcnpollc
-#endif
-#if NSPX > 0
-#if NWSKBD > 0
-#define spxcngetc wskbd_cngetc
-#else
-static int
-spxcngetc(dev_t dev)
-{
-	return 0;
-}
-#endif
-
-#define spxcnputc wsdisplay_cnputc
-#define spxcnpollc nullcnpollc
-#endif
 #if NLCG > 0
 #if NWSKBD > 0
 #define lcgcngetc wskbd_cngetc
@@ -90,15 +64,57 @@ lcgcngetc(dev_t dev)
 
 #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
+#else
+static int
+smgcngetc(dev_t dev)
+{
+	return 0;
+}
+#endif
+
+#define smgcnputc wsdisplay_cnputc
+#define	smgcnpollc nullcnpollc
+#endif /* NSMG > 0 */
+#if NSPX > 0
+#if NWSKBD > 0
+#define spxcngetc wskbd_cngetc
+#else
+static int
+spxcngetc(dev_t dev)
+{
+	return 0;
+}
+#endif
+
+#define spxcnputc wsdisplay_cnputc
+#define spxcnpollc nullcnpollc
+#endif /* NSPX > 0 */
+
 cons_decl(gen);
 cons_decl(dz);
 cons_decl(qd);
-cons_decl(smg);
-cons_decl(spx);
 cons_decl(lcg);
-#include "qv.h"
+cons_decl(qv);
+cons_decl(spx);
+cons_decl(smg);
 #include "qd.h"
 
 struct	consdev constab[]={
@@ -111,21 +127,21 @@ struct	consdev constab[]={
 #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 */