sync to 0616, retaining local diffs

11 files changed, 289 insertions, 595 deletions

diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA
index 73989072623..7bbfb44cfae 100644
--- a/sys/arch/alpha/conf/ALPHA
+++ b/sys/arch/alpha/conf/ALPHA
@@ -1,4 +1,4 @@
-#	$NetBSD: ALPHA,v 1.8 1995/12/20 00:14:10 cgd Exp $
+#	$NetBSD: ALPHA,v 1.14.4.4 1996/06/13 19:21:59 cgd Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
@@ -6,9 +6,6 @@ include	"std.alpha"
 
 maxusers 8
 
-# does not really do anything anymore, but this replaces "ident GENERIC"
-options		GENERIC
-
 # CPU Support
 options		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
 options		DEC_3000_300	# Pelican etc:	3000/300*
@@ -41,8 +38,9 @@ options		NULLFS		# Null file system layer
 options		KERNFS		# Kernel variable file system (/kern)
 options		FDESC		# File descriptor file system (/dev/fd)
 options		PORTAL		# Portal file system
-options		UMAP		# User-mapping file system layer
+options		UMAPFS		# User-mapping file system layer
 options		PROCFS		# Process file system (/proc)
+options		UNION		# union file system
 
 # Networking options
 options		INET		# Internet protocol suite
@@ -60,6 +58,7 @@ options		COMPAT_43
 # Binary compatibility with previous versions of NetBSD.
 #options	COMPAT_09
 options		COMPAT_10
+options		COMPAT_11
 
 # OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
 #options	COMPAT_OSF1
@@ -98,14 +97,17 @@ tc*	at	tcasic?
 
 # TurboChannel devices
 ioasic0	at	tc? slot ? offset ?
-clock0	at	ioasic? offset ?
-le0	at	ioasic? offset ?
+mcclock0 at	ioasic? offset ?
+le*	at	ioasic? offset ?
 scc0	at	ioasic? offset ?
 scc1	at	ioasic? offset ?
 tcds0	at	tc? slot ? offset ?
 esp0	at	tcds? slot ?
 esp1	at	tcds? slot ?
-#sfb*	at	tc? slot ? offset ?
+cfb*	at	tc? slot ? offset ?
+sfb*	at	tc? slot ? offset ?
+le*	at	tc? slot ? offset ?
+fta*	at	tc? slot ? offset ?		# DEC DEFTA FDDI cards
 
 # PCI host bus adapter support
 apecs*	at	mainbus?
@@ -120,12 +122,14 @@ pci*	at	ppb?
 
 # PCI devices
 de*	at	pci?
+le*	at	pci?
 ncr*	at	pci?
 pceb*	at	pci?
 pcivga*	at	pci?
 ppb*	at	pci?
 sio*	at	pci?
 tga*	at	pci?
+fpa*	at	pci? dev ? function ?		# DEC DEFPA FDDI cards
 
 # ISA/EISA bus support
 isa*	at	pceb?
@@ -133,14 +137,17 @@ eisa*	at	pceb?
 isa*	at	sio?
 
 # ISA devices
-clock0	at	isa? port 0x70
+mcclock0 at	isa? port 0x70
 pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
-#pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
+pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
 com0	at	isa? port 0x3f8 irq 4		# standard serial ports
 com1	at	isa? port 0x2f8 irq 3
 lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
 #wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
 
+# EISA devices
+fea*	at	eisa? slot ?			# DEC DEFEA FDDI cards
+
 # SCSI bus support
 scsibus* at	esp?
 scsibus* at	ncr?
@@ -150,10 +157,17 @@ sd*	at	scsibus? target ? lun ?
 st*	at	scsibus? target ? lun ?
 cd*	at	scsibus? target ? lun ?
 
-pseudo-device	bpfilter
+# Workstation Console attachments
+wscons*	at	cfb?
+wscons*	at	pcivga?
+wscons*	at	sfb?
+wscons*	at	tga?
+
+pseudo-device	bpfilter	16
 pseudo-device	loop
-pseudo-device	ppp
-pseudo-device	pty
-pseudo-device	sl
-pseudo-device	tun
-pseudo-device	vnd
+pseudo-device	ppp		4
+pseudo-device	pty		64
+pseudo-device	sl		4
+pseudo-device	strip		4
+pseudo-device	tun		4
+pseudo-device	vnd		4
diff --git a/sys/arch/alpha/conf/BUNNY b/sys/arch/alpha/conf/BUNNY
index aed65576e7e..61a913773a8 100644
--- a/sys/arch/alpha/conf/BUNNY
+++ b/sys/arch/alpha/conf/BUNNY
@@ -1,13 +1,9 @@
-#	$NetBSD: BUNNY,v 1.3 1995/11/23 02:34:55 cgd Exp $
+#	$NetBSD: BUNNY,v 1.5.4.1 1996/06/13 19:22:03 cgd Exp $
 #
 # Kernel for bunnahabhain.pdl.cs.cmu.edu.
 #
-# This kernel contains support for NO frame buffer devices; bunny
-# is rack-mounted, and has no video boards.  THIS KERNEL CANNOT BE
-# USED ON MACHINES WITH FRAME BUFFERS.
-#
-# It also has no support for devices which aren't actually used
-# (sound, parallel port, keyboard, mouse, SCSI tape or CD-ROM, etc.).
+# Trimmed down kernel for AlphaStation [24]xx systems, with lots
+# of buffer cache.
 
 include	"std.alpha"
 
@@ -42,7 +38,9 @@ options		INET		# Internet protocol suite
 options		COMPAT_43
 
 # Binary compatibility with previous versions of NetBSD.
+#options	COMPAT_09
 options		COMPAT_10
+options		COMPAT_11
 
 # Loadable Kernel Modules
 options		LKM
