Make pcvt and syscons live in the same kernel. If both are enabled, then

the first one in the config has priority.  They can be switched using
userconfig().

i386/i386/conf.c:
Initialize the shared syscons/pcvt cdevsw entry to `nx'.

Add cdevsw registration functions.

Use devsw functions of the correct type if they exist.

i386/i386/cons.c:
Add renamed syscons entry points to constab.

i386/i386/cons.h:
Declare the renamed syscons entry points.

i386/i386/machdep.c:
Repeat console initialization after userconfig() in case the current
console has become wrong.  This depends on cn functions not wiring down
anything important.

sys/conf.h:
Declare new functions.

i386/isa/isa.[ch]:
Add a function to decide which display driver has priority.  Should be
done better.

i386/isa/syscons.c:
Rename pccn* -> sccn*.

Initialize CRTC start address in case the previous driver has moved it.

i386/isa/syscons.c, i386/isa/pcvt/*
Initialize the bogusly shared variable Crtat dynamically in case the
stored value was changed by the previous driver.

Initialize cdevsw table from a template.

Don't grab the console if another display driver has priority.

i386/isa/syscons.h, i386/isa/pcvt/pcvt_hdr.h:
Don't externally declare now-static cdevsw functions.

i386/isa/pcvt/pcvt_hdr.h:
Set the sensitive hardware flag so that pcvt doesn't always have lower
priority than syscons.  This also fixes the "stupid" detection of the
display after filling the display with text.

i386/isa/pcvt/pcvt_out.c:
Don't be confused the off-screen cursor offset 0xffff set by syscons.

kern/subr_xxx.c:
Add enough nxio/nodev/null devsw functions of the correct type for syscons
and pcvt.

1 files changed, 5 insertions, 13 deletions

diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 7f0ad9e..d84942a 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -132,7 +132,7 @@
 #if PCVT_NETBSD > 9
 #include "dev/cons.h"
 #elif PCVT_FREEBSD >= 200
-#include <i386/i386/cons.h>
+#include <machine/cons.h>
 #else
 #include "i386/i386/cons.h"
 #endif
@@ -943,7 +943,7 @@ int pcprobe ( struct isa_device *dev );
 int pcattach ( struct isa_device *dev );
 
 struct	isa_driver vtdriver = {		/* driver routines */
-	pcprobe, pcattach, "vt",
+	pcprobe, pcattach, "vt", 1,
 };
 
 #endif /* PCVT_NETBSD > 9 */
@@ -959,7 +959,8 @@ u_char bgansitopc[] = {			/* background ANSI color -> pc */
 };
 
 #if !PCVT_NETBSD
-u_short *Crtat	=	(u_short *)MONO_BUF;	/* screen start address */
+/* XXX Crtat is shared with syscons. */
+u_short *Crtat;			/* screen start address */
 #if !(PCVT_FREEBSD > 110 && PCVT_FREEBSD < 200)
 struct tty *pcconsp =	&pccons[0];		/* ptr to current device */
 #else /* PCVT_FREEBSD > 110 */
@@ -1210,20 +1211,11 @@ extern void bcopyb(void *from, void *to, u_int length);
 extern void fillw(U_short value, void *addr, u_int length);
 #endif
 
-int	pcopen ( Dev_t dev, int flag, int mode, struct proc *p );
-int	pcclose ( Dev_t dev, int flag, int mode, struct proc *p );
-int	pcread ( Dev_t dev, struct uio *uio, int flag );
-int	pcwrite ( Dev_t dev, struct uio *uio, int flag );
-int	pcioctl ( Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p );
-int	pcmmap ( Dev_t dev, int offset, int nprot );
-#if PCVT_FREEBSD > 205
-struct tty *pcdevtotty ( Dev_t dev );
-#endif /* PCVT_FREEBSD > 205 */
 int	pcrint ( void );
 int	pcparam ( struct tty *tp, struct termios *t );
 
 /*
- * In FreeBSD > 2.0.6, driver console functions are declared in i386/cons.h
+ * In FreeBSD > 2.0.6, driver console functions are declared in machine/cons.h
  * and some return void, so don't declare them here.
  */
 #if PCVT_FREEBSD <= 205