ISA PnP support

2 files changed, 27 insertions, 13 deletions

diff --git a/sys/arch/i386/conf/TARDIS b/sys/arch/i386/conf/TARDIS
index defbf7b9ae2..9821ae452da 100644
--- a/sys/arch/i386/conf/TARDIS
+++ b/sys/arch/i386/conf/TARDIS
@@ -1,12 +1,7 @@
 #
 #	TARDIS: tardis.downsj.com
 #
-#	The headless gateway to the world.
-#
-#	Please note that before you use this kernel config as an example for
-#	anything, it currently requires special boot blocks.
-#
-#	$OpenBSD: TARDIS,v 1.3 1997/09/02 04:11:24 downsj Exp $
+#	$OpenBSD: TARDIS,v 1.4 1997/12/21 14:47:14 downsj Exp $
 #
 
 machine		i386
@@ -21,7 +16,7 @@ option		DEVPAGER
 
 option		BOOT_CONFIG
 
-#option		DDB
+option		DDB
 #makeoptions	DEBUG="-g"
 option		DIAGNOSTIC
 option		KTRACE
@@ -74,7 +69,12 @@ config		bsd root on wd0 swap on wd0
 
 mainbus0 at root
 
+bios0	at mainbus0
+apm0	at bios0
+
 isa0	at mainbus0
+isapnp0	at isa?
+
 pci0	at mainbus0 bus ?
 
 ppb*	at pci? dev ? function ?
@@ -83,16 +83,18 @@ pci*	at ppb? bus ?
 npx0	at isa? port 0xf0 irq 13
 isadma0 at isa?
 
+pc0	at isa? port 0x60 irq 1
+
 pccom0	at isa? port 0x3f8 irq 4
 pccom1	at isa? port 0x2f8 irq 3
-pccom2	at isa? port 0x170 irq 7	# Really PnP device, argh.
+pccom2	at isa? port 0x3e8 irq 9
+pccom*	at isapnp?
 
-lpt0	at isa? port 0x278 irq 5
+lpt0	at isa? port 0x378 irq 7
+lpt1	at isa? port 0x3bc
 
 de0	at pci? dev ? function ?
 
-ed0	at isa? port 0x320 irq 11 iomem 0xd0000
-
 fdc0	at isa? port 0x3f0 irq 6 drq 2
 fd*	at fdc? drive ?
 
@@ -100,6 +102,9 @@ wdc0	at isa? port 0x1f0 irq 14
 #wdc1	at isa? port 0x170 irq 15
 wd*	at wdc? drive ?
 
+atapibus* at wdc?
+acd*	at atapibus? drive?
+
 pseudo-device	loop	1
 pseudo-device	bpfilter 8
 pseudo-device	sl	2
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 9902177476c..bf1f4b3cf1f 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.37 1997/11/06 02:17:30 mickey Exp $
+#	$OpenBSD: files.i386,v 1.38 1997/12/21 14:47:15 downsj Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -119,7 +119,7 @@ device	pccom: tty
 attach	pccom at isa with pccom_isa
 attach	pccom at commulti with pccom_commulti
 attach	pccom at pcmcia with pccom_pcmcia
-file	arch/i386/isa/pccom.c		pccom & (pccom_isa | pccom_commulti | pccom_pcmcia) needs-flag
+file	arch/i386/isa/pccom.c		pccom & (pccom_isa | pccom_isapnp | pccom_commulti | pccom_pcmcia) needs-flag
 
 # PC console support a la "pccons"
 device	pc: tty, pckbd
@@ -193,6 +193,15 @@ include "../../../dev/eisa/files.eisa"
 file	arch/i386/eisa/eisa_machdep.c	eisa
 
 #
+# ISA PnP
+#
+
+include "../../../dev/isa/files.isapnp"
+file	arch/i386/isa/isapnp_machdep.c	isapnp
+
+attach	pccom at isapnp with pccom_isapnp
+
+#
 # Compatibility modules
 #