@@ -53,7 +51,7 @@ options		LKM
 # Misc. options
 options		PCIVERBOSE	# recognize "unknown" PCI devices
 
-config		netbsd		root on sd0 swap on sd0
+config		netbsd	swap generic
 
 mainbus0 at	root
 cpu*	at	mainbus0
@@ -66,23 +64,36 @@ pci*	at	apecs?
 
 # PCI devices
 de*	at	pci?
-ncr0	at	pci?
+ncr*	at	pci?
+pcivga*	at	pci?
 sio*	at	pci?
+tga*	at	pci?
 
 # ISA/EISA bus support
 isa*	at	sio?
 
 # ISA devices
-clock0	at	isa? port 0x70
+mcclock0 at	isa? port 0x70
+pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
+pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
 com0	at	isa? port 0x3f8 irq 4		# standard serial ports
 com1	at	isa? port 0x2f8 irq 3
+lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
+#wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
 
 # SCSI bus support
 scsibus* at	ncr?
 
 # SCSI devices
 sd*	at	scsibus? target ? lun ?
+st*	at	scsibus? target ? lun ?
+cd*	at	scsibus? target ? lun ?
+
+# Workstation Console attachments
+wscons*	at	pcivga?
+wscons*	at	tga?
 
-pseudo-device	bpfilter
+pseudo-device	bpfilter	16
 pseudo-device	loop
-pseudo-device	pty
+pseudo-device	pty		64
+pseudo-device	vnd		4
diff --git a/sys/arch/alpha/conf/DILLY b/sys/arch/alpha/conf/DILLY
deleted file mode 100644
index b8236ee54ba..00000000000
--- a/sys/arch/alpha/conf/DILLY
+++ /dev/null
@@ -1,96 +0,0 @@
-#	$NetBSD: DILLY,v 1.1 1995/11/23 02:34:58 cgd Exp $
-#
-# Kernel for dilrod.nas.nasa.gov, and AlphaStation 600.
-
-include	"std.alpha"
-
-maxusers 16
-
-# bump up the number of buffers, for quicker compiles
-options		BUFPAGES=2048	# 16M of buffer cache
-
-# CPU Support
-options		DEC_KN20AA	# KN20AA:	AlphaStation 600
-
-# needs to be set per system
-options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
-options		DST=1			# Daylight savings rules (for param.c)
-
-# Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
-options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
-options		KTRACE			# System call tracing support
-
-# File system options
-options		FIFO		# POSIX fifo support (in all file systems)
-options		FFS		# Fast file system
-options		MFS		# Memory-based file system
-options		NFSCLIENT	# Sun NFS-compatible file system client
-
-# Networking options
-options		INET		# Internet protocol suite
-
-# 4.3BSD compatibility.  Should be optional, but necessary for now.
-options		COMPAT_43
-
-# Binary compatibility with previous versions of NetBSD.
-options		COMPAT_10
-
-# Loadable Kernel Modules
-options		LKM
-
-# Disable kernel security.
-#options	INSECURE
-
-# Misc. options
-options		PCIVERBOSE	# recognize "unknown" PCI devices
-
-config		netbsd		root on sd0 swap on sd0
-
-mainbus0 at	root
-cpu*	at	mainbus0
-
-# PCI host bus adapter support
-cia*	at	mainbus?
-
-# PCI bus support
-pci0	at	cia?
-pci*	at	ppb?
-
-# PCI devices
-de*	at	pci?
-ncr0	at	pci0 dev 9
-ncr*	at	pci?
-pceb*	at	pci?
-pcivga*	at	pci?
-ppb*	at	pci?
-tga*	at	pci?
-
-# ISA and EISA bus support
-isa*	at	pceb?
-eisa*	at	pceb?
-
-# ISA devices
-clock0	at	isa? port 0x70
-pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
-#pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
-com0	at	isa? port 0x3f8 irq 4		# standard serial ports
-com1	at	isa? port 0x2f8 irq 3
-lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
-#wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
-
-# SCSI bus support
-scsibus0 at	ncr0
-scsibus* at	ncr?
-
-# SCSI devices
-sd0	at	scsibus0 target 1 lun 0
-sd*	at	scsibus? target ? lun ?
-st*	at	scsibus? target ? lun ?
-cd*	at	scsibus? target ? lun ?
-
-pseudo-device	bpfilter
-pseudo-device	loop
-pseudo-device	pty
-pseudo-device	sl
-pseudo-device	vnd
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index cd7717859b8..efd66410efd 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.10 1995/12/20 00:14:14 cgd Exp $
+#	$NetBSD: GENERIC,v 1.15.4.3 1996/06/13 19:22:07 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 
@@ -6,9 +6,6 @@ include	"std.alpha"
 
 maxusers 8
 
-# does not really do anything anymore, but this replaces "ident GENERIC"
-options		GENERIC
-
 # CPU Support
 options		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
 options		DEC_3000_300	# Pelican etc:	3000/300*
@@ -40,7 +37,9 @@ options		INET		# Internet protocol suite
 options		COMPAT_43
 
 # Binary compatibility with previous versions of NetBSD.
+#options	COMPAT_09
 options		COMPAT_10
+options		COMPAT_11
 
 # OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
 #options	COMPAT_OSF1
@@ -54,7 +53,9 @@ options		LKM
 # Misc. options
 options		PCIVERBOSE	# recognize "unknown" PCI devices
 
-config		netbsd		swap generic
+config		netbsd	swap generic
+#config		netbsd	root on sd0 swap on sd0
+#config		netbsd	root nfs swap nfs
 
 mainbus0 at	root
 cpu*	at	mainbus0
@@ -67,14 +68,17 @@ tc*	at	tcasic?
 
 # TurboChannel devices
 ioasic0	at	tc? slot ? offset ?
