Support for the wscons machine-independent console driver on the i386. To

become default in a few moments once deraadt commits new kernel config files.

IMPORTANT NOTE: A few important pieces are still required to be worked out
over the next few days. Users (and developers) relying on X should probably
stay away from -current until further notice. This should not take long, but
here is your first heads up. If you decide to upgrade your kernel anyway,
be sure to update your /etc/ttys file to use vt100 instead of vt220. The
rest of the fallout from this should be minor.

1 files changed, 16 insertions, 2 deletions

diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 7843c922c40..9c7e5b2b533 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.64 1999/12/27 21:42:40 fgsch Exp $
+#	$OpenBSD: files.isa,v 1.65 2001/01/30 00:00:33 aaron Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -62,10 +62,24 @@ attach	com at commulti with com_commulti
 attach	cy at isa with cy_isa
 file	dev/isa/cy_isa.c		cy_isa
 
-# Generic VGA
+# ISA PC keyboard controller
+attach	pckbc at isa with pckbc_isa
+file	dev/isa/pckbc_isa.c		pckbc	needs-flag
+
+# Generic ISA VGA
 attach	vga at isa with vga_isa
 file	dev/isa/vga_isa.c		vga_isa	needs-flag
 
+# Generic EGA
+device	ega: wsemuldisplaydev, pcdisplayops
+attach	ega at isa
+file	dev/isa/ega.c			ega	needs-flag
+
+# Generic PC graphics adapter (MGA, CGA, ...)
+device	pcdisplay: wsemuldisplaydev, pcdisplayops
+attach	pcdisplay at isa
+file	dev/isa/pcdisplay.c	pcdisplay	needs-flag
+
 #
 # SCSI host adapters
 #