sync -- enabled devices in GENERIC should be working

3 files changed, 344 insertions, 310 deletions

diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 43c5b0a3081..be3077eb28b 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,156 +1,144 @@
-#	$OpenBSD: GENERIC,v 1.14 2000/01/09 22:00:25 itojun Exp $
-#	$NetBSD: GENERIC,v 1.24 1997/08/23 19:19:31 ragge Exp $
-#
-# GENERIC VAX configuration file; all supported devices.
-#
+#	$OpenBSD: GENERIC,v 1.15 2000/04/27 05:47:14 bjc Exp $
+#	$NetBSD: GENERIC,v 1.61 2000/04/19 06:50:36 itojun Exp $
 
-machine		vax		# machine type
+machine 	vax			# machine type; required
+
+include "../../../conf/GENERIC"
 
 # Here are all different supported CPU types listed.
-option		"VAX8600"
-option		"VAX8200"
-option		"VAX780"
-option		"VAX750"
-option		"VAX630"	# MV II
-option		"VAX650"	# MV III, 3600, 3800, 3900
-option		"VAX410"	# VS 2000
-option		"VAX43"		# VS 3100/76
-
-# Kernel identification
-option		GENERIC
+# One of these is required.
+#option 		VAX8600
+#option 		VAX8200
+#option 		VAX780		# 11/780
+#option 		VAX750		# 11/750
+option 		VAX630		# MV II
+option 		VAX650		# MV III, 3300, 3600, 3800, 3900
+option	 	VAX670		# VAX 4000/300
+option	 	VAX410		# VS 2000, 3100/{30,}
+option 		VAX43		# VS 3100/76
+option 		VAX46		# VS 4000/60
+option		VAX48		# VS 4000 VLC
+option 		VAX49		# VS 4000/90
+
+option		UVM			# VAX uses UVM; REQUIRED
 
 # Max users on system; this is just a hint
-maxusers	8
-
-# standard system options
-options		SWAPPAGER	# swap and anonymous memory
-options		DEVPAGER	# mapped devices
-
-# Kernel compiled-in symbolic debugger & system call tracer
-option		DDB
-option		KTRACE
-#option		DIAGNOSTIC
-
-#options	SCSIVERBOSE		# Verbose SCSI errors
-
-# Network support
-#option		GATEWAY
-option		INET
-
-# All supported filesystem types
-option		FFS,QUOTA
-option		MFS
-option		NFSCLIENT
-option		NFSSERVER
-option		FDESC
-option		FIFO
-option		KERNFS
-option		NULLFS
-option		PROCFS
-option		UMAPFS
-option		UNION
-
-# System V shared memory & semaphores support.
-option		SYSVMSG
-option		SYSVSEM
-option		SYSVSHM
+maxusers	8	
+
+option 		SCSIVERBOSE		# Verbose SCSI errors
+
+# WS console uses VT100 terminal emulation
+option 		WSEMUL_VT100
+option 		WSDISPLAY_DEFAULTSCREENS=8
 
 # Old compat stuff; needed to run 4.3BSD Reno programs.
 # Note that if COMPAT_ULTRIX is set, you lose compatibility with
 # 4.3BSD Reno programs and get Ultrix compatibility instead.
 # (They cannot coexist).
-option		COMPAT_43
-option		COMPAT_09
-option		COMPAT_10
-option		COMPAT_11
-option		COMPAT_12
-#option		COMPAT_ULTRIX
-#option		TCP_COMPAT_42
-
-option		LKM
+option 		COMPAT_VAX1K	# Must be present to run pre-1.4 binaries.
+option 		COMPAT_12
+#option 	COMPAT_13
+#option 	COMPAT_14
+#option 	COMPAT_ULTRIX
 
 # Kernel(s) to compile