-clock0	at	ioasic? offset ?
-le0	at	ioasic? offset ?
+mcclock0 at	ioasic? offset ?
+le*	at	ioasic? offset ?
 scc0	at	ioasic? offset ?
 scc1	at	ioasic? offset ?
 tcds0	at	tc? slot ? offset ?
 esp0	at	tcds? slot ?
 esp1	at	tcds? slot ?
-#sfb*	at	tc? slot ? offset ?
+cfb*	at	tc? slot ? offset ?
+sfb*	at	tc? slot ? offset ?
+le*	at	tc? slot ? offset ?
+fta*	at	tc? slot ? offset ?		# DEC DEFTA FDDI cards
 
 # PCI host bus adapter support
 apecs*	at	mainbus?
@@ -89,12 +93,14 @@ pci*	at	ppb?
 
 # PCI devices
 de*	at	pci?
+le*	at	pci?
 ncr*	at	pci?
 pceb*	at	pci?
 pcivga*	at	pci?
 ppb*	at	pci?
 sio*	at	pci?
 tga*	at	pci?
+fpa*	at	pci? dev ? function ?		# DEC DEFPA FDDI cards
 
 # ISA/EISA bus support
 isa*	at	pceb?
@@ -102,14 +108,17 @@ eisa*	at	pceb?
 isa*	at	sio?
 
 # ISA devices
-clock0	at	isa? port 0x70
+mcclock0 at	isa? port 0x70
 pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
-#pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
+pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
 com0	at	isa? port 0x3f8 irq 4		# standard serial ports
 com1	at	isa? port 0x2f8 irq 3
 lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
 #wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
 
+# EISA devices
+fea*	at	eisa? slot ?			# DEC DEFEA FDDI cards
+
 # SCSI bus support
 scsibus* at	esp?
 scsibus* at	ncr?
@@ -118,12 +127,15 @@ 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 ?
 
-pseudo-device	bpfilter
+# Workstation Console attachments
+wscons*	at	cfb?
+wscons*	at	pcivga?
+wscons*	at	sfb?
+wscons*	at	tga?
+
+pseudo-device	bpfilter	16
 pseudo-device	loop
-pseudo-device	pty
-pseudo-device	sl
-pseudo-device	vnd
+pseudo-device	pty		64
+pseudo-device	sl		4
+pseudo-device	vnd		4
diff --git a/sys/arch/alpha/conf/GENERIC_NFS b/sys/arch/alpha/conf/GENERIC_NFS
deleted file mode 100644
index cb7f540af64..00000000000
--- a/sys/arch/alpha/conf/GENERIC_NFS
+++ /dev/null
@@ -1,123 +0,0 @@
-#	$NetBSD: GENERIC_NFS,v 1.4 1995/12/20 00:14:16 cgd Exp $
-#
-# Generic Alpha kernel.  Enough to get booted, etc., but not much more.
-
-include	"std.alpha"
-
-maxusers 8
-
-# CPU Support
-options		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
-options		DEC_3000_300	# Pelican etc:	3000/300*
-options		DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
-options		DEC_KN20AA	# KN20AA:	AlphaStation 600
-options		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
-#options	DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
-
-# needs to be set per system
-options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
-options		DST=1			# Daylight savings rules (for param.c)
-
-# Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
-options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
-options		KTRACE			# System call tracing support
-
-# File system options
-options		FIFO		# POSIX fifo support (in all file systems)
-options		FFS		# Fast file system
-options		MFS		# Memory-based file system
-options		NFSSERVER	# Sun NFS-compatible file system server
-options		NFSCLIENT	# Sun NFS-compatible file system client
-
-# Networking options
-options		INET		# Internet protocol suite
-
-# 4.3BSD compatibility.  Should be optional, but necessary for now.
-options		COMPAT_43
-
-# Binary compatibility with previous versions of NetBSD.
-options		COMPAT_10
-
-# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
-#options	COMPAT_OSF1
-
-# Loadable Kernel Modules
-options		LKM
-
-# Disable kernel security.
-#options	INSECURE
-
-# Misc. options
-options		PCIVERBOSE	# recognize "unknown" PCI devices
-
-config		netbsd_nfs	root on nfs swap on nfs
-
-mainbus0 at	root
-cpu*	at	mainbus0
-
-# TurboChannel host bus adapter support
-tcasic*	at	mainbus0
-
-# TurboChannel bus support
-tc*	at	tcasic?
-
-# TurboChannel devices
-ioasic0	at	tc? slot ? offset ?
-clock0	at	ioasic? offset ?
-le0	at	ioasic? offset ?
-scc0	at	ioasic? offset ?
-scc1	at	ioasic? offset ?
-tcds0	at	tc? slot ? offset ?
-esp0	at	tcds? slot ?
-esp1	at	tcds? slot ?
-#sfb*	at	tc? slot ? offset ?
-
-# PCI host bus adapter support
-apecs*	at	mainbus?
-cia*	at	mainbus?
-lca*	at	mainbus?
-
-# PCI bus support
-pci*	at	apecs?
-pci*	at	cia?
-pci*	at	lca?
-pci*	at	ppb?
-
-# PCI devices
-de*	at	pci?
-ncr*	at	pci?
-pceb*	at	pci?
-pcivga*	at	pci?
-ppb*	at	pci?
-sio*	at	pci?
-tga*	at	pci?
-
-# ISA/EISA bus support
-isa*	at	pceb?
-eisa*	at	pceb?
-isa*	at	sio?
-
-# ISA devices
-clock0	at	isa? port 0x70
-pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
-#pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
-com0	at	isa? port 0x3f8 irq 4		# standard serial ports
-com1	at	isa? port 0x2f8 irq 3
-lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
-#wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
-
-# SCSI bus support
-scsibus* at	esp?
-scsibus* at	ncr?
-
-# SCSI devices
-sd*	at	scsibus? target ? lun ?
-st*	at	scsibus? target ? lun ?
-cd*	at	scsibus? target ? lun ?
-
-pseudo-device	bpfilter
-pseudo-device	loop
-pseudo-device	pty
-pseudo-device	sl
-pseudo-device	vnd
diff --git a/sys/arch/alpha/conf/JURA b/sys/arch/alpha/conf/JURA
index 9de2fa3bf2d..b1b6db317b3 100644
--- a/sys/arch/alpha/conf/JURA
+++ b/sys/arch/alpha/conf/JURA
@@ -1,6 +1,8 @@
-#	$NetBSD: JURA,v 1.4 1995/11/23 02:35:09 cgd Exp $
+#	$NetBSD: JURA,v 1.6.4.1 1996/06/13 19:22:10 cgd Exp $
 #
 # Kernel for jura.pdl.cs.cmu.edu.
