cleanup so these might be useable soon. and add WSEMUL_VT100.

6 files changed, 30 insertions, 20 deletions

diff --git a/sys/arch/alpha/conf/ALATAR b/sys/arch/alpha/conf/ALATAR
index 1a550eab114..0754c98156b 100644
--- a/sys/arch/alpha/conf/ALATAR
+++ b/sys/arch/alpha/conf/ALATAR
@@ -1,4 +1,4 @@
-#	$OpenBSD: ALATAR,v 1.4 1999/01/08 03:16:15 niklas Exp $
+#	$OpenBSD: ALATAR,v 1.5 2000/09/09 01:46:15 ericj Exp $
 #
 # AXPpci 33 kernel.  Enough to get booted, etc., but not much more.
 
@@ -54,6 +54,8 @@ options		LKM
 # Misc. options
 options		PCIVERBOSE		# recognize "unknown" PCI devices
 
+options		WSEMUL_VT100		# wscons VT100 emulation
+
 config		bsd	root on sd0 swap on sd0
 
 mainbus0 at	root
@@ -93,7 +95,7 @@ st*	at	scsibus? target ? lun ?
 uk*	at	scsibus? target ? lun ?
 
 # Workstation Console attachments
-wscons*	at	vga?
+wsdisplay*	at	vga?
 
 pseudo-device	bpfilter	16
 pseudo-device	loop
diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA
index 3eaf3c89fb4..4129bcb014b 100644
--- a/sys/arch/alpha/conf/ALPHA
+++ b/sys/arch/alpha/conf/ALPHA
@@ -1,4 +1,4 @@
-#	$OpenBSD: ALPHA,v 1.14 2000/07/05 21:55:36 ericj Exp $
+#	$OpenBSD: ALPHA,v 1.15 2000/09/09 01:46:15 ericj Exp $
 #	$NetBSD: ALPHA,v 1.30 1996/12/03 17:25:27 cgd Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
@@ -88,6 +88,7 @@ options		FIX_UNALIGNED_VAX_FP	# fix unaligned VAX FP loads & stores
 options		PCIVERBOSE		# recognize "unknown" PCI devices
 options		TCVERBOSE		# recognize "unknown" TC devices
 
+options		WSEMUL_VT100		# wscons VT100 emulation
 config		bsd	swap generic
 #config		bsd	root on sd0 swap on sd0
 #config		bsd	root nfs swap nfs
@@ -172,10 +173,10 @@ st*	at	scsibus? target ? lun ?		# SCSI tape drives
 uk*	at	scsibus? target ? lun ?		# SCSI unknown
 
 # Workstation Console attachments
-wscons*	at	cfb?
-wscons*	at	vga?
-wscons*	at	sfb?
-wscons*	at	tga?
+#wsdisplay*	at	cfb?
+wsdisplay*	at	vga?
+#wsdisplay*	at	sfb?
+wsdisplay*	at	tga?
 
 pseudo-device	bpfilter	16
 pseudo-device	loop
diff --git a/sys/arch/alpha/conf/AXPPCI33 b/sys/arch/alpha/conf/AXPPCI33
index bd47fe71db2..1fce19e534f 100644
--- a/sys/arch/alpha/conf/AXPPCI33
+++ b/sys/arch/alpha/conf/AXPPCI33
@@ -1,4 +1,4 @@
-#	$OpenBSD: AXPPCI33,v 1.6 2000/07/05 21:55:37 ericj Exp $
+#	$OpenBSD: AXPPCI33,v 1.7 2000/09/09 01:46:15 ericj Exp $
 #
 # Generic Alpha AXPPCI33 (NoName) kernel.
 # Enough to get booted, etc., but not much more.
@@ -62,6 +62,7 @@ option		LKM
 option		PCIVERBOSE		# recognize "unknown" PCI devices
 #option		TCVERBOSE		# recognize "unknown" TC devices
 
+option		WSEMUL_VT100		# wscons VT100 emulation
 config		bsd	swap generic
 #config		bsd	root on sd0 swap on sd0
 #config		bsd	root nfs swap nfs