-config          bsd          swap generic
+config		bsd		swap generic
+#config		nfsbsd	root on nfs swap on nfs
+
+mainbus0	at root
+
+# All buses; from the beginning attached to mainbus.
+#abus0		at mainbus0		# Master bus on VAX 8600
+#sbi0		at mainbus0		# SBI, master bus on 11/780.
+#cmi0		at mainbus0		# 11/750 internal bus.
+#bi0		at mainbus0		# VAX 8200 
+vsbus0		at mainbus0		# All VAXstations
+ibus0		at mainbus0		# All Microvax
+#nbi0		at mainbus0		# VAX 8800
+#xmi0		at mainbus0		# VAX 6000
+
+# Vsbus, the virtual VAXstation bus, and possible devices.
+le0		at vsbus0 csr 0x200e0000 # LANCE ethernet
+ze0		at vsbus0 csr 0x20008000 # SGEC ethernet
+dz0		at vsbus0 csr 0x200a0000 # DC-367 DZ-11 lookalike ctlr
+dz0		at vsbus0 csr 0x25000000 # VS4000/90 serial line
+#hdc0		at vsbus0 csr 0x200c0000 # HDC9224 MFM/floppy ctlr
+ncr0		at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-ctlr
+ncr1		at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-ctlr
+#smg0		at vsbus0 csr 0x200f0000 # Small monochrome display ctlr.
+#clr0		at vsbus0 csr 0x30000000 # 4- or 8-bitplans color graphics
+
+#hd*		at hdc0 drive?		# RD5x disks
+#ry*		at hdc0 drive?		# RX floppies
+
+# Ibus, the internal bus on most Microvaxen
+uba0		at ibus0 		# Qbus adapter
+ze0		at ibus0 		# SGEC on-board ethernet
+#shac0		at ibus0 		# DSSI controller
+le0			at ibus0		# LANCE ethernet
 
-backplane0	at root
+# Devices connected at VAXBI
+#cpu*		at bi? node?		# KA820/KA825 cpu
+#mem*		at bi? node?		# Memory subsystems
+#uba*		at bi? node?		# DWBUA BI-Unibus adapter
+#ni*		at bi? node?		# DEBNA/DEBNT ethernet adapter
+#kdb*		at bi? node?		# KDB50 MSCP disk ctlr
+#mscpbus*	at kdb?
 
-# Devices directly attached to backplane.
-cpu0		at backplane0	# Only one CPU so far.
-sbi*		at backplane0	# SBI's are always at backplane (Abus).
-mem*		at backplane0	# Some machines have memory at backplane.
-bi*		at backplane0	# VAXBI bus
-cmi0		at backplane0	# 11/750 internal bus.
-uba0		at backplane0	# MicroVAXen only have QBUS.
-vsbus0		at backplane0	# Internal "virtual" VAXstation bus
+# CMI (VAX 11/750)
+#mem*		at cmi? tr?		# Memory subsystems
+#uba*		at cmi? tr?		# Unibus adapters
+#mba*		at cmi? tr?		# Massbus adapters
 
-# Devices connected at VAXBI
-cpu0		at bi? node?	# KA820/KA825 cpu
-mem*		at bi? node?	# Memory subsystems
-#ni*		at bi? node?	# DEBNA/DEBNT ethernet adapter
-kdb*		at bi? node?	# KDB50 MSCP disk ctlr
-mscpbus*	at kdb?
-
-# Devices connected at cmi
-mem*		at cmi? tr?	# Memory subsystems
-uba*		at cmi? tr?	# Unibus adapters
-mba*		at cmi? tr?	# Massbus adapters
-
-# Devices connected at sbi
-mem*		at sbi? tr?	# Memory subsystems
-uba*		at sbi? tr?	# Unibus adapters
-mba*		at sbi? tr?	# Massbus adapters
+# SBI (VAX 11/780, VAX 8600)
+#sbi*		at abus0		# VAX 8600 can have up to 4 SBI's.
 
-# Devices on Massbus adapters
-hp*		at mba? drive?	# RM/RP disk drives
+#mem*		at sbi? tr?		# Memory subsystems
+#uba*		at sbi? tr?		# Unibus adapters
+#mba*		at sbi? tr?		# Massbus adapters
 
-# Disk controllers at Unibus
-uda0		at uba?	csr 0172150	# UDA50/RQDX?
-uda1		at uba?	csr 0160334
-mscpbus*	at uda?
+# Devices on Massbus adapters
+#hp*		at mba? drive?		# RM/RP disk drives
 
-# Tape drivers
+# Devices on Unibus/Qbus adapters
+#uda0		at uba?	csr 0172150	# UDA50/RQDX?
+#uda1		at uba?	csr 0160334
 mtc0		at uba? csr 0174500	# Tape MSCP ctlr
-mscpbus*	at mtc?
+#ts0		at uba? csr 0172520	# TS11/TSV05 tape.
+#qd0		at uba? csr 0177400	# 4- or 8-bitplans color graphics
+#qv0		at uba? csr 0177400	# Monochrome graphics
+#de0		at uba? csr 0174510	# DELUA/DEUNA
+#qe0		at uba? csr 0174440	# DEQNA/DELQA
+#dhu0		at uba? csr 0160440	# DHU-11
+#dz0		at uba? csr 0160100	# DZ-11
+#dl0		at uba? csr 0176500	# DL-11
 
 # MSCP devices
