partial sync with netbsd 960418, more to come

8 files changed, 81 insertions, 40 deletions

diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index e33317a4a10..1c962680077 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,5 +1,5 @@
-#	$OpenBSD: DISKLESS,v 1.3 1996/04/18 18:55:32 niklas Exp $
-#	$NetBSD: DISKLESS,v 1.21 1996/03/16 06:09:02 thorpej Exp $
+#	$OpenBSD: DISKLESS,v 1.4 1996/04/21 22:16:04 deraadt Exp $
+#	$NetBSD: DISKLESS,v 1.23 1996/03/25 05:45:14 perry Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
 # This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -42,6 +42,7 @@ options		SYSVSHM		# System V-like memory sharing
 options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
 options		COMPAT_09	# NetBSD 0.9,
 options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_11	# NetBSD 1.1,
 options		COMPAT_43	# and 4.3BSD
 options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
@@ -160,7 +161,7 @@ ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN & 3C507 ethernet cards
 #le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
 
 sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
-#spkr0	at isa? port 0x61
+#spkr0	at pckbd? port 0x61
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 8		# packet filter
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 1a6fcd88231..1f42d656732 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,5 +1,5 @@
-#	$OpenBSD: GENERIC,v 1.7 1996/04/18 18:55:33 niklas Exp $
-#	$NetBSD: GENERIC,v 1.36 1996/03/16 06:09:03 thorpej Exp $
+#	$OpenBSD: GENERIC,v 1.8 1996/04/21 22:16:06 deraadt Exp $
+#	$NetBSD: GENERIC,v 1.40 1996/03/30 23:57:09 perry Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -42,6 +42,7 @@ options		SYSVSHM		# System V-like memory sharing
 options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
 options		COMPAT_09	# NetBSD 0.9,
 options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_11	# NetBSD 1.1,
 options		COMPAT_43	# and 4.3BSD
 options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
@@ -142,6 +143,9 @@ uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
 uha1	at isa? port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
 uha2	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
 scsibus* at uha?
+wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
+wds1	at isa? port 0x358 irq 11 drq 5
+scsibus* at wds?
 
 sd*	at scsibus? target ? lun ?	# SCSI disk drives
 st*	at scsibus? target ? lun ?	# SCSI tape drives
@@ -179,7 +183,10 @@ sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
 wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
 pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
 gus0	at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex)
-#spkr0	at isa? port 0x61
+#spkr0	at pckbd? port 0x61
+
+# Joystick driver. Probe is a little strange; add only if you have one.
+#joy0	at isa? port 0x201
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 8		# packet filter
diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP
index 2ccbebc4488..d8c61ab9ef8 100644
--- a/sys/arch/i386/conf/GENERICADP
+++ b/sys/arch/i386/conf/GENERICADP
@@ -1,5 +1,5 @@
-#	$OpenBSD: GENERICADP,v 1.6 1996/04/18 18:55:34 niklas Exp $
-#	$NetBSD: GENERICADP,v 1.3 1995/12/14 01:10:08 tls Exp $
+#	$OpenBSD: GENERICADP,v 1.7 1996/04/21 22:16:09 deraadt Exp $
+#	$NetBSD: GENERICADP,v 1.16 1996/03/30 23:57:16 perry Exp $
 #
 #	GENERICADP -- everything that's currently supported, except non-
 #                     Adaptec SCSI controllers.
@@ -43,6 +43,7 @@ options		SYSVSHM		# System V-like memory sharing
 options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
 options		COMPAT_09	# NetBSD 0.9,
 options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_11	# NetBSD 1.1,
 options		COMPAT_43	# and 4.3BSD
 options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
@@ -168,7 +169,10 @@ sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
 wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
 pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
 gus0	at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex)
-#spkr0	at isa? port 0x61
+#spkr0	at pckbd? port 0x61
+
+# Joystick driver. Probe is a little strange; add only if you have one.
+#joy0	at isa? port 0x201
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 8		# packet filter
diff --git a/sys/arch/i386/conf/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER
index 23cdc09b36e..5fc6586b9d0 100644
--- a/sys/arch/i386/conf/GENERICOTHER
+++ b/sys/arch/i386/conf/GENERICOTHER
@@ -1,5 +1,5 @@
-#	$OpenBSD: GENERICOTHER,v 1.5 1996/04/18 18:55:34 niklas Exp $
-#	$NetBSD: GENERICOTHER,v 1.3 1995/12/14 01:10:10 tls Exp $
+#	$OpenBSD: GENERICOTHER,v 1.6 1996/04/21 22:16:11 deraadt Exp $
+#	$NetBSD: GENERICOTHER,v 1.16 1996/03/30 23:57:19 perry Exp $
 #
 #	GENERICOTHER -- everything that's currently supported, except
 #	             Adaptec SCSI controllers.