@@ -152,9 +153,9 @@ uk*	at	scsibus? target ? lun ?
 
 # Workstation Console attachments
 #wscons*	at	cfb?
-wscons*	at	vga?
+wsdisplay*	at	vga?
 #wscons*	at	sfb?
-#wscons*	at	tga?
+wsdisplay*	at	tga?
 
 pseudo-device	bpfilter	16
 pseudo-device	loop
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 2146cf764d9..284da0d7f99 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.52 2000/08/04 17:00:45 ericj Exp $
+#	$OpenBSD: GENERIC,v 1.53 2000/09/09 01:46:15 ericj Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -29,6 +29,8 @@ option		EISAVERBOSE		# recognize "unknown" EISA devices
 option		PCIVERBOSE		# recognize "unknown" PCI devices
 option		TCVERBOSE		# recognize "unknown" TC devices
 
+option		WSEMUL_VT100		# wscons VT100 emulation
+
 config		bsd	swap generic
 
 mainbus0 at	root
@@ -156,9 +158,9 @@ ch*	at	scsibus? target ? lun ?
 uk*	at	scsibus? target ? lun ?
 
 # Workstation Console attachments
-wsdisplay*	at	cfb?
+#wsdisplay*	at	cfb?
 #wsdisplay*	at	vga?
-wsdisplay*	at	sfb?
+#wsdisplay*	at	sfb?
 wsdisplay*	at	tga?
 #wskbd*		at	pckbd?
 #wsmouse*	at	pms?
diff --git a/sys/arch/alpha/conf/LOKI b/sys/arch/alpha/conf/LOKI
index 38abb7791e6..d9d6570d2b4 100644
--- a/sys/arch/alpha/conf/LOKI
+++ b/sys/arch/alpha/conf/LOKI
@@ -1,4 +1,4 @@
-#	$OpenBSD: LOKI,v 1.9 1999/09/12 14:15:16 kstailey Exp $
+#	$OpenBSD: LOKI,v 1.10 2000/09/09 01:46:15 ericj Exp $
 #
 # LOKI, an Alpha AXPPCI33 (NoName) kernel.
 #
@@ -70,6 +70,8 @@ option		LKM
 option		PCIVERBOSE		# recognize "unknown" PCI devices
 #option		TCVERBOSE		# recognize "unknown" TC devices
 
+option		WSEMUL_VT100		# wscons VT100 emulation
+
 #config		bsd	swap generic
 config		bsd	root on sd0 swap on sd0 dumps on sd0
 #config		bsd	root nfs swap nfs
@@ -124,7 +126,7 @@ st*	at	scsibus? target ? lun ?
 uk*	at	scsibus? target ? lun ?
 
 # Workstation Console attachments
-wscons*	at	vga?
+wsdisplay*	at	vga?
 
 pseudo-device	bpfilter	8	# Berkeley Packet Filter
 pseudo-device	loop			# network loopback
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 410f55e7ff3..322f1b5603e 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.29 2000/07/05 21:55:36 ericj Exp $
+#	$OpenBSD: RAMDISK,v 1.30 2000/09/09 01:46:16 ericj Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -67,6 +67,8 @@ option		INET		# Internet protocol suite
 #option		TCVERBOSE		# recognize "unknown" TC devices
 option		SCSITERSE		# less verbose scsi error messages
 
+option		WSEMUL_VT100		# wscons VT100 emulation
+
 config		bsd	swap generic
 #config		bsd	root on sd0 swap on sd0
 #config		bsd	root nfs swap nfs
@@ -180,10 +182,10 @@ sd*	at	scsibus? target ? lun ?		# SCSI disk drives
 st*	at	scsibus? target ? lun ?		# SCSI tape drives
 
 # Workstation Console attachments
-#wscons*	at	cfb?
-wscons*	at	vga?
-#wscons*	at	sfb?
-wscons*	at	tga?
+#wsdisplay*	at	cfb?
+wsdisplay*	at	vga?
+#wsdisplay*	at	sfb?
+wsdisplay*	at	tga?
 
 pseudo-device	bpfilter	1
 pseudo-device	loop