-ra*		at mscpbus? drive?	# MSCP disk
-mt*		at mscpbus? drive?	# MSCP tape
+#mscpbus*	at uda?
+mscpbus*	at mtc?
+#mscpbus*	at kdb?
 
-# Unibus tapes
-#ts0		at uba? csr 0172520	# TS11/TSV05 tape.
+#ra*		at mscpbus? drive?	# MSCP disk
+rx*		at mscpbus? drive?	# MSCP floppy
+mt*		at mscpbus? drive?	# MSCP tape
 
 # VS2000 builtin MFM controller (HDC9224)
-hdc0		at vsbus0		# The strange builtin MFM controller
-hd*		at hdc0 drive?		# The RD disk subsystem on VS2000
+#hdc0		at vsbus0		# The strange builtin MFM controller
 
-# VAXstation builtin SCSI-controller (NCR5380)
-ncr0		at vsbus0		# 1st built-in SCSI interface
-ncr1		at vsbus0		# 2nd built-in SCSI interface
+# SCSI devices
 scsibus*	at ncr?
 
 sd*		at scsibus? target? lun?
 st*		at scsibus? target? lun?
+cd*		at scsibus? target? lun?
+ch*		at scsibus? target? lun?
+ss*		at scsibus? target? lun?
+uk*		at scsibus? target? lun?
+
+# VAXstation graphics support
+#wsdisplay0	at smg0
+#wsdisplay0	at clr0
+#wsdisplay0	at qd0
+#wsdisplay0	at qv0
+#lkc0		at dz0
 
-
-# Ethernet cards
-de0		at uba? csr 0174510	# DELUA/DEUNA
-qe0		at uba? csr 0174440	# DEQNA/DELQA
-le0		at vsbus0		# LANCE
-
-# Terminal lines
-dhu0		at uba? csr 0160440	# DHU-11
-dz0		at uba? csr 0160100	# DZ-11
-dl0		at uba? csr 0176500	# DL-11
-
-pseudo-device   loop	1
-pseudo-device   pty	48
-pseudo-device	bpfilter 8	# Not supported by de or qe yet.
-pseudo-device	sl	2
-pseudo-device	ppp	2
-pseudo-device	tun	2
-pseudo-device	tb	1
-pseudo-device	vnd	4
-pseudo-device	ccd	4
-# for IPv6
-pseudo-device	gif		4
-#pseudo-device	faith		1
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 7b008cffafc..e66b1728bff 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.vax,v 1.12 1998/05/17 10:31:03 niklas Exp $
-#	$NetBSD: Makefile.vax,v 1.32 1997/03/14 23:27:35 mycroft Exp $
+#	$OpenBSD: Makefile.vax,v 1.13 2000/04/27 05:47:15 bjc Exp $
+#	$NetBSD: Makefile.vax,v 1.49 1999/07/26 05:20:49 cgd Exp $
 
-# Makefile for OpenBSD
+# Makefile for OpenBSD/vax
 #
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -22,23 +22,51 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.
 
+
+
+%OBJS
+
+%CFILES
+
+%SFILES
+
+MKDEP?=	mkdep
+
+# check for cross-compilation
 .if ${MACHINE} != "vax"
-CROSSDIR?=	/usr/cross/vax
+CROSSDIR?=  /usr/cross/vax
+
+CBIN=${CROSSDIR}/usr/bin
+MACHINE=vax 
+MACHINE_ARCH=vax 
+AR=${CBIN}/ar 
+AS=${CBIN}/as 
+CC=${CBIN}/cc 
+CPP=${CBIN}/cpp
+HOSTCC=cc 
+LD=${CBIN}/ld 
+NM=${CBIN}/nm 
+RANLIB=${CBIN}/ranlib 
+STRIP=${CBIN}/strip 
+SIZE=${CBIN}/size 
 
-.BEGIN:
-	CBIN=${CROSSDIR}/usr/bin; export CBIN; \
-	MACHINE=vax MACHINE_ARCH=vax AR=$$CBIN/ar AS=$$CBIN/as \
-	CC=$$CBIN/cc HOSTCC=cc LD=$$CBIN/ld NM=$$CBIN/nm \
-	RANLIB=$$CBIN/ranlib STRIP=$$CBIN/strip SIZE=$$CBIN/size ${MAKE} $@
 .else
 
+AR?=	ar
+AS?=	as
 CC?=	cc
-HOSTCC?=${CC}
+CPP?=	cpp
+LORDER?=lorder
 LD?=	ld
