isadma is now a real driver, and the i386 ports needs to use it

13 files changed, 26 insertions, 13 deletions

diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 3fd85d2679a..65abe3fb1d1 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-#	$OpenBSD: ALL,v 1.1 1996/05/30 09:25:27 deraadt Exp $
+#	$OpenBSD: ALL,v 1.2 1996/06/16 10:33:09 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -103,6 +103,7 @@ pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
 pcmcia* at pcic?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY
index bee7d8a8af4..554dfcb5d06 100644
--- a/sys/arch/i386/conf/BABY
+++ b/sys/arch/i386/conf/BABY
@@ -1,4 +1,4 @@
-#	$OpenBSD: BABY,v 1.1 1996/05/30 09:25:34 deraadt Exp $
+#	$OpenBSD: BABY,v 1.2 1996/06/16 10:33:10 deraadt Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -99,6 +99,7 @@ pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
 pcmcia* at pcic?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 678ba9d60e7..273657aaf7c 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.7 1996/05/27 08:05:07 deraadt Exp $
+#	$OpenBSD: DISKLESS,v 1.8 1996/06/16 10:33:11 deraadt Exp $
 #	$NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
@@ -90,6 +90,7 @@ isa0	at mainbus0
 #pci*	at ppb? bus ?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/GANDALF b/sys/arch/i386/conf/GANDALF
index a3b980d483f..4ed2ce767fa 100644
--- a/sys/arch/i386/conf/GANDALF
+++ b/sys/arch/i386/conf/GANDALF
@@ -1,7 +1,7 @@
 #
 #	GANDALF -- Dual Tyan P5/133 PCI/EISA bus
 #
-#	$OpenBSD: GANDALF,v 1.3 1996/06/09 19:03:43 tholo Exp $
+#	$OpenBSD: GANDALF,v 1.4 1996/06/16 10:33:11 deraadt Exp $
 #
 
 machine		i386		# architecture, used by config; REQUIRED
@@ -89,6 +89,7 @@ pci0	at mainbus0 bus ?
 eisa0	at mainbus0
 
 npx0	at isa?	port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 356393cb9ea..c35318b861b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.18 1996/06/08 09:12:37 downsj Exp $
+#	$OpenBSD: GENERIC,v 1.19 1996/06/16 10:33:12 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -103,6 +103,7 @@ pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
 pcmcia* at pcic?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/HELIOS_PCMCIA b/sys/arch/i386/conf/HELIOS_PCMCIA
index b895db2c5f6..ee6432ca740 100644
--- a/sys/arch/i386/conf/HELIOS_PCMCIA
+++ b/sys/arch/i386/conf/HELIOS_PCMCIA
@@ -1,4 +1,4 @@
-#	$OpenBSD: HELIOS_PCMCIA,v 1.5 1996/04/30 18:49:41 hvozda Exp $
+#	$OpenBSD: HELIOS_PCMCIA,v 1.6 1996/06/16 10:33:13 deraadt Exp $
 #
 #	HELIOS_PCMCIA -- Eric Hvozda's notebook
 #
@@ -58,6 +58,7 @@ pci0	at mainbus0
 #apm0	at mainbus0
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #spkr0	at pckbd? port 0x61		# PC speaker
diff --git a/sys/arch/i386/conf/INST b/sys/arch/i386/conf/INST
index 33093f06568..a703897cd44 100644
--- a/sys/arch/i386/conf/INST
+++ b/sys/arch/i386/conf/INST
@@ -1,4 +1,4 @@
-#	$OpenBSD: INST,v 1.2 1996/05/30 09:25:52 deraadt Exp $
+#	$OpenBSD: INST,v 1.3 1996/06/16 10:33:14 deraadt Exp $
 #	$NetBSD: INSTADP,v 1.17 1996/05/20 03:32:19 thorpej Exp $
 #
 #       Install kernels no longer support X.
@@ -67,6 +67,7 @@ pcic3	at pcicmaster1 irq 12 iomem 0xd7000 iosiz 4096
 pcmcia* at pcic?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index df11ec33729..dd849e6ca57 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-#	$OpenBSD: LAP,v 1.4 1996/06/04 07:52:28 deraadt Exp $
+#	$OpenBSD: LAP,v 1.5 1996/06/16 10:33:15 deraadt Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -88,6 +88,7 @@ isa0	at mainbus0
 #pci*	at ppb? bus ?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 #pc0	at isa? port 0x60 irq 1		# generic PC console device
 vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 4b87aaf3de9..c2781e42fbf 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-#	$OpenBSD: NETTAN,v 1.4 1996/05/14 18:38:16 mickey Exp $
+#	$OpenBSD: NETTAN,v 1.5 1996/06/16 10:33:16 deraadt Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
@@ -84,6 +84,7 @@ mainbus0	at root
 isa0	at mainbus0
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 #pc0	at isa? port 0x60 irq 1		# generic PC console device
 vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index f6270dbe142..1ebe3bf2dfd 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -76,6 +76,7 @@ mainbus0	at root
 isa0	at mainbus0
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 vt0	at isa? port 0x60 irq 1
 
diff --git a/sys/arch/i386/conf/PCMCIA b/sys/arch/i386/conf/PCMCIA
index 2544e06c62c..9ef8747348e 100644
--- a/sys/arch/i386/conf/PCMCIA
+++ b/sys/arch/i386/conf/PCMCIA
@@ -1,4 +1,4 @@
-#	$Id: PCMCIA,v 1.1 1996/04/29 14:12:24 hvozda Exp $
+#	$Id: PCMCIA,v 1.2 1996/06/16 10:33:18 deraadt Exp $
 #	$Source: /cvs/OpenBSD/src/sys/arch/i386/conf/Attic/PCMCIA,v $
 #
 #	ATHENA-AHA	-- ATHENA kernel for Adaptec & others...
@@ -89,6 +89,7 @@ isa0	at mainbus0
 pci0	at mainbus0 bus 0
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 vt0	at isa? port 0x60 irq 1
 
diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR
index fa97aa28180..881610eb860 100644
--- a/sys/arch/i386/conf/TDR
+++ b/sys/arch/i386/conf/TDR
@@ -1,4 +1,4 @@
-#	$OpenBSD: TDR,v 1.10 1996/05/27 08:05:17 deraadt Exp $
+#	$OpenBSD: TDR,v 1.11 1996/06/16 10:33:19 deraadt Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -88,6 +88,7 @@ eisa0	at mainbus0
 #pci*	at ppb? bus ?
 
 npx0	at isa? port 0xf0 irq 13	# math coprocessor
+isadma0	at isa?
 
 pc0	at isa? port 0x60 irq 1		# generic PC console device
 #vt0	at isa? port 0x60 irq 1
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 3b6d3146ce0..a2261b18849 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.18 1996/06/08 09:12:38 downsj Exp $
+#	$OpenBSD: files.i386,v 1.19 1996/06/16 10:33:20 deraadt Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -94,6 +94,7 @@ major	{wt = 3}
 
 include "../../../dev/isa/files.isa"
 file	arch/i386/isa/isa_machdep.c	isabus
+file	dev/isa/isadma.c		isadma needs-flag
 
 # PC clock
 file	arch/i386/isa/clock.c		isabus
@@ -136,7 +137,7 @@ file	arch/i386/isa/pms.c		pms needs-flag
 # Floppy disk controller
 device	fdc {drive = -1}
 attach	fdc at isa
-device	fd: disk, isadma
+device	fd: disk, isa_dma
 attach	fd at fdc
 file	arch/i386/isa/fd.c		fdc needs-flag
 major	{fd = 2}