Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
matt 2015-07-05 02:10:53 +00:00
parent 3ea559d297
commit 35583341d8
1 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
sys/arch/vax/vax/conf.c
View File

@ -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. * Copyright (c) 1982, 1986 The Regents of the University of California.
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #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" #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 <dev/cons.h>
#include "lcg.h"
#include "qv.h"
#include "smg.h" #include "smg.h"
#include "spx.h" #include "spx.h"
#include "lcg.h"
#include "wskbd.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 NLCG > 0
#if NWSKBD > 0 #if NWSKBD > 0
#define lcgcngetc wskbd_cngetc #define lcgcngetc wskbd_cngetc
@ -90,15 +64,57 @@ lcgcngetc(dev_t dev)
#define lcgcnputc wsdisplay_cnputc #define lcgcnputc wsdisplay_cnputc
#define lcgcnpollc nullcnpollc #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 #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(gen);
cons_decl(dz); cons_decl(dz);
cons_decl(qd); cons_decl(qd);
cons_decl(smg);
cons_decl(spx);
cons_decl(lcg); cons_decl(lcg);
#include "qv.h" cons_decl(qv);
cons_decl(spx);
cons_decl(smg);
#include "qd.h" #include "qd.h"
struct consdev constab[]={ struct consdev constab[]={
@ -111,21 +127,21 @@ struct consdev constab[]={
#endif #endif
#if VAX650 || VAX630 || VAXANY #if VAX650 || VAX630 || VAXANY
#if NQV #if NQV
cons_init(qv), /* QVSS/QDSS bit-mapped console driver */ cons_init(qv), /* QVSS bit-mapped console driver */
#endif #endif
#if NQD #if NQD
cons_init(qd), cons_init(qd),
#endif #endif
#endif #endif
#if NLCG
cons_init(lcg),
#endif
#if NSMG #if NSMG
cons_init(smg), cons_init(smg),
#endif #endif
#if NSPX #if NSPX
cons_init(spx), cons_init(spx),
#endif #endif
#if NLCG
cons_init(lcg),
#endif
#ifdef notyet #ifdef notyet
/* We may not always use builtin console, sometimes RD */ /* We may not always use builtin console, sometimes RD */