-MKDEP?=	mkdep
+NM?=	nm
+RANLIB?=ranlib
 STRIP?=	strip
 SIZE?=	size
-COPTS?= 	-O2
+
+.endif
+
+TSORT?=	tsort -q
+COPTS?= -O0
 
 # source tree is located via $S relative to the compilation directory
 .ifndef S
@@ -46,20 +74,29 @@ S!=	cd ../../../..; pwd
 .endif
 VAX=	$S/arch/vax
 
+HAVE_GCC28!=	${CC} --version | egrep "^(2\.8|egcs)" ; echo 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-D_VAX_INLINE_
-CWARNFLAGS=	-Werror
+CWARNFLAGS?=	-Werror 
+
+.if (${HAVE_GCC28} != "")
+CWARNFLAGS+=	-Wno-main
+.endif
 CFLAGS=		${DEBUG} ${COPTS} ${CWARNFLAGS}
+.if (${HAVE_GCC28} != "")
+CFLAGS+=	-mno-pic
+.endif
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
-LINKFLAGS=	-Z -Ttext 80000000 -e _start
+LINKFLAGS=	-N -Ttext 80000000 -e start
 STRIPFLAGS=	-d
 
-HOSTED_CC=	${HOSTCC}
+HOSTED_CC=	${CC}
 HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
 HOSTED_CFLAGS=	${CFLAGS}
 
 ### find out what to use for libkern
+KERN_AS=	obj
 .include "$S/lib/libkern/Makefile.inc"
 .ifndef PROF
 LIBKERN=	${KERNLIB}
