Work-in-progress VXT2000 support (commented out in GENERIC so far). Glass

console works on color model, serial console works, ethernet attaches but
does not work correctly yet.

3 files changed, 39 insertions, 4 deletions

diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 557a2f954e1..4adf6670987 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.45 2006/07/30 12:39:34 miod Exp $
+#	$OpenBSD: GENERIC,v 1.46 2006/08/27 16:55:38 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -30,6 +30,7 @@ option		VAX46		# VS 4000/60
 option		VAX48		# VS 4000 VLC
 option		VAX49		# VS 4000/90
 option		VAX53		# VAX 4000 10X, MicroVAX 3100m9X
+#option		VXT		# VXT2000 and VXT2000+
 
 # Old compat stuff; needed to run 4.3BSD Reno programs.
 # Note that if COMPAT_ULTRIX is set, you lose compatibility with
@@ -53,6 +54,7 @@ vsbus0		at mainbus0		# All VAXstations
 ibus0		at mainbus0		# All Microvax
 #nbi0		at mainbus0		# VAX 8800
 #xmi0		at mainbus0		# VAX 6000
+#vxtbus0		at mainbus0		# VXT2000
 
 # Vsbus, the virtual VAXstation bus, and possible devices.
 le0		at vsbus0 csr 0x200e0000 # LANCE ethernet
@@ -78,6 +80,11 @@ ze0		at ibus0		# SGEC on-board ethernet
 le0		at ibus0		# LANCE ethernet (MV3400)
 #shac0		at ibus0		# DSSI controller
 
+# VXT2000 devices
+#ze0		at vxtbus0		# SGEC on-board ethernet
+#qsc0		at vxtbus0		# serial ports
+#lcspx0		at vxtbus0		# color frame buffer
+
 # Devices connected at VAXBI
 #cpu*		at bi? node?		# KA820/KA825 cpu
 #mem*		at bi? node?		# Memory subsystems
@@ -149,8 +156,10 @@ wsdisplay*	at smg?
 #wsdisplay*	at qv0
 
 lkkbd0		at dz0 line 0
+#lkkbd0		at qsc0 line 2
 wskbd*		at lkkbd?
 lkms0		at dz0 line 1
+#lkms0		at qsc0 line 3
 wsmouse*	at lkms?
 
 # Machine leds
diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK
index fab68b18a2a..d36b74a7f40 100644
--- a/sys/arch/vax/conf/RAMDISK
+++ b/sys/arch/vax/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.25 2006/07/30 12:40:07 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.26 2006/08/27 16:55:38 miod Exp $
 
 machine		vax			# machine type
 
@@ -22,6 +22,7 @@ option		VAX46		# VS 4000/60
 option		VAX48		# VS 4000 VLC
 option		VAX49		# VS 4000/90
 option		VAX53		# VAX 4000/10{0,5,6}
+#option		VXT		# VXT2000 and VXT2000+
 
 maxusers	8		# estimated number of users
 option		TIMEZONE=0	# time zone to adjust RTC time by
@@ -61,6 +62,7 @@ vsbus0		at mainbus0		# All VAXstations
 ibus0		at mainbus0		# All Microvax
 #nbi0		at mainbus0		# VAX 8800
 #xmi0		at mainbus0		# VAX 6000
+#vxtbus0		at mainbus0		# VXT2000
 
 # Vsbus, the virtual VAXstation bus, and possible devices.
 le0		at vsbus0 csr 0x200e0000 # LANCE ethernet
@@ -86,6 +88,11 @@ ze0		at ibus0		# SGEC on-board ethernet
 le0		at ibus0		# LANCE ethernet
 #shac0		at ibus0		# DSSI controller
 
+# VXT2000 devices
+#ze0		at vxtbus0		# SGEC on-board ethernet
+#qsc0		at vxtbus0		# serial ports
+#lcspx0		at vxtbus0		# color frame buffer
+
 # Devices connected at VAXBI
 #cpu*		at bi? node?		# KA820/KA825 cpu
 #mem*		at bi? node?		# Memory subsystems
@@ -157,8 +164,10 @@ wsdisplay*	at smg?
 #wsdisplay*	at qv0
 
 lkkbd0		at dz0 line 0
+#lkkbd0		at qsc0 line 2
 wskbd*		at lkkbd?
 #lkms0		at dz0 line 1
+#lkms0		at qsc0 line 3
 #wsmouse*	at lkms?
 
 pseudo-device	loop		1	# network loopback
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index ceca8eeea07..c8b54c074a0 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.vax,v 1.39 2006/07/29 14:18:55 miod Exp $
+#	$OpenBSD: files.vax,v 1.40 2006/08/27 16:55:38 miod Exp $
 #	$NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
 #
 # new style config file for vax architecture
@@ -55,11 +55,17 @@ device	ibus {}
 attach	ibus at mainbus
 file	arch/vax/vax/ibus.c			ibus
 
+device	vxtbus {}
+attach	vxtbus at mainbus
+file	arch/vax/vxt/vxtbus.c			vxtbus
+
 device	ze: sgec, ether, ifnet
 attach	ze at ibus with ze_ibus
 file	arch/vax/if/if_ze.c			ze_ibus
 attach	ze at vsbus with ze_vsbus
 file	arch/vax/vsa/if_ze_vsbus.c		ze_vsbus
+attach	ze at vxtbus with ze_vxtbus
+file	arch/vax/vxt/if_ze_vxtbus.c		ze_vxtbus
 
 attach	le at ibus with le_ibus
 file	arch/vax/if/if_le.c			le_ibus
@@ -113,6 +119,11 @@ file	arch/vax/uba/ts.c			ts needs-flag
 attach	dz at vsbus with dz_vsbus
 file	arch/vax/vsa/dz_ibus.c			dz_vsbus
 
+# VXT serial
+device	qsc {line = -1}: tty
+attach	qsc at vxtbus
+file	arch/vax/vxt/qsc.c			qsc		needs-flag
+
 # RD-type disks at VS2000's onboard MFM-controller
 device	hdc {drive = -1}
 attach	hdc at vsbus
@@ -174,16 +185,21 @@ file	arch/vax/vsa/lcg.c			lcg needs-flag
 
 # LCSPX framebuffer on KA49
 device	lcspx: wsemuldisplaydev, rasops8
-attach	lcspx at vsbus
+attach	lcspx at vsbus with lcspx_vsbus
+attach	lcspx at vxtbus with lcspx_vxtbus
 file	arch/vax/vsa/lcspx.c			lcspx needs-flag
 
 device	lkkbd: wskbddev 
 attach	lkkbd at dz with dzkbd
+attach	lkkbd at qsc with qsckbd
 file	arch/vax/dec/dzkbd.c			dzkbd needs-flag
+file	arch/vax/vxt/qsckbd.c			qsckbd needs-flag
 
 device	lkms: wsmousedev
 attach	lkms at dz with dzms
+attach	lkms at qsc with qscms
 file	arch/vax/dec/dzms.c			dzms needs-flag
+file	arch/vax/vxt/qscms.c			qscms needs-flag
 
 # These devices aren't tested (or even compiled!)
 # They are just included here to make some files happy ;)
@@ -348,6 +364,7 @@ file	arch/vax/vax/ka650.c			vax650
 file	arch/vax/vax/ka660.c			vax660
 file	arch/vax/vax/ka670.c			vax670
 file	arch/vax/vax/ka680.c			vax680
+file	arch/vax/vax/vxt.c			vxt
 file	arch/vax/vax/scb.c
 file	arch/vax/vax/conf.c
 file	arch/vax/vax/urem.s