15 files changed, 158 insertions, 22 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 0c21d69690d7..c9f3bbe94fc3 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -50,16 +50,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #ifdef NETGRAPH
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <i386/isa/if_ar.h>
 #else /* NETGRAPH */
@@ -74,6 +75,10 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The ar device requires the old isa compatibility shims"
+#endif
+
 #ifndef NETGRAPH
 #include "sppp.h"
 #if NSPPP <= 0
@@ -218,7 +223,13 @@ static int irqtable[16] = {
 	7	/* 15 */
 };
 
-struct isa_driver ardriver = {arprobe, arattach_isa, "ar"};
+struct isa_driver ardriver = {
+	INTR_TYPE_NET,
+	arprobe,
+	arattach_isa,
+	"ar"
+};
+COMPAT_ISA_DRIVER(ar, ardriver);
 
 struct ar_hardc *arattach_pci(int unit, vm_offset_t mem_addr);
 void arintr_hc(struct ar_hardc *hc);
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 0c21d69690d7..c9f3bbe94fc3 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -50,16 +50,17 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #ifdef NETGRAPH
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <i386/isa/if_ar.h>
 #else /* NETGRAPH */
@@ -74,6 +75,10 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The ar device requires the old isa compatibility shims"
+#endif
+
 #ifndef NETGRAPH
 #include "sppp.h"
 #if NSPPP <= 0
@@ -218,7 +223,13 @@ static int irqtable[16] = {
 	7	/* 15 */
 };
 
-struct isa_driver ardriver = {arprobe, arattach_isa, "ar"};
+struct isa_driver ardriver = {
+	INTR_TYPE_NET,
+	arprobe,
+	arattach_isa,
+	"ar"
+};
+COMPAT_ISA_DRIVER(ar, ardriver);
 
 struct ar_hardc *arattach_pci(int unit, vm_offset_t mem_addr);
 void arintr_hc(struct ar_hardc *hc);
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index dfeb69ac11e5..52a8cf36892f 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -78,6 +78,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
+#include <sys/bus.h>
 #include <machine/clock.h>
 #include <machine/ipl.h>
 #ifndef SMP
@@ -89,6 +90,10 @@
 #include <i386/isa/cyreg.h>
 #include <i386/isa/ic/cd1400.h>
 
+#ifndef COMPAT_OLDISA
+#error "The cy device requires the old isa compatibility shims"
+#endif
+
 #ifdef SMP
 #define disable_intr()	COM_DISABLE_INTR()
 #define enable_intr()	COM_ENABLE_INTR()
@@ -361,8 +366,12 @@ static	struct com_s	*p_com_addr[NSIO];
 #define	com_addr(unit)	(p_com_addr[unit])
 
 struct isa_driver	siodriver = {
-	sioprobe, sioattach, driver_name
+	INTR_TYPE_TTY | INTR_TYPE_FAST,
+	sioprobe,
+	sioattach,
+	driver_name
 };
+COMPAT_ISA_DRIVER(cy, cydriver);	/* XXX */
 
 static	d_open_t	sioopen;
 static	d_close_t	sioclose;
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index dfeb69ac11e5..52a8cf36892f 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -78,6 +78,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
+#include <sys/bus.h>
 #include <machine/clock.h>
 #include <machine/ipl.h>
 #ifndef SMP
@@ -89,6 +90,10 @@
 #include <i386/isa/cyreg.h>
 #include <i386/isa/ic/cd1400.h>
 
+#ifndef COMPAT_OLDISA
+#error "The cy device requires the old isa compatibility shims"
+#endif
+
 #ifdef SMP
 #define disable_intr()	COM_DISABLE_INTR()
 #define enable_intr()	COM_ENABLE_INTR()
@@ -361,8 +366,12 @@ static	struct com_s	*p_com_addr[NSIO];
 #define	com_addr(unit)	(p_com_addr[unit])
 
 struct isa_driver	siodriver = {
-	sioprobe, sioattach, driver_name
+	INTR_TYPE_TTY | INTR_TYPE_FAST,
+	sioprobe,
+	sioattach,
+	driver_name
 };
+COMPAT_ISA_DRIVER(cy, cydriver);	/* XXX */
 
 static	d_open_t	sioopen;
 static	d_close_t	sioclose;
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 3755c4311209..5b778ad306cb 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -52,6 +52,7 @@
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/bus.h>
 
 #include <machine/clock.h>
 
@@ -60,6 +61,10 @@
 
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The dgb device requires the old isa compatibility shims"
+#endif
+
 #include <gnu/i386/isa/dgbios.h>
 #include <gnu/i386/isa/dgfep.h>
 
@@ -197,8 +202,13 @@ static	void	disc_optim	__P((struct tty	*tp, struct termios *t));
 
 
 struct isa_driver	dgbdriver = {
-	dgbprobe, dgbattach, "dgb",0
+	INTR_TYPE_TTY,
+	dgbprobe,
+	dgbattach,
+	"dgb",
+	0
 };