@@ -79,23 +116,18 @@ LIBCOMPAT=      ${COMPATLIB_PROF}
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+NOPROF_C=	${CC} ${CFLAGS} ${CPPFLAGS} -c $<
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 
 HOSTED_C=	${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
 
-%OBJS
-
-%CFILES
-
-%SFILES
-
 # load lines for config "xxx" will be emitted as:
 # xxx: ${SYSTEM_DEP} swapxxx.o
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
 SYSTEM_OBJ=	intvec.o subr.o \
-		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
+		param.o ioconf.o ${OBJS} ${LIBCOMPAT} ${LIBKERN}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
@@ -106,14 +138,20 @@ DEBUG?=
 .if ${DEBUG} == "-g"
 LINKFLAGS+=	-X
 SYSTEM_LD_TAIL+=; \
-		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
+		echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
+		echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
+		${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
 .else
 LINKFLAGS+=	-S
 .endif
 
 %LOAD
 
+assym.h: $S/kern/genassym.sh ${VAX}/vax/genassym.cf
+	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+	    < ${VAX}/vax/genassym.cf > assym.h.tmp && \
+	    mv -f assym.h.tmp assym.h
+
 param.c: $S/conf/param.c
 	rm -f param.c
 	cp $S/conf/param.c .
@@ -128,15 +166,15 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
-
-clean:: cleankernel
+clean::	cleankernel
 cleankernel:
 	rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \
-	    [Ee]rrs linterrs makelinks
+		[Ee]rrs linterrs makelinks assym.h
 
 lint:
-	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
-	    ${CFILES} ${VAX}/vax/swapgeneric.c ioconf.c param.c | \
+	@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
+	    ${VAX}/vax/Locore.c ${CFILES} \
+	    ioconf.c param.c | \
 	    grep -v 'static function .* unused'
 
 tags:
@@ -152,8 +190,9 @@ links:
 
 SRCS=	${VAX}/vax/intvec.s ${VAX}/vax/subr.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
+
 depend:: .depend
-.depend: ${SRCS} param.c
+.depend: ${SRCS} assym.h param.c
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${VAX}/vax/intvec.s ${VAX}/vax/subr.s
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -168,12 +207,15 @@ uipc_proto.o vfs_conf.o: Makefile
 # depend on maxusers
 machdep.o: Makefile
 
-intvec.o: ${VAX}/vax/intvec.s
+# depend on CPU configuration 
+tmscp.o ts.o uba.o uda.o autoconf.o clock.o conf.o emulate.o intvec.o: Makefile
+machdep.o sbi.o subr.o: Makefile
+
+
+intvec.o: ${VAX}/vax/intvec.s assym.h
 	${NORMAL_S}
 
-subr.o: ${VAX}/vax/subr.s
+subr.o: ${VAX}/vax/subr.s assym.h
 	${NORMAL_S}
 
 %RULES
-
-.endif
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index 4e87764ab99..3f7cb8a07b5 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,5 +1,4 @@
-#       $OpenBSD: files.vax,v 1.8 1997/09/20 13:48:59 maja Exp $
-#       $NetBSD: files.vax,v 1.27 1997/03/15 18:11:09 is Exp $
+#       $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
 #
 # new style config file for vax architecture
 #
@@ -9,35 +8,60 @@ maxpartitions 8
 
 maxusers 8 32 64
 
-device	backplane { }
-attach	backplane at root
+device	mainbus { }
+attach	mainbus at root
 
+# Define a bunch of devices, needed in more than one place.
+device	cpu
+device	mem
+device	mba { drive = -1 }
+
+# SBI and related devices
 device	sbi { tr=-1 }
-attach	sbi at backplane
-file	arch/vax/vax/sbi.c		sbi needs-flag
+attach	sbi at mainbus with sbi_mainbus
+file	arch/vax/vax/sbi.c		sbi
 
+attach	mem at sbi with mem_sbi
+file	arch/vax/vax/ka780.c		vax780 | mem_sbi
+file	arch/vax/vax/cfl.c		vax780 | mem_sbi
+
+# Abus and related devices
+device	abus { }
+attach	abus at mainbus
+attach	sbi at abus with sbi_abus
+file	arch/vax/vax/ka860.c		abus
+file	arch/vax/vax/crl.c		abus
+
+# CMI and related devices
 device	cmi { tr=-1 }
-attach	cmi at backplane
+attach	cmi at mainbus
+file	arch/vax/vax/cmi.c		cmi
 
-device	bi { node=-1 }
-attach	bi at backplane
-file	arch/vax/bi/bi.c		bi needs-flag
+attach	mem at cmi with mem_cmi
+file	arch/vax/vax/ka750.c		vax750 | mem_cmi
+file	arch/vax/vax/ctu.c		vax750 | mem_cmi
 
-device	vsbus { }
-attach	vsbus at backplane
+device	vsbus { csr }
+attach	vsbus at mainbus
 file	arch/vax/vsa/vsbus.c		vsbus
 
-device	cpu
-attach	cpu at backplane with cpu_backplane
-attach	cpu at bi with cpu_bi
+# DEC SGEC Second Generation Ethernet Controller
+define  sgec
+file    arch/vax/if/sgec.c           sgec
 
-device	mem
-attach	mem at backplane with mem_backplane
-attach	mem at bi with mem_bi
-attach	mem at sbi with mem_sbi
-attach	mem at cmi with mem_cmi
+device	ibus { }
+attach	ibus at mainbus
+file	arch/vax/vax/ibus.c		ibus
+
+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	le at ibus with le_ibus
+file	arch/vax/if/if_le.c		le_ibus
 
-device	mba { drive = -1 }
 attach	mba at sbi with mba_sbi
 attach	mba at cmi with mba_cmi
 file	arch/vax/mba/mba.c		mba needs-flag
@@ -47,78 +71,67 @@ attach  hp at mba
 file    arch/vax/mba/hp.c		hp needs-flag
 major	{hp = 0}
 
-device	ht
+device	ht: tape
 attach	ht at mba
 file	arch/vax/mba/ht.c		ht needs-flag
 
+# Memory Disk for install floppy
+#file arch/vax/vax/md_root.c		memory_disk_hooks
+#major	{md = 23}
+
 # MSCP device drivers
 include "arch/vax/mscp/files.mscp"
 major	{ra = 9}
-major	{mt = 16}
 
-# KDB50 on BI
-device	kdb: mscp
-attach	kdb at bi
-file	arch/vax/bi/kdb.c		kdb
+# Unibus/Q22 bus definitions
+include "arch/vax/qbus/files.uba"
 
-device	uba { csr }
-attach	uba at backplane with uba_backplane
+attach	uba at ibus with uba_ibus
+file	arch/vax/uba/uba_ibus.c		uba_ibus
 attach	uba at sbi with uba_sbi
+file	arch/vax/uba/uba_sbi.c		uba_sbi
 attach	uba at cmi with uba_cmi
-attach	uba at bi with uba_bi
-file	arch/vax/uba/uba.c		uba
-
-device	mtc: mscp
-attach	mtc at uba
-device	uda: mscp
-attach	uda at uba
-file    arch/vax/uba/uda.c		uda | mtc
+file	arch/vax/uba/uba_cmi.c		uba_cmi
 
-device	de:ifnet, ether
-attach	de at uba
-file	arch/vax/if/if_de.c		de needs-flag
+# BI bus definitions
+include "arch/vax/bi/files.bi"
 
-# DEQNA/DELQA used on Qbus
-device	qe:ifnet, ether
-attach	qe at uba
-file	arch/vax/if/if_qe.c		qe needs-flag
+attach	bi at mainbus with bi_mainbus
+file	arch/vax/bi/bi_mainbus.c	bi_mainbus
 
-# DEBNA/DEBNT Ethernet Adapter
-device	ni:ifnet, ether
-attach	ni at bi
-file	arch/vax/bi/ni.c		ni needs-flag
+# VAX CPUs at BI, do not belong in MI code.
+attach	cpu at bi with cpu_bi
+attach	mem at bi with mem_bi
 
 # TS11 at UBA
-device	ts
+device	ts: tape
 attach	ts at uba
-file	arch/vax/uba/ts.c		ts needs-count
-
-# DHU-11 at UBA
-device	dhu
-attach	dhu at uba
-file	arch/vax/uba/dhu.c		dhu needs-count
+file	arch/vax/uba/ts.c		ts needs-flag
 
-# DZ11 at UBA
-device	dz
-attach	dz at uba
-file	arch/vax/uba/dz.c		dz needs-count
+attach	dz at vsbus with dz_vsbus
+file	arch/vax/vsa/dz_ibus.c		dz_vsbus
 
 # RD-type disks at VS2000's onboard MFM-controller
 device	hdc { drive = -1 }
 attach	hdc at vsbus
-file	arch/vax/vsa/hdc9224.c		hdc needs-flag
+file	arch/vax/vsa/hdc9224.c		hdc | ry | hd needs-flag
 
 device	hd: disk
 attach	hd at hdc
 major	{hd = 19}
 
+device	ry: disk
+attach	ry at hdc
+major	{ry = 24}
+
 #
 # Machine-independent SCSI driver.
 #
+
 include "../../../scsi/files.scsi"
-major	{ sd = 20 }
-major	{ st = 21 }
-major	{ cd = 22 }
+major   { sd = 20 }
+major   { st = 21 }
+major   { cd = 22 }
 
 # builtin NCR5380 SCSI-controller on VAXstation 
 device	ncr: scsi, ncr5380sbc
@@ -126,24 +139,17 @@ attach	ncr at vsbus
 file	arch/vax/vsa/ncr.c		ncr needs-flag
 
 # LANCE ethernet controller on VAXstation
-attach	le at vsbus
-file	arch/vax/if/if_le.c		le needs-flag
+attach	le at vsbus with le_vsbus
+file	arch/vax/vsa/if_le_vsbus.c	le_vsbus
 
-# DC367-B in VAXstation 2000/3100 (DZ-like 4-port serial line controller,
-# controls keyboard, mouse, modem, and printer/console)
-device	dc
-attach	dc at vsbus
-file	arch/vax/vsa/dc.c		dc needs-flag
-file	arch/vax/vsa/lk201.c		dc
+# Monochrome framebuffer on VS3100.
+device	smg: qfont
+attach	smg at vsbus
+file	arch/vax/vsa/smg.c		smg needs-flag
 
-# PM Framebuffer in VAXstation 2000/3100
-device	pm
-attach	pm at vsbus
-file	arch/vax/vsa/pm.c		pm needs-flag
-
-device	dl
-attach	dl at uba
-file	arch/vax/uba/dl.c		dl needs-flag
+device	lkc: qfont
+attach	lkc at dz
+file	arch/vax/vsa/lkc.c		lkc needs-flag
 
 # These devices aren't tested (or even compiled!)
 # They are just included here to make some files happy ;)
@@ -152,193 +158,181 @@ file	arch/vax/uba/dl.c		dl needs-flag
 # Ikonas framebuffer
 device	ik
 attach	ik at uba
-file	arch/vax/uba/ik.c		ik needs-count
+file	arch/vax/uba/ik.c		ik needs-flag
 
 device	vs
 attach	vs at uba
-file	arch/vax/uba/vs.c		vs needs-count
+file	arch/vax/uba/vs.c		vs needs-flag
 
 # RK06/07 on UBA
-device	rk
+device	rk: disk
 attach	rk at uba
-file	arch/vax/uba/rk.c		rk needs-count
+file	arch/vax/uba/rk.c		rk needs-flag
 
 # TM11/TE10 at UBA
-device	te
+device	te: tape
 attach	te at uba
-file	arch/vax/uba/tm.c		te needs-count
+file	arch/vax/uba/tm.c		te needs-flag
 
 # TU78 at MBA
-device	mu
+device	mu: tape
 attach	mu at mba
-file	arch/vax/mba/mt.c		mu needs-count
+file	arch/vax/mba/mt.c		mu needs-flag
 
 # DMF32 on UBA
-device	dmf
+device	dmf # XXX?
 attach	dmf at uba
-file	arch/vax/uba/dmf.c		dmf needs-count
-file	arch/vax/uba/dmz.c		dmf needs-count
+file	arch/vax/uba/dmf.c		dmf needs-flag
+file	arch/vax/uba/dmz.c		dmf needs-flag
 
 # DMZ32 on UBA
-device	dmz
+device	dmz # XXX?
 attach	dmz at uba
-file	arch/vax/uba/dmx.c		dmz needs-count
+file	arch/vax/uba/dmx.c		dmz needs-flag
 
 # DN-11 on UBA
-device	dn
+device	dn # XXX?
 attach	dn at uba
-file	arch/vax/uba/dn.c		dn needs-count
+file	arch/vax/uba/dn.c		dn needs-flag
 
 # IDC (RB730) on UBA (VAX 11/730)
 device	idc { drive=-1 }
 attach	idc at uba
-device	rb
+device	rb: disk
 attach	rb at idc
-file	arch/vax/uba/idc.c		rb needs-count
+file	arch/vax/uba/idc.c		rb needs-flag
 
 # LP-11 at UBA
 device	lp
 attach	lp at uba
-file	arch/vax/uba/lp.c		lp needs-count
+file	arch/vax/uba/lp.c		lp needs-flag
 
 # ???? at UBA
 device	lpa
 attach	lpa at uba
-file	arch/vax/uba/lpa.c		lpa needs-count
+file	arch/vax/uba/lpa.c		lpa needs-flag
 
 # PS2 at UBA
 device	ps
 attach	ps at uba
-file	arch/vax/uba/ps.c		ps needs-count
+file	arch/vax/uba/ps.c		ps needs-flag
 
 # RL02/RL11 at UBA
 device	hl { drive=-1 }
 attach	hl at uba
-device	rl
+device	rl: disk
 attach	rl at hl
-file	arch/vax/uba/rl.c		rl needs-count
-
-# RX211/RX02 at UBA
-device	fx { drive=-1 }
-attach	fx at uba
-device	rx
-attach	rx at fx
-file	arch/vax/uba/rx.c		rx needs-count
+file	arch/vax/uba/rl.c		rl needs-flag
 
 # SC-21/SC-31 at UBA
 device	sc { drive=-1 }
 attach	sc at uba
-device	up
+device	up: disk
 attach	up at sc
-file	arch/vax/uba/up.c		up needs-count
+file	arch/vax/uba/up.c		up needs-flag
 
 # TU45 at UBA
 device	ut { drive=-1}
 attach	ut at uba
-device	tj
+device	tj: tape
 attach	tj at ut
-file	arch/vax/uba/ut.c		tj needs-count
+file	arch/vax/uba/ut.c		tj needs-flag
 
 # TU58/DECtape II
-device	uu
+device	uu: tape
 attach	uu at uba
-file	arch/vax/uba/uu.c		uu needs-count
+file	arch/vax/uba/uu.c		uu needs-flag
 
 # Benson-Varian plotter at UBA
 device	va { drive=-1}
 attach	va at uba
 device	vz
 attach	vz at va
-file	arch/vax/uba/va.c		va needs-count
+file	arch/vax/uba/va.c		va needs-flag
 
 # Versatec plotter at UBA
 device	vp
 attach	vp at uba
-file	arch/vax/uba/vp.c		vp needs-count
+file	arch/vax/uba/vp.c		vp needs-flag
 
 # QVSS at UBA
 device	qv
 attach	qv at uba
-file	arch/vax/uba/qv.c		qv needs-count
-file	arch/vax/uba/qfont.c		qv needs-count
-
-# QDSS at UBA
-device	qd
-attach	qd at uba
-file	arch/vax/uba/qd.c		qd needs-count
+file	arch/vax/uba/qv.c		qv needs-flag
 
 # Interlan NP100 at UBA
-device	np
+device	np: ifnet
 attach	np at uba
-file	arch/vax/if/if_ix.c		np needs-count
-file	arch/vax/uba/np.c		np needs-count
+file	arch/vax/if/if_ix.c		np needs-flag
+file	arch/vax/uba/np.c		np needs-flag
 
 # ACC LH/DH IMP on UBA
-device	acc
+device	acc: ifnet
 attach	acc at uba
-file	arch/vax/if/if_acc.c		acc needs-count
+file	arch/vax/if/if_acc.c		acc needs-flag
 
 # DR11C at UBA
-device	ct
+device	ct # XXX
 attach	ct at uba
-file	arch/vax/uba/ct.c		ct needs-count
+file	arch/vax/uba/ct.c		ct needs-flag
 
 # A/D-converter on UBA
 device	ad
 attach	ad at uba
-file	arch/vax/uba/ad.c		ad needs-count
+file	arch/vax/uba/ad.c		ad needs-flag
 
 # DH-11/DM-11 on UBA
-device	dh
+device	dh # XXX?
 attach	dh at uba
-file	arch/vax/uba/dh.c		dh needs-count
+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
+file	dev/clock_subr.c	vax8200|vax410|vax43|vax630|vax670|vax46|vax48|vax49
 file	arch/vax/vax/locore.c
 file	arch/vax/vax/mem.c
 file	arch/vax/vax/clock.c
-file	arch/vax/vax/gencons.c	vax8600|vax8200|vax780|vax750|vax630|vax650
-file	arch/vax/vax/dzcons.c		vax410 | vax43
+file	arch/vax/vax/gencons.c	vax8600|vax8200|vax780|vax750|vax630|vax650|vax670
 file	arch/vax/vax/pmap.c
 file	arch/vax/vax/machdep.c
-file	arch/vax/vax/ka750.c		vax750
-file	arch/vax/vax/ctu.c		vax750
-file	arch/vax/vax/ka780.c		vax780
-file	arch/vax/vax/cfl.c		vax780
 file	arch/vax/vax/ka820.c		vax8200
-file	arch/vax/vax/ka860.c		vax8600
-file	arch/vax/vax/crl.c		vax8600
-file	arch/vax/vax/uvax.c		vax630 | vax410 | vax43
+file	arch/vax/vax/crx.c		vax8200
 file	arch/vax/vax/ka630.c		vax630
 file	arch/vax/vax/ka410.c		vax410
 file	arch/vax/vax/ka43.c		vax43
-file	arch/vax/vax/emulate.s		vax630|vax650|vax410|vax420
+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/emulate.s		vax630|vax650|vax410
 file	arch/vax/vax/ka650.c		vax650
+file	arch/vax/vax/ka670.c		vax670
+file	arch/vax/vax/scb.c
 file	arch/vax/vax/conf.c
 file	arch/vax/vax/urem.s
 file	arch/vax/vax/udiv.s
-file	arch/vax/vax/rootfil.c
 file	arch/vax/vax/trap.c
-
+file	arch/vax/vax/bus_dma.c
+file	arch/vax/vax/bus_mem.c
+file	arch/vax/vax/sgmap.c
 file	arch/vax/vax/vm_machdep.c
+file	arch/vax/vax/findcpu.c
+file    arch/vax/vax/random.s       
+file	arch/vax/vax/rootfil.c
 file	arch/vax/vax/autoconf.c
-file	arch/vax/vax/random.s		inet
 file	arch/vax/vax/in_cksum.c		inet
 file	arch/vax/vax/ns_cksum.c		ns
 file	arch/vax/vax/disksubr.c		disk | tape
-file	arch/vax/if/if_uba.c		de | qe
 file	arch/vax/vax/db_machdep.c	ddb
 file	arch/vax/vax/db_disasm.c	ddb
+file	arch/vax/uba/uba_dma.c		uba
 
-include "../../../compat/ultrix/files.ultrix"
+include "compat/ultrix/files.ultrix"
+#include "compat/vax1k/files.vax1k"
 
 # Dom h{ra f}r vara kvar s} l{nge f}r vi se vilka vi beh|ver...
 #arch/vax/vax/dkbad.c         standard
 #arch/vax/vax/ka730.c         standard
-#arch/vax/vax/rx50.c          standard
 #arch/vax/vax/iidr.o          optional ii
 #arch/vax/vax/iidrsys.o       optional ii
 #arch/vax/vax/iidr_glob.o     optional ii
@@ -356,3 +350,13 @@ include "../../../compat/ultrix/files.ultrix"
 #arch/vax/if/if_pcl.c         optional pcl device-driver
 #arch/vax/if/if_vv.c          optional vv device-driver
 #arch/vax/if/raw_hy.c         optional hy device-driver
+
+define  wsdisplaydev { }
+define  wsemuldisplaydev {[console = -1]}
+define  wskbddev {[console = -1], [mux = -1]}
+define  wsmousedev {[mux = -1]}
+
+# wscons files.
+include "dev/wscons/files.wscons"
+
+