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.

src/etc/etc.i386/MAKEDEV

@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.86 2000/11/23 23:37:44 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.87 2001/01/30 00:00:33 aaron Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -48,9 +48,8 @@
 #	raid*	RAIDframe disk devices
 #
 # Console ports:
-#	ttyC0	pccons or pcvt screen 0
-#	ttyC*	pcvt
-#	pcvtctl	userland <-> kernel mouse communication for pcvt
+#	ttyC0	pccons or wscons screen 0
+#	ttyC*	wscons
 #
 # Pointing devices:
 #	mms*	Microsoft bus mouse
@@ -187,7 +186,8 @@ all)
 	sh $this ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
 	sh $this mcd0 vnd0 vnd1 lpa0 lpa1 ccd0 ccd1 ccd2 ccd3
 	sh $this raid0 raid1 raid2 raid3 lpt0 lpt1 lpt2
-	sh $this ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 pcvtctl
+	sh $this ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	sh $this wscons
 	sh $this ipl tun0 tun1 tun2
 	sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	sh $this speaker lkm mms0 lms0 pms0 audio joy0 joy1 apm local
@@ -283,6 +283,12 @@ utty*)
 	chmod 660 utty$unit
 	;;
 
+ttyCcfg)
+	rm -f ttyCcfg
+	mknod ttyCcfg c 12 255
+	chown root.wheel ttyCcfg
+	;;
+
 ttyC*)
 	unit=${i##ttyC}
 	case $unit in
@@ -295,11 +301,31 @@ ttyC*)
 	chown root.wheel ttyC$unit
 	;;
 
-pcvtctl)
-	rm -f pcvtctl
-	mknod pcvtctl c 12 255
-	chown root.wheel pcvtctl
-	chmod 600 pcvtctl
+wscons)
+	sh $this wskbd0 wskbd1 wskbd2 wskbd3
+	sh $this wsmouse0 wsmouse1 wsmouse2 wsmouse3
+	sh $this ttyCcfg
+	sh $this wsmux
+	;;
+
+wskbd*)
+	rm -f wskbd$unit
+	mknod wskbd$unit c 67 $unit
+	chown root.wheel wskbd$unit
+	;;
+
+wsmouse*)
+	rm -f wsmouse$unit
+	mknod wsmouse$unit c 68 $unit
+	chown root.wheel wsmouse$unit
+	;;
+
+wsmux|wsmouse|wskbd)
+	rm -f wsmouse wskbd
+	mknod wsmouse c 69 0
+	mknod wskbd c 69 1
+	chown root.wheel wsmouse wskbd
+	chmod 600 wsmouse wskbd
 	;;
 
 ttyc*)

src/etc/etc.i386/ttys

@@ -1,17 +1,17 @@
 #
-#	$OpenBSD: ttys,v 1.13 1998/06/28 00:48:37 art Exp $
+#	$OpenBSD: ttys,v 1.14 2001/01/30 00:00:34 aaron Exp $
 #
 # name	getty				type	status		comments
 #
-console	"/usr/libexec/getty Pc"		vt220	off secure
-ttyC0	"/usr/libexec/getty Pc"		vt220	on  secure
-ttyC1	"/usr/libexec/getty Pc"		vt220	on  secure
-ttyC2	"/usr/libexec/getty Pc"		vt220	on  secure
-ttyC3	"/usr/libexec/getty Pc"		vt220	on  secure
-ttyC4	"/usr/libexec/getty Pc"		vt220	off secure
-ttyC5	"/usr/libexec/getty Pc"		vt220	on  secure
-ttyC6	"/usr/libexec/getty Pc"		vt220	off secure
-ttyC7	"/usr/libexec/getty Pc"		vt220	off secure
+console	"/usr/libexec/getty Pc"		vt100	off secure
+ttyC0	"/usr/libexec/getty Pc"		vt100	on  secure
+ttyC1	"/usr/libexec/getty Pc"		vt100	on  secure
+ttyC2	"/usr/libexec/getty Pc"		vt100	on  secure
+ttyC3	"/usr/libexec/getty Pc"		vt100	on  secure
+ttyC4	"/usr/libexec/getty Pc"		vt100	off secure
+ttyC5	"/usr/libexec/getty Pc"		vt100	on  secure
+ttyC6	"/usr/libexec/getty Pc"		vt100	off secure
+ttyC7	"/usr/libexec/getty Pc"		vt100	off secure
 tty00	"/usr/libexec/getty std.9600"	unknown off
 tty01	"/usr/libexec/getty std.9600"	unknown off
 tty02	"/usr/libexec/getty std.9600"	unknown off