+COMPAT_ISA_DRIVER(dgb, dgbdriver);
 
 static	d_open_t	dgbopen;
 static	d_close_t	dgbclose;
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index 18122f00db65..a31ff9c9124f 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -55,6 +55,7 @@
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/bus.h>
 
 #include <machine/clock.h>
 
@@ -63,6 +64,10 @@
 
 #include <i386/isa/isa_device.h>
 
+#ifndef COMPAT_OLDISA
+#error "The dgm device requires the old isa compatibility shims"
+#endif
+
 #include <gnu/i386/isa/dgmfep.h>
 #include <gnu/i386/isa/dgmbios.h>
 #include <gnu/i386/isa/dgmreg.h>
@@ -200,8 +205,13 @@ static	void	disc_optim	__P((struct tty	*tp, struct termios *t));
 
 
 struct isa_driver	dgmdriver = {
-	dgmprobe, dgmattach, "dgm",0
+	INTR_TYPE_TTY,
+	dgmprobe,
+	dgmattach,
+	"dgm",
+	0
 };
+COMPAT_ISA_DRIVER(dgm, dgmdriver);
 
 static	d_open_t	dgmopen;
 static	d_close_t	dgmclose;
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 821c80bb82bd..5a73a67da543 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -75,9 +75,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#include <sys/bus.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -96,6 +98,10 @@
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
 
+#ifndef COMPAT_OLDISA
+#error "The fe device requires the old isa compatibility shims"
+#endif
+
 /* PCCARD suport */
 /* XXX FIXME! doesn't work with new pccard code, must be converted! */
 #ifdef notdef
@@ -264,11 +270,13 @@ static void	fe_emptybuffer	( struct fe_softc * );
 /* Driver struct used in the config code.  This must be public (external.)  */
 struct isa_driver fedriver =
 {
+	INTR_TYPE_NET,
 	fe_probe,
 	fe_attach,
 	"fe",
 	1			/* It's safe to mark as "sensitive"  */
 };
+COMPAT_ISA_DRIVER(fe, fedriver);
 
 /*
  * Fe driver specific constants which relate to 86960/86965.
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index c4c4ecad14dd..2144891289b8 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -68,11 +68,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
+#include <sys/bus.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -90,6 +92,10 @@
 #include <dev/lnc/if_lncvar.h>
 #include <dev/lnc/if_lncreg.h>
 
+#ifndef COMPAT_OLDISA
+#error "The lnc device requires the old isa compatibility shims"
+#endif
+
 lnc_softc_t lnc_softc[NLNC];
 
 static char const * const nic_ident[] = {
@@ -145,7 +151,13 @@ void mbuf_dump_chain __P((struct mbuf *m));
 
 void lncintr_sc __P((lnc_softc_t *sc));
 
-struct isa_driver lncdriver = {lnc_probe, lnc_attach, "lnc"};
+struct isa_driver lncdriver = {
+	INTR_TYPE_NET,
+	lnc_probe,
+	lnc_attach,
+	"lnc"
+};
+COMPAT_ISA_DRIVER(lnc, lncdriver);
 
 static __inline void
 write_bcr(lnc_softc_t *sc, u_short port, u_short val)
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index aeb5e4cb3ee3..23446f7b34ce 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -47,12 +47,13 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 #include "mcd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/bio.h>
 #include <sys/cdio.h>
 #include <sys/disklabel.h>
-#include <sys/kernel.h>
+#include <sys/bus.h>
 
 #include <machine/clock.h>
 
@@ -194,7 +195,13 @@ static  int     mcd_close_tray(int unit);
 
 static	int	mcd_probe(struct isa_device *dev);
 static	int	mcd_attach(struct isa_device *dev);
-struct	isa_driver	mcddriver = { mcd_probe, mcd_attach, "mcd" };
+struct	isa_driver	mcddriver = {
+	INTR_TYPE_BIO,
+	mcd_probe,
+	mcd_attach,
+	"mcd"
+};
+COMPAT_ISA_DRIVER(mcd, mcddriver);
 
 static	d_open_t	mcdopen;
 static	d_close_t	mcdclose;
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index ce6dab2cd789..29ade03d30f9 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -39,13 +39,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
+#include <sys/bus.h>
 #include <sys/interrupt.h>
-#include <sys/kernel.h>
 #include <machine/clock.h>
 #include <machine/ipl.h>
 
@@ -81,8 +82,12 @@ static int     rcattach        __P((struct isa_device *));
 
 /* For isa routines */
 struct isa_driver rcdriver = {
-	rcprobe, rcattach, "rc"
+	INTR_TYPE_TTY,
+	rcprobe,
+	rcattach,
+	"rc"
 };