+#
+# THIS KERNEL DOES NOT CURRENTLY WORK, OR EVEN CONFIGURE!
 
 include	"std.alpha"
 
@@ -33,7 +35,9 @@ options		INET		# Internet protocol suite
 options		COMPAT_43
 
 # Binary compatibility with previous versions of NetBSD.
+#options	COMPAT_09
 options		COMPAT_10
+options		COMPAT_11
 
 # Loadable Kernel Modules
 options		LKM
@@ -47,9 +51,9 @@ ibus*	at	mainbus0			# "internal bus"
 jcombo* at	ibus?				# the VLSI combo chip
 isa*	at	jcombo?
 
-clock0  at      isa? port 0x70
+mcclock0 at      isa? port 0x70
 pckbd0  at      isa? port 0x60 irq 1            # PC-ish ISA keyboard
-#pms0   at      isa? port 0x60 irq 12           # PS/2 auxiliary
+pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
 com0    at      isa? port 0x3f8 irq 4           # standard serial ports
 com1    at      isa? port 0x2f8 irq 3
 lpt0    at      isa? port 0x3bc irq 7           # standard parallel port
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index b09846200a3..51acb060228 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,15 +1,15 @@
-#	$NetBSD: Makefile.alpha,v 1.8 1995/11/23 02:35:16 cgd Exp $
-#
+#	$NetBSD: Makefile.alpha,v 1.16 1996/05/19 21:16:51 cgd Exp $
+
 # Makefile for NetBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
-#	/sys/conf/``machineid''
+#	/sys/arch/alpha/conf/``machineid''
 # after which you should do
-#	 config machineid
+#	config machineid
 # Machine generic makefile changes should be made in
-#	/sys/conf/Makefile.``machinetype''
+#	/sys/arch/alpha/conf/Makefile.alpha
 # after which config should be rerun for all machines of that type.
 #
 # N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
@@ -22,21 +22,21 @@
 # PROF is set to -pg if profiling.
 
 AS?=	as
-AWK?=	awk
 CC?=	cc
 CPP?=	cpp
 LD?=	ld
+STRIP?=	strip -g -X -x
 TOUCH?=	touch -f -c
 
 # source tree is located via $S relative to the compilation directory
 S=	../../../..
 ALPHA=	../..
 
-INCLUDES= -I. -I$S/arch -I$S -I$S/sys
-COPTS=	${INCLUDES} ${IDENT} -D_KERNEL
-CFLAGS=	-Werror -fno-builtin -mno-fp-regs ${DEBUG} ${COPTS} -Dalpha
-#CFLAGS+=-Wmissing-prototypes -Wmissing-declarations
-AFLAGS=	${COPTS}
+INCLUDES=	-I. -I$S/arch -I$S
+CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dalpha
+CFLAGS=		${DEBUG} -O2 -Werror -mno-fp-regs
+AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
+LINKFLAGS=	-N -Ttext fffffc0000230000 -e __start -G 4
 
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
@@ -59,103 +59,115 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 # capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
 # is marked as config-dependent.
 
