Basic support for boardtype 1303 (Cheetah) machines.

Layout of the DZ's registers (among other things) determined
by a massive amount of trial and error.
Work by Brandon and me.

3 files changed, 13 insertions, 7 deletions

diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index e7ce22668fc..1418edc978a 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.18 2000/10/24 01:50:19 hugh Exp $
+#	$OpenBSD: GENERIC,v 1.19 2001/01/28 01:19:58 hugh Exp $
 #	$NetBSD: GENERIC,v 1.61 2000/04/19 06:50:36 itojun Exp $
 
 machine 	vax			# machine type; required
@@ -19,6 +19,7 @@ option 		VAX43		# VS 3100/76
 option 		VAX46		# VS 4000/60
 option		VAX48		# VS 4000 VLC
 option 		VAX49		# VS 4000/90
+option		VAX53		# VAX 4000/10{0,5,6}
 
 option		UVM			# VAX uses UVM; REQUIRED
 
@@ -79,7 +80,8 @@ asc0		at vsbus0 csr 0x26000080 # VS4000/90 SCSI-ctlr
 uba0		at ibus0 		# Qbus adapter
 ze0		at ibus0 		# SGEC on-board ethernet
 #shac0		at ibus0 		# DSSI controller
-le0			at ibus0		# LANCE ethernet
+le0		at ibus0		# LANCE ethernet
+dz0		at ibus0		# DZ serial controller
 
 # Devices connected at VAXBI
 #cpu*		at bi? node?		# KA820/KA825 cpu
diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK
index 3f1b631eefa..050dff902bf 100644
--- a/sys/arch/vax/conf/RAMDISK
+++ b/sys/arch/vax/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.1 2000/10/31 02:30:56 hugh Exp $
+#	$OpenBSD: RAMDISK,v 1.2 2001/01/28 01:19:58 hugh Exp $
 
 machine 	vax			# machine type
 
@@ -22,6 +22,7 @@ option 		VAX43		# VS 3100/76
 option 		VAX46		# VS 4000/60
 option		VAX48		# VS 4000 VLC
 option 		VAX49		# VS 4000/90
+option		VAX53		# VAX 4000/10{0,5,6}
 
 option		UVM			# VAX uses UVM; REQUIRED
 
@@ -94,7 +95,8 @@ asc0		at vsbus0 csr 0x26000080 # VS4000/90 SCSI-ctlr
 uba0		at ibus0 		# Qbus adapter
 ze0		at ibus0 		# SGEC on-board ethernet
 #shac0		at ibus0 		# DSSI controller
-le0			at ibus0		# LANCE ethernet
+le0		at ibus0		# LANCE ethernet
+dz0		at ibus0		# DZ serial controller
 
 # Devices connected at VAXBI
 #cpu*		at bi? node?		# KA820/KA825 cpu
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index dca62b7c803..fcb889ac492 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.vax,v 1.17 2000/11/24 19:14:03 hugh Exp $
+#	$OpenBSD: files.vax,v 1.18 2001/01/28 01:19:58 hugh Exp $
 #       $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
 #
 # new style config file for vax architecture
@@ -111,7 +111,8 @@ attach	ts at uba
 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
+attach dz at ibus with dz_ibus
+file	arch/vax/vsa/dz_ibus.c		dz_vsbus | dz_ibus
 
 # RD-type disks at VS2000's onboard MFM-controller
 device	hdc { drive = -1 }
@@ -295,7 +296,7 @@ file	arch/vax/uba/dh.c		dh needs-flag
 # These are general files needed for compilation.
 file	dev/cons.c
 file	dev/cninit.c
-file	dev/clock_subr.c	vax8200|vax410|vax43|vax630|vax670|vax46|vax48|vax49
+file	dev/clock_subr.c	vax8200|vax410|vax43|vax630|vax670|vax46|vax48|vax49|vax53
 file	arch/vax/vax/locore.c
 file	arch/vax/vax/mem.c
 file	arch/vax/vax/clock.c
@@ -310,6 +311,7 @@ file	arch/vax/vax/ka43.c		vax43
 file	arch/vax/vax/ka46.c		vax46
 file	arch/vax/vax/ka48.c		vax48
 file	arch/vax/vax/ka49.c		vax49
+file	arch/vax/vax/ka53.c		vax53
 file	arch/vax/vax/emulate.s		insn_emulate
 file	arch/vax/vax/unimpl_emul.s	insn_emulate
 file	arch/vax/vax/ka650.c		vax650