Module Name: src
Committed By: matt
Date: Sun Jul 5 02:10:53 UTC 2015
Modified Files:
src/sys/arch/vax/vax: conf.c
Log Message:
Reorganize a bit. Add QVSS (from Charles Dickman).
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/vax/vax/conf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/vax/conf.c
diff -u src/sys/arch/vax/vax/conf.c:1.67 src/sys/arch/vax/vax/conf.c:1.68
--- src/sys/arch/vax/vax/conf.c:1.67 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/conf.c Sun Jul 5 02:10:53 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.6
*/
#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 @@ smgcngetc(dev_t dev)
#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 @@ spxcngetc(dev_t dev)
#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(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 */