-NORMAL_C=	${CC} -c ${CFLAGS} ${PROF} $<
-NORMAL_C_C=	${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
-NORMAL_S=	rm -f $*.c; ln -s $< $*.c; \
-		${CC} ${AFLAGS} -I${ALPHA}/alpha -E $*.c > $*.i; \
-		${AS} -o $@ $*.i; rm -f $*.c $*.i
-NORMAL_S_C=	rm -f $*.c; ln -s $< $*.c; \
-		${CC} ${AFLAGS} ${PARAM} -I${ALPHA}/alpha -E $*.c > $*.i; \
-		${AS} -o $@ $*.i; rm -f $*.c $*.i
+NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
+
+DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
+
+NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
+NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -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}
-DEBUG?=
-.if ${DEBUG} == "-g"
-LDX=-X
-.else
-LDX=-x
-.endif
-LDFLAGS= ${LDX} -G 4 -N -e __start -Ttext fffffc0000230000
-SYSTEM_OBJ=	locore.o ${OBJS} param.o ioconf.o ${LIBKERN} \
-		${LIBCOMPAT}
+SYSTEM_OBJ=	locore.o \
+		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD=	@echo loading $@; rm -f $@
-SYSTEM_LD=	-@echo ${LD} ${LDFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o ${XXX}; \
-		${LD} ${LDFLAGS} -o $@ ${SYSTEM_OBJ} vers.o ${XXX}
+SYSTEM_LD_HEAD=	@rm -f $@
+SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
+		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
 SYSTEM_LD_TAIL=	@size $@; chmod 755 $@
+
+DEBUG?=
 .if ${DEBUG} == "-g"
-.if 0
-SYSTEM_LD_TAIL+=; echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo strip -d $@; strip -d $@
+LINKFLAGS+=	-X
+SYSTEM_LD_TAIL+=; \
+		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
+		echo ${STRIP} $@; ${STRIP} $@
 .else
-SYSTEM_LD_TAIL+=; echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo strip -g -X -x $@; strip -g -X -x $@
-.endif
+LINKFLAGS+=	-x
 .endif
 
 %LOAD
 
-newvers:
-	sh $S/conf/newvers.sh
-	${CC} ${CFLAGS} -c vers.c
+assym.h: genassym
+	./genassym >assym.h
 
-clean::
-	rm -f eddep *netbsd netbsd.gdb tags tags1 *.[io] \
-		[a-z]*.s Errs errs linterrs makelinks genassym
+genassym: genassym.o
+	${CC} -o $@ genassym.o
+
+genassym.o: ${ALPHA}/alpha/genassym.c
+	${NORMAL_C_C}
+
+param.c: $S/conf/param.c
+	rm -f param.c
+	cp $S/conf/param.c .
 
+param.o: param.c Makefile
+	${NORMAL_C_C}
 
-locore.o: ${ALPHA}/alpha/locore.s ${ALPHA}/alpha/pal.s \
-	  ${ALPHA}/alpha/prom_disp.s ${ALPHA}/include/intrcnt.h assym.s
-	${NORMAL_S_C}
+ioconf.o: ioconf.c
+	${NORMAL_C}
 
-# depend on maxusers
-assym.s: Makefile
+newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+	sh $S/conf/newvers.sh
+	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
-./assym.s: assym.s
-assym.s: genassym
-	./genassym >assym.s
 
-genassym: genassym.o
-	${CC} -o $@ genassym.o
+clean::
+	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
+	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h
 
-genassym.o: ${ALPHA}/alpha/genassym.c
-	${CC} -c ${CFLAGS} ${PARAM} $<
+lint:
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+	    ${ALPHA}/alpha/Locore.c ${CFILES} ${ALPHA}/alpha/swapgeneric.c \
+	    ioconf.c param.c | \
+	    grep -v 'static function .* unused'
 
-SRCS= ${CFILES} ${ALPHA}/alpha/genassym.c ioconf.c param.c
-depend: .depend
-.depend: ${SRCS} assym.s
-	mkdep ${COPTS} ${SRCS}
-	mkdep -a -p ${COPTS} ${ALPHA}/alpha/genassym.c
+tags:
+	@echo "see $S/kern/Makefile for tags"
 
 links:
 	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
-	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
+	  sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
-tags: depend
-	sh $S/conf/systags.sh
-	rm -f tags1
-	sed -e 's,	../,	,' tags > tags1
+SRCS=	${ALPHA}/alpha/locore.s \
+	param.c ioconf.c ${CFILES} ${SFILES}
+depend:: .depend
+.depend: ${SRCS} assym.h param.c
+	mkdep ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
+	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ALPHA}/alpha/genassym.c
 
-ioconf.o: ioconf.c
-	${CC} -c ${CFLAGS} ioconf.c
 
-param.c: $S/conf/param.c
-	rm -f param.c
-	cp $S/conf/param.c .
+# depend on root or device configuration
+autoconf.o conf.o: Makefile
+ 
+# depend on network or filesystem configuration 
+uipc_proto.o vfs_conf.o: Makefile 
 
-param.o: param.c Makefile
-	${CC} -c ${CFLAGS} ${PARAM} param.c
+# depend on maxusers
+genassym.o machdep.o: Makefile
+
+# depend on CPU configuration 
+clock.o machdep.o apecs.o cia.o lca.o ioasic.o scc.o icasic.o: Makefile
+
+
+locore.o: ${ALPHA}/alpha/locore.s assym.h
+	${NORMAL_S}
 
 %RULES
diff --git a/sys/arch/alpha/conf/NONAME b/sys/arch/alpha/conf/NONAME
deleted file mode 100644
index 9bbe12ec924..00000000000
--- a/sys/arch/alpha/conf/NONAME
+++ /dev/null
@@ -1,89 +0,0 @@
-#	$NetBSD: NONAME,v 1.1 1995/11/23 02:35:20 cgd Exp $
-#
-# Should work on AXPpci33's (and maybe other AXPpci machines).
-
-include	"std.alpha"
-
-maxusers 8
-
-# CPU Support
-options		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
-
-# needs to be set per system
-options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
-options		DST=1			# Daylight savings rules (for param.c)
-
-# Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
-options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
-options		KTRACE			# System call tracing support
-
-# File system options
-options		FIFO		# POSIX fifo support (in all file systems)
-options		FFS		# Fast file system
-options		MFS		# Memory-based file system
-options		NFSCLIENT	# Sun NFS-compatible file system client
-
-# Networking options
-options		INET		# Internet protocol suite
-
-# 4.3BSD compatibility.  Should be optional, but necessary for now.
-options		COMPAT_43
-
-# Binary compatibility with previous versions of NetBSD.
-options		COMPAT_10
-
-# Loadable Kernel Modules
-options		LKM
-
-# Disable kernel security.
-#options	INSECURE
-
-# Misc. options
-options		PCIVERBOSE	# recognize "unknown" PCI devices
-
-config		netbsd		root on sd0 swap on sd0
-
-mainbus0 at	root
-cpu*	at	mainbus0
-
-# PCI host bus adapter support
-lca*	at	mainbus?
-
-# PCI bus support
-pci*	at	lca?
-pci*	at	ppb?
-
-# PCI devices
-de*	at	pci?
-ncr*	at	pci?
-pcivga*	at	pci?
-ppb*	at	pci?
-sio*	at	pci?
-tga*	at	pci?
-
-# ISA/EISA bus support
-isa*	at	sio?
-
-# ISA devices
-clock0	at	isa? port 0x70
-pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
-#pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
-com0	at	isa? port 0x3f8 irq 4		# standard serial ports
-com1	at	isa? port 0x2f8 irq 3
-lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
-#wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
-
-# SCSI bus support
-scsibus* at	ncr?
-
-# SCSI devices
-sd*	at	scsibus? target ? lun ?
-st*	at	scsibus? target ? lun ?
-cd*	at	scsibus? target ? lun ?
-
-pseudo-device	bpfilter
-pseudo-device	loop
-pseudo-device	pty
-pseudo-device	sl
-pseudo-device	vnd
diff --git a/sys/arch/alpha/conf/MACALLAN b/sys/arch/alpha/conf/NOSY
index 2dfff09b113..bfd0d654f4c 100644
--- a/sys/arch/alpha/conf/MACALLAN
+++ b/sys/arch/alpha/conf/NOSY
@@ -1,6 +1,7 @@
-#	$NetBSD: MACALLAN,v 1.7 1995/12/20 00:14:17 cgd Exp $
+#	$NetBSD: NOSY,v 1.5.4.2 1996/06/13 19:22:15 cgd Exp $
+#
+# Jason's DEC 3000/400 in the lab...
 #