@@ -43,6 +43,7 @@ options		SYSVSHM		# System V-like memory sharing
 options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
 options		COMPAT_09	# NetBSD 0.9,
 options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_11	# NetBSD 1.1,
 options		COMPAT_43	# and 4.3BSD
 options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
@@ -132,6 +133,9 @@ uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
 uha1	at isa? port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
 uha2	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
 scsibus* at uha?
+wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
+wds1	at isa? port 0x358 irq 11 drq 5
+scsibus* at wds?
 
 sd*	at scsibus? target ? lun ?	# SCSI disk drives
 st*	at scsibus? target ? lun ?	# SCSI tape drives
@@ -169,7 +173,10 @@ sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
 wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
 pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
 gus0	at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex)
-#spkr0	at isa? port 0x61
+#spkr0	at pckbd? port 0x61
+
+# Joystick driver. Probe is a little strange; add only if you have one.
+#joy0	at isa? port 0x201
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 8		# packet filter
diff --git a/sys/arch/i386/conf/INSTADP b/sys/arch/i386/conf/INSTADP
index 18c608e335d..45d7f76dc9b 100644
--- a/sys/arch/i386/conf/INSTADP
+++ b/sys/arch/i386/conf/INSTADP
@@ -1,5 +1,5 @@
-#	$OpenBSD: INSTADP,v 1.5 1996/04/18 18:55:36 niklas Exp $
-#	$NetBSD: INSTADP,v 1.3 1995/12/14 01:10:12 tls Exp $
+#	$OpenBSD: INSTADP,v 1.6 1996/04/21 22:16:12 deraadt Exp $
+#	$NetBSD: INSTADP,v 1.11 1996/03/25 05:45:28 perry Exp $
 #
 #	INSTADP -- like GENERICADP.  This supports only Adaptec SCSI
 #                     adapters.  This kernel is GENERICADP with lines
@@ -34,6 +34,7 @@ options		DEVPAGER	# mmap() of devices
 #makeoptions	DEBUG="-g"	# compile full symbol table
 
 options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_11	# NetBSD 1.1,
 
 options		LKM		# loadable kernel modules
 
diff --git a/sys/arch/i386/conf/INSTOTHER b/sys/arch/i386/conf/INSTOTHER
index 8790f156fdc..48c7d44477c 100644
--- a/sys/arch/i386/conf/INSTOTHER
+++ b/sys/arch/i386/conf/INSTOTHER
@@ -1,4 +1,5 @@
-#	$NetBSD: INSTOTHER,v 1.3 1995/12/14 01:10:15 tls Exp $
+#	$OpenBSD: INSTOTHER,v 1.4 1996/04/21 22:16:14 deraadt Exp $
+#	$NetBSD: INSTOTHER,v 1.11 1996/03/30 05:42:59 mycroft Exp $
 #
 #	INSTOTHER -- like GENERICOTHER.  This supports only non-Adaptec SCSI
 #                     adapters.  This kernel is GENERICOTHER with lines
@@ -30,6 +31,7 @@ options		DIAGNOSTIC	# internally consistency checks
 options		KTRACE		# system call tracing, a la ktrace(1)
 
 options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_11	# NetBSD 1.1,
 
 options		LKM		# loadable kernel modules
 
@@ -85,6 +87,9 @@ uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
 uha1	at isa? port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
 uha2	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
 scsibus* at uha?
+wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
+wds1	at isa? port 0x358 irq 11 drq 5
+scsibus* at wds?
 
 sd*	at scsibus? target ? lun ?	# SCSI disk drives
 st*	at scsibus? target ? lun ?	# SCSI tape drives
diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR
index 5669612bf6a..8f4d23c4243 100644
--- a/sys/arch/i386/conf/TDR
+++ b/sys/arch/i386/conf/TDR
@@ -1,5 +1,5 @@
-#	$OpenBSD: TDR,v 1.5 1996/04/18 18:55:37 niklas Exp $
-#	$NetBSD: TDR,v 1.62 1996/03/16 06:09:12 thorpej Exp $
+#	$OpenBSD: TDR,v 1.6 1996/04/21 22:16:14 deraadt Exp $
+#	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
 #
@@ -40,6 +40,7 @@ options		KTRACE		# system call tracing, a la ktrace(1)
 options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
 options		COMPAT_09	# NetBSD 0.9,
 options		COMPAT_10	# NetBSD 1.0,
+options		COMPAT_11	# NetBSD 1.1,
 options		COMPAT_43	# and 4.3BSD
 options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
 
@@ -161,7 +162,7 @@ ep2	at isa? port ? irq ?
 #le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
 
 #sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