+COMPAT_ISA_DRIVER(rc, rcdriver);
 
 static	d_open_t	rcopen;
 static	d_close_t	rcclose;
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index bc846d5291fe..a858496df050 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -40,12 +40,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
-#include <sys/kernel.h>
+#include <sys/bus.h>
 
 #include <i386/isa/isa_device.h>
 
@@ -787,8 +788,12 @@ COMPAT_PCI_DRIVER (rp_pci, rp_pcidevice);
 static timeout_t rpdtrwakeup;
 
 struct isa_driver rpdriver = {
-	rpprobe, rpattach, "rp"
-     };
+	INTR_TYPE_TTY,
+	rpprobe,
+	rpattach,
+	"rp"
+};
+COMPAT_ISA_DRIVER(rp, rpdriver);
 
 static	char	driver_name[] = "rp";
 
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 7c8343409004..a0214bd8397b 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -50,11 +50,12 @@
 #include "scd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/bio.h>
 #include <sys/cdio.h>
 #include <sys/disklabel.h>
-#include <sys/kernel.h>
+#include <sys/bus.h>
 
 #include <machine/clock.h>
 #include <machine/stdarg.h>
@@ -168,7 +169,13 @@ static int scd_toc_entry(int unit, struct ioc_read_toc_single_entry *te);
 
 static int	scd_probe(struct isa_device *dev);
 static int	scd_attach(struct isa_device *dev);
-struct	isa_driver	scddriver = { scd_probe, scd_attach, "scd" };
+struct	isa_driver	scddriver = {
+	INTR_TYPE_BIO,
+	scd_probe,
+	scd_attach,
+	"scd"
+};
+COMPAT_ISA_DRIVER(scd, scddriver);
 
 /* For canceling our timeout */
 static struct callout_handle tohandle = CALLOUT_HANDLE_INITIALIZER(&tohanle);
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 77e21ebdf6ce..9af963ba4c8e 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -67,6 +67,7 @@
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #ifdef NETGRAPH
@@ -89,6 +90,10 @@
 #endif /* NETGRAPH */
 /* #define USE_MODEMCK */
 
+#ifndef COMPAT_OLDISA
+#error "The sr device requires the old isa compatibility shims"
+#endif
+
 #ifndef BUGGY
 #define BUGGY		0
 #endif
@@ -254,7 +259,13 @@ static int sr_irqtable[16] = {
 static int	srprobe(struct isa_device *id);
 static int	srattach_isa(struct isa_device *id);
 
-struct	isa_driver srdriver = {srprobe, srattach_isa, "sr"};
+struct	isa_driver srdriver = {
+	INTR_TYPE_NET,
+	srprobe,
+	srattach_isa,
+	"sr"
+};
+COMPAT_ISA_DRIVER(sr, srdriver);
 
 /*
  * Baud Rate table for Sync Mode.
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 77e21ebdf6ce..9af963ba4c8e 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -67,6 +67,7 @@
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/socket.h>
+#include <sys/bus.h>
 
 #include <net/if.h>
 #ifdef NETGRAPH
@@ -89,6 +90,10 @@
 #endif /* NETGRAPH */
 /* #define USE_MODEMCK */
 
+#ifndef COMPAT_OLDISA
+#error "The sr device requires the old isa compatibility shims"
+#endif
+
 #ifndef BUGGY
 #define BUGGY		0
 #endif
@@ -254,7 +259,13 @@ static int sr_irqtable[16] = {
 static int	srprobe(struct isa_device *id);
 static int	srattach_isa(struct isa_device *id);
 
-struct	isa_driver srdriver = {srprobe, srattach_isa, "sr"};
+struct	isa_driver srdriver = {
+	INTR_TYPE_NET,
+	srprobe,
+	srattach_isa,
+	"sr"
+};
+COMPAT_ISA_DRIVER(sr, srdriver);
 
 /*
  * Baud Rate table for Sync Mode.
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 44f2849d9bbe..97a36d7f71c9 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -194,13 +194,14 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
+#include <sys/bus.h>
 
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
 
 #include <net/ethernet.h>
@@ -227,6 +228,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <i386/isa/if_wl.h>
 #include <machine/if_wl_wavelan.h>
 
+#ifndef COMPAT_OLDISA
+#error "The wl device requires the old isa compatibility shims"
+#endif
+
 static char	t_packet[ETHERMTU + sizeof(struct ether_header) + sizeof(long)];
 
 struct wl_softc{ 
@@ -263,8 +268,13 @@ static int	wlprobe(struct isa_device *);
 static int	wlattach(struct isa_device *);
 
 struct isa_driver wldriver = {
-    wlprobe, wlattach, "wl", 0
+	INTR_TYPE_NET,
+	wlprobe,
+	wlattach,
+	"wl",
+	0
 };
+COMPAT_ISA_DRIVER(wl, wldriver);
 
 /*
  * XXX  The Wavelan appears to be prone to dropping stuff if you talk to