-# Kernel for macallan.dssc.cs.cmu.edu.
 
 include	"std.alpha"
 
@@ -10,7 +11,7 @@ maxusers 8
 options		DEC_3000_500	# Flamingo etc:	3000/[4-9]00*
 
 # needs to be set per system
-options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
+options		TIMEZONE="8*60"		# Minutes west of GMT (for param.c)
 options		DST=1			# Daylight savings rules (for param.c)
 
 # Standard system options
@@ -22,7 +23,9 @@ options		KTRACE			# System call tracing support
 options		FIFO		# POSIX fifo support (in all file systems)
 options		FFS		# Fast file system
 options		MFS		# Memory-based file system
+options		NFSSERVER	# Sun NFS-compatible file system server
 options		NFSCLIENT	# Sun NFS-compatible file system client
+options		UNION		# Union filesystem
 
 # Networking options
 options		INET		# Internet protocol suite
@@ -31,12 +34,20 @@ options		INET		# Internet protocol suite
 options		COMPAT_43
 
 # Binary compatibility with previous versions of NetBSD.
+#options	COMPAT_09
 options		COMPAT_10
+options		COMPAT_11
+
+# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
+#options	COMPAT_OSF1
 
 # Loadable Kernel Modules
 options		LKM
 
-config		netbsd	root on sd0 swap on sd0 and sd1
+# Disable kernel security.
+options		INSECURE
+
+config		netbsd	swap generic
 
 mainbus0 at	root
 cpu*	at	mainbus0
@@ -49,27 +60,27 @@ tc*	at	tcasic?
 
 # TurboChannel devices
 ioasic0	at	tc? slot ? offset ?
-clock0	at	ioasic? offset ?
-le0	at	ioasic? offset ?
+mcclock0 at	ioasic? offset ?
+le*	at	ioasic? offset ?
 scc0	at	ioasic? offset ?
 scc1	at	ioasic? offset ?
 tcds0	at	tc? slot ? offset ?
 esp0	at	tcds? slot ?
 esp1	at	tcds? slot ?
-#sfb*	at	tc? slot ? offset ?
+sfb*	at	tc? slot ? offset ?
+fta*	at	tc? slot ? offset ?		# DEC DEFTA FDDI cards
 
 # SCSI bus support
-scsibus0 at	esp0
 scsibus* at	esp?
 
 # SCSI devices
-sd0	at	scsibus0 target 0 lun 0
 sd*	at	scsibus? target ? lun ?
 st*	at	scsibus? target ? lun ?
 cd*	at	scsibus? target ? lun ?
 
-pseudo-device	bpfilter
+# Workstation Console attachments
+wscons*	at	sfb?
+
+pseudo-device	bpfilter	16
 pseudo-device	loop
-pseudo-device	pty
-pseudo-device	sl
-pseudo-device	vnd
+pseudo-device	pty		64
diff --git a/sys/arch/alpha/conf/TOMMY b/sys/arch/alpha/conf/TOMMY
deleted file mode 100644
index e97ca816a92..00000000000
--- a/sys/arch/alpha/conf/TOMMY
+++ /dev/null
@@ -1,91 +0,0 @@
-#	$NetBSD: TOMMY,v 1.3 1995/11/25 01:32:34 cgd Exp $
-#
-# Kernel for tomintoul.pdl.cs.cmu.edu.
-# Should work on AlphaStation 400s and AlphaStation 200s
-
-include	"std.alpha"
-
-maxusers 8
-
-# CPU Support
-options		DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
-
-# needs to be set per system
-options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
-options		DST=1			# Daylight savings rules (for param.c)
-
-# Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
-options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
-options		KTRACE			# System call tracing support
-
-# File system options
-options		FIFO		# POSIX fifo support (in all file systems)
-options		FFS		# Fast file system
-options		MFS		# Memory-based file system
-options		NFSSERVER	# Sun NFS-compatible file system server
-options		NFSCLIENT	# Sun NFS-compatible file system client
-
-# Networking options
-options		INET		# Internet protocol suite
-
-# 4.3BSD compatibility.  Should be optional, but necessary for now.
-options		COMPAT_43
-
-# Binary compatibility with previous versions of NetBSD.
-options		COMPAT_10
-
-# Loadable Kernel Modules
-options		LKM
-
-# Disable kernel security.
-#options	INSECURE
-
-# Misc. options
-options		PCIVERBOSE	# recognize "unknown" PCI devices
-
-config		netbsd		root on sd0 swap on sd0
-
-mainbus0 at	root
-cpu*	at	mainbus0
-
-# PCI host bus adapter support
-apecs*	at	mainbus?
-
-# PCI bus support
-pci*	at	apecs?
-pci*	at	ppb?
-
-# PCI devices
-de*	at	pci?
-ncr0	at	pci?
-pcivga*	at	pci?
-ppb*	at	pci?
-sio*	at	pci?
-tga*	at	pci?
-
-# ISA/EISA bus support
-isa*	at	sio?
-
-# ISA devices
-clock0	at	isa? port 0x70
-pckbd0	at	isa? port 0x60 irq 1		# PC-ish ISA keyboard
-#pms0	at	isa? port 0x60 irq 12		# PS/2 auxiliary
-com0	at	isa? port 0x3f8 irq 4		# standard serial ports
-com1	at	isa? port 0x2f8 irq 3
-lpt0	at	isa? port 0x3bc irq 7		# standard parallel port
-#wss0	at	isa? port 0x530 irq 9 drq 0	# Windows Sound System
-
-# SCSI bus support
-scsibus* at	ncr?
-
-# SCSI devices
-sd*	at	scsibus? target ? lun ?
-st*	at	scsibus? target ? lun ?
-cd*	at	scsibus? target ? lun ?
-
-pseudo-device	bpfilter
-pseudo-device	loop
-pseudo-device	pty
-pseudo-device	sl
-pseudo-device	vnd
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index ef97fad1a46..b3c8bf12b56 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$NetBSD: files.alpha,v 1.9 1995/12/20 00:14:19 cgd Exp $
+#	$NetBSD: files.alpha,v 1.19.4.2 1996/05/30 23:20:37 cgd Exp $
 #
 # alpha-specific configuration info
 