-#spkr0	at isa? port 0x61
+#spkr0	at pckbd? port 0x61
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 16		# packet filter
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index b0403ebf9bc..fc823632bfd 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,5 +1,5 @@
-#	$OpenBSD: files.i386,v 1.10 1996/04/19 07:33:39 mickey Exp $
-#	$NetBSD: files.i386,v 1.66 1996/03/16 06:09:16 thorpej Exp $
+#	$OpenBSD: files.i386,v 1.11 1996/04/21 22:16:15 deraadt Exp $
+#	$NetBSD: files.i386,v 1.72 1996/04/09 22:59:03 cgd Exp $
 #
 # new style config file for i386 architecture
 #
@@ -41,11 +41,18 @@ major	{sd = 4}
 major	{st = 5}
 major	{cd = 6}
 
+# RAM Disk for install floppy
+pseudo-device rd
+file dev/ramdisk.c			rd needs-flag
+file arch/i386/i386/rd_root.c		ramdisk_hooks
+major	{rd = 17}
+
 #
 # System bus types
 #
 
-device mainbus at root: isabus, eisabus, pcibus
+device	mainbus: isabus, eisabus, pcibus
+attach	mainbus at root
 file	arch/i386/i386/mainbus.c	mainbus
 
 #device	mca at root {...}
@@ -58,6 +65,7 @@ file	arch/i386/i386/mainbus.c	mainbus
 
 include "../../../dev/pci/files.pci"
 file	arch/i386/pci/pci_machdep.c	pci
+file	arch/i386/pci/pci_compat.c	pci	# XXX compatibility
 
 #
 # ISA and mixed ISA+EISA or ISA+PCI or ISA+PCMCIA drivers
@@ -79,19 +87,22 @@ file	arch/i386/isa/isa_machdep.c	isabus
 file	arch/i386/isa/clock.c		isabus
 
 # Numeric Processing Extension; Math Co-processor
-device	npx at isa
+device	npx
+attach	npx at isa
 file	arch/i386/isa/npx.c		npx needs-flag
 
 # attribute used to represent the "keyboard controller"
 # XXX should be a real device
-define	pckbd { [irq = -1], [port = -1] }
+define pckbd { [irq = -1], [port = -1] }
 
 # PC console support a la "pccons"
-device	pc at isa: tty, pckbd
+device	pc: tty, pckbd
+attach	pc at isa
 file	arch/i386/isa/pccons.c		pc needs-flag
 
 # PC console support a la "pcvt"
-device	vt at isa: tty, pckbd
+device	vt: tty, pckbd
+attach	vt at isa
 file	arch/i386/isa/pcvt/pcvt_drv.c	vt needs-flag
 file	arch/i386/isa/pcvt/pcvt_ext.c	vt needs-flag
 file	arch/i386/isa/pcvt/pcvt_kbd.c	vt needs-flag
@@ -100,44 +111,48 @@ file	arch/i386/isa/pcvt/pcvt_sup.c	vt needs-flag
 file	arch/i386/isa/pcvt/pcvt_vtf.c	vt needs-flag
 
 # PC Mice; Logitech-style, Microsoft-style, and PS/2-style
-device	lms at isa
+device	lms
+attach	lms at isa
 file	arch/i386/isa/lms.c		lms needs-flag
-device	mms at isa
+device	mms
+attach	mms at isa
 file	arch/i386/isa/mms.c		mms needs-flag
-device	pms at pckbd
+device	pms
+attach	pms at pckbd
 file	arch/i386/isa/pms.c		pms needs-flag
 
 # Floppy disk controller
-device	fdc at isa {drive = -1}
-device	fd at fdc: disk, isadma
+device	fdc {drive = -1}
+attach	fdc at isa
+device	fd: disk, isadma
+attach	fd at fdc
 file	arch/i386/isa/fd.c		fdc needs-flag
 major	{fd = 2}
 
 # PC speaker
-device	spkr at pckbd: tty
+device	spkr: tty
+attach	spkr at pckbd
 file	arch/i386/isa/spkr.c		spkr needs-flag
 
 # AMD am7990 (Lance) -based boards
 # (BICC Isolan, NE2100, DEPCA)
 # XXX conflicts with other ports; can't be in files.isa
-device	le at isa, pci: ether, ifnet, isadma
+device	le: ether, ifnet
+attach	le at isa with le_isa: isadma
+attach	le at pci with le_pci
 file	dev/isa/if_le.c			le
 
-# National Semiconductor DS8390/WD83C690-based boards
-# (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones)
-# XXX conflicts with other ports; can't be in files.isa
-device	ed at isa: ether, ifnet
-file	dev/isa/if_ed.c			ed needs-flag
-
 # Game adapter (joystick)
-device	joy at isa
-file	arch/i386/isa/joy.c			joy needs-flag
+device	joy
+attach	joy at isa
+file	arch/i386/isa/joy.c		joy needs-flag
 
 #
 # EISA-only drivers
 #
 
 include "../../../dev/eisa/files.eisa"
+file	arch/i386/eisa/eisa_machdep.c	eisa
 
 #
 # Compatibility modules