@@ -12,9 +12,11 @@ maxusers 2 8 64
 # Bus-independent devices
 #
 
-device mainbus at root { }              # no locators (yet?)
+device	mainbus { }	              # no locators (yet?)
+attach	mainbus at root
 
-device	cpu at mainbus { }		# not really optional; can be a 'bus'
+device	cpu { }				# not really optional; can be a 'bus'
+attach	cpu at mainbus
 file	arch/alpha/alpha/cpu.c		cpu
 
 
@@ -29,30 +31,27 @@ major { sd = 8 }
 
 
 #
-# ansi/sun console emulator
-#
-
-define	ansicons
-file	dev/pseudo/ansicons.c		ansicons
-
-
-#
 # raster console routines
 #
 
+define	raster
 include "../../../dev/rcons/files.rcons"
-
-define	rcons
-file	dev/pseudo/rcons_init.c		rcons
-file	dev/pseudo/rcons_subr.c		rcons
+file	arch/alpha/wscons/wscons_rinit.c	raster
+file	arch/alpha/wscons/wscons_rops.c		raster
 
 
 #
 # "Workstation Console" glue; attaches frame buffer to emulator & kbd.
-# XXX should be pseudo-device, with an ansicons attribute.
 #
-define	wsc				# XXX should be pseudo-dev
-file	arch/alpha/pci/wscons.c		wsc		needs-flag
+define  wsconsdev {[console = -1]}
+device	wscons
+attach	wscons at wsconsdev
+file	arch/alpha/wscons/wscons.c	wscons		needs-flag
+file	arch/alpha/wscons/wscons_emul.c	wscons
+
+file	arch/alpha/wscons/event.c	wscons
+file	arch/alpha/wscons/kbd.c		wscons
+file	arch/alpha/wscons/ms.c		wscons
 
 
 #
@@ -61,44 +60,57 @@ file	arch/alpha/pci/wscons.c		wsc		needs-flag
 
 include "../../../dev/tc/files.tc"
 
-device tcasic at mainbus: tcbus
+device	tcasic: tcbus
+attach	tcasic at mainbus
 file	arch/alpha/tc/tcasic.c		tcasic
-file	arch/alpha/tc/tc_3000_500.c	dec_3000_500
-file	arch/alpha/tc/tc_3000_300.c	dec_3000_300
+file	arch/alpha/tc/tc_bus_io.c	tcasic
+file	arch/alpha/tc/tc_bus_mem.c	tcasic
+file	arch/alpha/tc/tc_3000_500.c	tcasic & dec_3000_500
+file	arch/alpha/tc/tc_3000_300.c	tcasic & dec_3000_300
 
 # the TurboChannel IOCTL ASIC
-device ioasic at tc { offset = -1 }
-file	arch/alpha/tc/ioasic.c		ioasic		needs-flag
-
-# the TurboChannel clock (XXX)
-# device clock at ioasic			# not really optional
-#file	arch/alpha/alpha/clock.c	clock
-
-# Smart Frame buffer (XXX NOT YET SUPPORTED)
-device sfb at tc
+device	ioasic { offset = -1 }
+attach	ioasic at tc
+file	arch/alpha/tc/ioasic.c		ioasic
+
+# Color Frame buffer
+device	cfb: raster, wsconsdev
+attach	cfb at tc
+file	arch/alpha/tc/cfb.c		cfb
+
+# Smart Frame buffer
+device	sfb: raster, wsconsdev
+attach	sfb at tc
 file	arch/alpha/tc/sfb.c		sfb
 
 # 8530 UARTs
-device scc at ioasic
+device	scc
+attach	scc at ioasic
 file	arch/alpha/tc/scc.c		scc		needs-count
 
 # the TCDS ASIC
-device tcds at tc { slot = -1 }
+device	tcds { slot = -1 }
+attach	tcds at tc
 file	arch/alpha/tc/tcds.c		tcds		needs-count
 
 # 53C[F]90 SCSI
-device esp at tcds: scsi
+device	esp: scsi
+attach	esp at tcds
 file	arch/alpha/tc/esp.c		esp		needs-count
 file	arch/alpha/tc/tcds_dma.c	esp
 
 # Baseboard Lance ethernet.
-device le at ioasic, tc: ether, ifnet
-file	dev/tc/if_le.c			le	needs-flag # for le_iomem
+attach	le at ioasic with le_ioasic
+attach	le at tc with le_tc
+file	dev/tc/if_le_dec.c		(le_ioasic | le_tc)
+file	dev/tc/if_le_ioasic.c		le_ioasic	needs-flag #for le_iomem
+file	dev/tc/if_le_tc.c		le_tc
 
 #
 # ISA Bus support
 #
 
+include "../../../dev/pci/files.pci"	# XXX some ISA devs are 'at pci' too.
 include "../../../dev/isa/files.isa"
 
 #file	arch/alpha/isa/isafcns_jensen.c	dec_2000_300
@@ -108,13 +120,15 @@ include "../../../dev/isa/files.isa"
 # ISA Bus devices
 #
 
-device	ibus at mainbus { }
-device	jcombo at ibus: isabus
-device	jeisa at ibus: eisabus
+#device	ibus at mainbus { }
+#device	jcombo at ibus: isabus
+#device	jeisa at ibus: eisabus
 
-device  pckbd at isa
+device  pckbd
+attach  pckbd at isa
 file    arch/alpha/isa/pckbd.c           pckbd needs-flag
-device  pms at isa
+device  pms
+attach  pms at isa
 file    arch/alpha/isa/pms.c             pms needs-flag
 
 
@@ -129,23 +143,28 @@ include "../../../dev/eisa/files.eisa"
 # PCI Bus support
 #
 
-include "../../../dev/pci/files.pci"
+# include "../../../dev/pci/files.pci" XXX SEE ABOVE
 
-device	apecs at mainbus: pcibus
+device	apecs: pcibus
+attach	apecs at mainbus
 file	arch/alpha/pci/apecs.c		apecs
-file	arch/alpha/pci/apecs_isa.c	apecs
 file	arch/alpha/pci/apecs_pci.c	apecs
 
-device	cia at mainbus: pcibus
-file	arch/alpha/pci/cia.c		cia
-file	arch/alpha/pci/cia_isa.c	cia
-file	arch/alpha/pci/cia_pci.c	cia
-
-device	lca at mainbus: pcibus
+device	lca: pcibus
+attach	lca at mainbus
 file	arch/alpha/pci/lca.c		lca
-file	arch/alpha/pci/lca_isa.c	lca
 file	arch/alpha/pci/lca_pci.c	lca
 
+file	arch/alpha/pci/apecs_lca_bus_io.c	apecs | lca
+file	arch/alpha/pci/apecs_lca_bus_mem.c	apecs | lca
+
+device	cia: pcibus
+attach	cia at mainbus
+file	arch/alpha/pci/cia.c		cia
+file	arch/alpha/pci/cia_bus_io.c	cia
+file	arch/alpha/pci/cia_bus_mem.c	cia
+file	arch/alpha/pci/cia_pci.c	cia
+
 file	arch/alpha/pci/pci_2100_a50.c	dec_2100_a50
 file	arch/alpha/pci/pci_kn20aa.c	dec_kn20aa
 file	arch/alpha/pci/pci_axppci_33.c	dec_axppci_33
@@ -157,15 +176,23 @@ file	arch/alpha/pci/pci_axppci_33.c	dec_axppci_33
 
 file	arch/alpha/pci/pci_machdep.c	pci
 
-device	sio at pci: isabus
-device	pceb at pci: eisabus
-file	arch/alpha/pci/sio.c		sio pceb	needs-flag
-file	arch/alpha/pci/sio_pic.c	sio pceb
+device	sio: isabus
+attach	sio at pci
+device	pceb: isabus, eisabus
+attach	pceb at pci
+file	arch/alpha/pci/sio.c		sio | pceb	needs-flag
+file	arch/alpha/pci/sio_pic.c	sio | pceb
 
-device	tga at pci: rcons, wsc, ansicons
+device	tga: raster, wsconsdev
+attach	tga at pci
 file	arch/alpha/pci/tga.c		tga		needs-flag
+file	arch/alpha/pci/tga_conf.c	tga
+file	arch/alpha/pci/tga_bt463.c	tga
+file	arch/alpha/pci/tga_bt485.c	tga
+
 
-device	pcivga at pci: wsc, ansicons
+device	pcivga: wsconsdev
+attach	pcivga at pci
 file	arch/alpha/pci/pcivga.c		pcivga		needs-flag
 
 
@@ -173,17 +200,19 @@ file	arch/alpha/pci/pcivga.c		pcivga		needs-flag
 # Devices that can live on multiple busses
 #
 
-device clock at isa, ioasic				# not really optional
-file	arch/alpha/alpha/clock.c	clock
-file	arch/alpha/alpha/clock_mc.c	dec_3000_500 dec_2000_300 dec_3000_300
-					dec_2100_a50 dec_kn20aa dec_axppci_33
-					dec_21000
+device	mcclock
+attach	mcclock at ioasic with mcclock_ioasic
+attach	mcclock at isa with mcclock_isa
+file	arch/alpha/alpha/mcclock.c	mcclock
+file	arch/alpha/tc/mcclock_ioasic.c	mcclock_ioasic
+file	arch/alpha/isa/mcclock_isa.c	mcclock_isa
 
 #
 # Standard files
 #
 
 file	arch/alpha/alpha/autoconf.c
+file	arch/alpha/alpha/clock.c
 file	arch/alpha/alpha/conf.c
 file	arch/alpha/alpha/interrupt.c
 file	arch/alpha/alpha/machdep.c
@@ -198,14 +227,14 @@ file	arch/alpha/alpha/trap.c
 file	arch/alpha/alpha/vm_machdep.c
 file	arch/alpha/alpha/disksubr.c
 file	dev/cons.c
-file	netinet/in_cksum.c
 
 
 #
 # Optional/miscellaneous files
 #
 
-file	netns/ns_cksum.c		ns
+file	arch/alpha/alpha/in_cksum.c		inet
+file	netns/ns_cksum.c			ns
 
 # XXX
 file	arch/alpha/alpha/promcons.c