diff options
author | peter <peter@FreeBSD.org> | 2000-05-28 13:40:48 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-05-28 13:40:48 +0000 |
commit | da78ae6c9675a977414b94dce05e10ea7794242c (patch) | |
tree | b698cb70726751826f1f715167f5f658303053f2 /sys | |
parent | 8a48a8126ed656b68c8dd9d9f7dc0626b8a25ec1 (diff) | |
download | FreeBSD-src-da78ae6c9675a977414b94dce05e10ea7794242c.zip FreeBSD-src-da78ae6c9675a977414b94dce05e10ea7794242c.tar.gz |
Mass update of isa drivers using compatability shims to use
COMPAT_ISA_DRIVER() so that we can get rid of the evil isa_compat.h table.
Diffstat (limited to 'sys')
44 files changed, 446 insertions, 57 deletions
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c index 0c21d69..c9f3bbe 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 0c21d69..c9f3bbe 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 dfeb69a..52a8cf3 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 dfeb69a..52a8cf3 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 3755c43..5b778ad 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 18122f0..a31ff9c 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 821c80b..5a73a67 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 c4c4eca..2144891 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 aeb5e4c..23446f7 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 ce6dab2..29ade03 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 bc846d5..a858496 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 7c83434..a0214bd 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 77e21eb..9af963b 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 77e21eb..9af963b 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 44f2849..97a36d7 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 diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index 3755c43..5b778ad 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/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/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c index 18122f0..a31ff9c 100644 --- a/sys/gnu/i386/isa/dgm.c +++ b/sys/gnu/i386/isa/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/i386/isa/asc.c b/sys/i386/isa/asc.c index 1658d38..8b09619 100644 --- a/sys/i386/isa/asc.c +++ b/sys/i386/isa/asc.c @@ -47,6 +47,7 @@ #include <sys/poll.h> #include <sys/select.h> #include <sys/uio.h> +#include <sys/bus.h> #include <machine/asc_ioctl.h> @@ -54,6 +55,10 @@ #include <i386/isa/isa_device.h> #include <i386/isa/ascreg.h> +#ifndef COMPAT_OLDISA +#error "The asc device requires the old isa compatibility shims" +#endif + /*** *** CONSTANTS & DEFINES *** @@ -173,7 +178,14 @@ static struct asc_unit unittab[NASC]; ***/ static int ascprobe (struct isa_device *isdp); static int ascattach(struct isa_device *isdp); -struct isa_driver ascdriver = { ascprobe, ascattach, "asc" }; + +struct isa_driver ascdriver = { + INTR_TYPE_TTY, + ascprobe, + ascattach, + "asc" +}; +COMPAT_ISA_DRIVER(asc, ascdriver); static ointhand2_t ascintr; diff --git a/sys/i386/isa/bs/bsif.c b/sys/i386/isa/bs/bsif.c index 6c8664f..12d20f8 100644 --- a/sys/i386/isa/bs/bsif.c +++ b/sys/i386/isa/bs/bsif.c @@ -42,6 +42,7 @@ #include "opt_pc98.h" #include "bs.h" #include <i386/isa/bs/bsif.h> +#include <sys/bus.h> #endif /* __FreeBSD__ */ #include <sys/bio.h> @@ -88,10 +89,12 @@ static ointhand2_t bsintr; static int bs_dmarangecheck __P((caddr_t, unsigned)); struct isa_driver bsdriver = { + INTR_TYPE_CAM, bsprobe, bsattach, "bs" }; +COMPAT_ISA_DRIVER(bs, bsdriver); #if 0 struct scsi_device bs_dev = { NULL, /* Use default error handler */ diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c index 898b298..b8a2ea2 100644 --- a/sys/i386/isa/ctx.c +++ b/sys/i386/isa/ctx.c @@ -112,14 +112,20 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/conf.h> #include <sys/uio.h> #include <sys/malloc.h> +#include <sys/bus.h> #include <i386/isa/isa_device.h> #include <i386/isa/ctxreg.h> #include <machine/ioctl_ctx.h> #include <machine/md_var.h> +#ifndef COMPAT_OLDISA +#error "The ctx device requires the old isa compatibility shims" +#endif + static int waitvb(int port); /* state flags */ @@ -129,7 +135,13 @@ static int waitvb(int port); static int ctxprobe __P((struct isa_device *devp)); static int ctxattach __P((struct isa_device *devp)); -struct isa_driver ctxdriver = {ctxprobe, ctxattach, "ctx"}; +struct isa_driver ctxdriver = { + INTR_TYPE_MISC, + ctxprobe, + ctxattach, + "ctx" +}; +COMPAT_ISA_DRIVER(ctx, ctxdriver); static d_open_t ctxopen; static d_close_t ctxclose; diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index dfeb69a..52a8cf3 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/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/i386/isa/gpib.c b/sys/i386/isa/gpib.c index f78ddd6..1463373 100644 --- a/sys/i386/isa/gpib.c +++ b/sys/i386/isa/gpib.c @@ -23,13 +23,19 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/conf.h> #include <sys/uio.h> #include <sys/malloc.h> +#include <sys/bus.h> #include <i386/isa/gpibreg.h> #include <i386/isa/gpib.h> #include <i386/isa/isa_device.h> +#ifndef COMPAT_OLDISA +#error "The gpib device requires the old isa compatibility shims" +#endif + #define MIN(a,b) ((a < b) ? a : b) #define GPIBPRI (PZERO+8)|PCATCH @@ -57,7 +63,13 @@ static char spoll(unsigned char device); static int gpprobe(struct isa_device *dvp); static int gpattach(struct isa_device *dvp); -struct isa_driver gpdriver = {gpprobe, gpattach, "gp"}; +struct isa_driver gpdriver = { + INTR_TYPE_TTY, + gpprobe, + gpattach, + "gp" +}; +COMPAT_ISA_DRIVER(gp, gpdriver); static d_open_t gpopen; static d_close_t gpclose; diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c index d487e53..dd2925d 100644 --- a/sys/i386/isa/gsc.c +++ b/sys/i386/isa/gsc.c @@ -42,6 +42,7 @@ #include <sys/malloc.h> #include <sys/kernel.h> #include <sys/uio.h> +#include <sys/bus.h> #include <machine/gsc.h> @@ -49,6 +50,10 @@ #include <i386/isa/isa_device.h> #include <i386/isa/gscreg.h> +#ifndef COMPAT_OLDISA +#error "The gsc device requires the old isa compatibility shims" +#endif + /*********************************************************************** * * CONSTANTS & DEFINES @@ -175,7 +180,13 @@ static struct gsc_unit unittab[NGSC]; static int gscprobe (struct isa_device *isdp); static int gscattach(struct isa_device *isdp); -struct isa_driver gscdriver = { gscprobe, gscattach, "gsc" }; +struct isa_driver gscdriver = { + INTR_TYPE_TTY, + gscprobe, + gscattach, + "gsc" +}; +COMPAT_ISA_DRIVER(gsc, gscdriver); static d_open_t gscopen; static d_close_t gscclose; diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c index 0c21d69..c9f3bbe 100644 --- a/sys/i386/isa/if_ar.c +++ b/sys/i386/isa/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/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c index ac68d97..7e22487 100644 --- a/sys/i386/isa/if_cx.c +++ b/sys/i386/isa/if_cx.c @@ -35,12 +35,18 @@ #include <sys/sockio.h> #include <sys/socket.h> #include <sys/conf.h> +#include <sys/bus.h> #include <net/if.h> #include <net/bpf.h> #include <i386/isa/isa_device.h> + +#ifndef COMPAT_OLDISA +#error "The cx device requires the old isa compatibility shims" +#endif + #define watchdog_func_t void(*)(struct ifnet *) #define start_func_t void(*)(struct ifnet*) @@ -294,7 +300,13 @@ cxattach (struct isa_device *id) return (1); } -struct isa_driver cxdriver = { cxprobe, cxattach, "cx" }; +struct isa_driver cxdriver = { + INTR_TYPE_NET, + cxprobe, + cxattach, + "cx" +}; +COMPAT_ISA_DRIVER(cx, cxdriver); /* * Process an ioctl request. diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index bbe0940..d19944a 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -25,10 +25,12 @@ #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/bus.h> #include <net/ethernet.h> #include <net/if.h> @@ -43,6 +45,10 @@ #include <i386/isa/isa_device.h> #include <i386/isa/if_elreg.h> +#ifndef COMPAT_OLDISA +#error "The el device requires the old isa compatibility shims" +#endif + /* For debugging convenience */ #ifdef EL_DEBUG #define dprintf(x) printf x @@ -75,8 +81,12 @@ static __inline void el_hardreset(void *); /* isa_driver structure for autoconf */ struct isa_driver eldriver = { - el_probe, el_attach, "el" + INTR_TYPE_NET, + el_probe, + el_attach, + "el" }; +COMPAT_ISA_DRIVER(el, eldriver); /* Probe routine. See if the card is there and at the right place. */ static int diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c index 821c80b..5a73a67 100644 --- a/sys/i386/isa/if_fe.c +++ b/sys/i386/isa/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/i386/isa/if_le.c b/sys/i386/isa/if_le.c index 35951a6..7932c74 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -41,10 +41,12 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/malloc.h> +#include <sys/bus.h> #include <net/ethernet.h> #include <net/if.h> @@ -65,6 +67,10 @@ #include <net/bpf.h> +#ifndef COMPAT_OLDISA +#error "The le device requires the old isa compatibility shims" +#endif + /* Forward declarations */ typedef struct le_softc le_softc_t; typedef struct le_board le_board_t; @@ -248,8 +254,12 @@ static const le_board_t le_boards[] = { * This tells the autoconf code how to set us up. */ struct isa_driver ledriver = { - le_probe, le_attach, "le", + INTR_TYPE_NET, + le_probe, + le_attach, + "le", }; +COMPAT_ISA_DRIVER(le, ledriver); static unsigned le_intrs[NLE]; diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c index 5b45c0f..31ad93a 100644 --- a/sys/i386/isa/if_rdp.c +++ b/sys/i386/isa/if_rdp.c @@ -65,10 +65,12 @@ #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/bus.h> #include <net/ethernet.h> #include <net/if.h> @@ -96,6 +98,10 @@ #include <i386/isa/if_rdpreg.h> #include <i386/isa/intr_machdep.h> +#ifndef COMPAT_OLDISA +#error "The rdp device requires the old isa compatibility shims" +#endif + #define IOCTL_CMD_T u_long /* @@ -188,11 +194,13 @@ static void rdp_93c46_cmd(struct rdp_softc *, u_short, unsigned); static u_short rdp_93c46_read(struct rdp_softc *); struct isa_driver rdpdriver = { + INTR_TYPE_NET, rdp_probe, rdp_attach, "rdp", 1 /* we wanna get a chance before lptN */ }; +COMPAT_ISA_DRIVER(rdp, rdpdriver); /* * REDP-specific functions. diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c index 77e21eb..9af963b 100644 --- a/sys/i386/isa/if_sr.c +++ b/sys/i386/isa/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/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c index 44f2849..97a36d7 100644 --- a/sys/i386/isa/if_wl.c +++ b/sys/i386/isa/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 diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c index 816773b..5e2f76d 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -51,6 +51,7 @@ #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/uio.h> +#include <sys/bus.h> #include <machine/clock.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -58,6 +59,10 @@ #include <machine/cdk.h> #include <machine/comstats.h> +#ifndef COMPAT_OLDISA +#error "The stli device requires the old isa compatibility shims" +#endif + /*****************************************************************************/ /* @@ -622,8 +627,12 @@ static char *stli_stalgetmemptr(stlibrd_t *brdp, unsigned long offset, * Declare the driver isa structure. */ struct isa_driver stlidriver = { - stliprobe, stliattach, stli_drvname + INTR_TYPE_TTY, + stliprobe, + stliattach, + stli_drvname }; +COMPAT_ISA_DRIVER(stli, stlidriver); /*****************************************************************************/ diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c index c3c06b7..135a085 100644 --- a/sys/i386/isa/labpc.c +++ b/sys/i386/isa/labpc.c @@ -54,6 +54,7 @@ #define b_actf bio_queue.tqe_next #include <sys/dataacq.h> #include <sys/conf.h> +#include <sys/bus.h> #ifdef LOUTB #include <machine/clock.h> @@ -277,8 +278,14 @@ static struct ctlr **labpcs; /* XXX: Should be dynamic */ static int labpcattach(struct isa_device *dev); static int labpcprobe(struct isa_device *dev); -struct isa_driver labpcdriver = - { labpcprobe, labpcattach, "labpc", 0 }; +struct isa_driver labpcdriver = { + INTR_TYPE_TTY, + labpcprobe, + labpcattach, + "labpc", + 0 +}; +COMPAT_ISA_DRIVER(labpc, labpcdriver); static d_open_t labpcopen; static d_close_t labpcclose; diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c index b4c5daa..577a608 100644 --- a/sys/i386/isa/loran.c +++ b/sys/i386/isa/loran.c @@ -27,6 +27,7 @@ #include <sys/conf.h> #include <sys/kernel.h> #include <sys/uio.h> +#include <sys/bus.h> #include <sys/malloc.h> #include <sys/timetc.h> @@ -619,8 +620,12 @@ SYSCTL_OPAQUE(_debug, OID_AUTO, loran_timecounter, CTLFLAG_RD, /**********************************************************************/ struct isa_driver lorandriver = { - loranprobe, loranattach, "loran" + INTR_TYPE_TTY | INTR_TYPE_FAST, + loranprobe, + loranattach, + "loran" }; +COMPAT_ISA_DRIVER(loran, lorandriver); #define CDEV_MAJOR 94 static struct cdevsw loran_cdevsw = { diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index b056a84..6d105db 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -360,9 +360,14 @@ static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank #include <sys/conf.h> #include <sys/kernel.h> +#include <sys/bus.h> #include <i386/isa/isa_device.h> +#ifndef COMPAT_OLDISA +#error "The matcd device requires the old isa compatibility shims" +#endif + /*--------------------------------------------------------------------------- Defines and structures ---------------------------------------------------------------------------*/ @@ -495,8 +500,13 @@ struct matcd_read2 { static int matcd_probe(struct isa_device *dev); static int matcd_attach(struct isa_device *dev); -struct isa_driver matcddriver={matcd_probe, matcd_attach, - "matcdc"}; +struct isa_driver matcddriver={ + INTR_TYPE_BIO, + matcd_probe, + matcd_attach, + "matcdc" +}; +COMPAT_ISA_DRIVER(matcd, matcddriver); static d_open_t matcdopen; diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index aeb5e4c..23446f7 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/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/i386/isa/rc.c b/sys/i386/isa/rc.c index ce6dab2..29ade03 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/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/i386/isa/rp.c b/sys/i386/isa/rp.c index bc846d5..a858496 100644 --- a/sys/i386/isa/rp.c +++ b/sys/i386/isa/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/i386/isa/scd.c b/sys/i386/isa/scd.c index 7c83434..a0214bd 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/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/i386/isa/spigot.c b/sys/i386/isa/spigot.c index cdb05b7..4c638d5 100644 --- a/sys/i386/isa/spigot.c +++ b/sys/i386/isa/spigot.c @@ -56,10 +56,12 @@ error "Can only have 1 spigot configured." #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/conf.h> #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/mman.h> +#include <sys/bus.h> #include <machine/frame.h> #include <machine/md_var.h> @@ -85,7 +87,13 @@ static struct spigot_softc { static int spigot_probe(struct isa_device *id); static int spigot_attach(struct isa_device *id); -struct isa_driver spigotdriver = {spigot_probe, spigot_attach, "spigot"}; +struct isa_driver spigotdriver = { + INTR_TYPE_MISC, + spigot_probe, + spigot_attach, + "spigot" +}; +COMPAT_ISA_DRIVER(spigot, spigotdriver); static d_open_t spigot_open; static d_close_t spigot_close; diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index 4194878..e6288c9 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -50,6 +50,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/fcntl.h> +#include <sys/bus.h> #include <i386/isa/isa_device.h> #include <i386/isa/ic/scd1400.h> #include <machine/comstats.h> @@ -494,8 +495,12 @@ static void stlpciintr(void * arg); * Declare the driver isa structure. */ struct isa_driver stldriver = { - stlprobe, stlattach, "stl" + INTR_TYPE_TTY, + stlprobe, + stlattach, + "stl" }; +COMPAT_ISA_DRIVER(stl, stldriver); /*****************************************************************************/ diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c index e560dda..212c064 100644 --- a/sys/i386/isa/tw.c +++ b/sys/i386/isa/tw.c @@ -142,12 +142,13 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> #include <sys/kernel.h> +#include <sys/conf.h> #include <sys/uio.h> #include <sys/syslog.h> #include <sys/select.h> #include <sys/poll.h> +#include <sys/bus.h> #define MIN(a,b) ((a)<(b)?(a):(b)) #ifdef HIRESTIME @@ -156,6 +157,10 @@ #include <i386/isa/isa_device.h> +#ifndef COMPAT_OLDISA +#error "The tw device requires the old isa compatibility shims" +#endif + /* * Transmission is done by calling write() to send three byte packets of data. * The first byte contains a four bit house code (0=A to 15=P). @@ -207,8 +212,12 @@ static int twprobe(struct isa_device *idp); static int twattach(struct isa_device *idp); struct isa_driver twdriver = { - twprobe, twattach, "tw" + INTR_TYPE_TTY, + twprobe, + twattach, + "tw" }; +COMPAT_ISA_DRIVER(tw, twdriver); static d_open_t twopen; static d_close_t twclose; diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index c6b46e4..35fd31c 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -67,12 +67,16 @@ #include <sys/malloc.h> #include <sys/mtio.h> #include <sys/conf.h> +#include <sys/bus.h> #include <machine/clock.h> #include <i386/isa/isa_device.h> #include <i386/isa/wtreg.h> +#ifndef COMPAT_OLDISA +#error "The wt device requires the old isa compatibility shims" +#endif /* * Uncomment this to enable internal device tracing. @@ -271,7 +275,13 @@ wtattach (struct isa_device *id) return (1); } -struct isa_driver wtdriver = { wtprobe, wtattach, "wt", }; +struct isa_driver wtdriver = { + INTR_TYPE_BIO, + wtprobe, + wtattach, + "wt", +}; +COMPAT_ISA_DRIVER(wt, wtdriver); /* * Open routine, called on every device open. diff --git a/sys/i4b/tina-dd/i4b_tina_dd.c b/sys/i4b/tina-dd/i4b_tina_dd.c index 5ec784c..fe95a8d 100644 --- a/sys/i4b/tina-dd/i4b_tina_dd.c +++ b/sys/i4b/tina-dd/i4b_tina_dd.c @@ -54,6 +54,7 @@ #include <net/if.h> #ifdef __FreeBSD__ +#include <sys/bus.h> #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> #include <i386/isa/isa_device.h> @@ -67,6 +68,10 @@ #include <i4b/include/i4b_mbuf.h> #include <i4b/tina-dd/i4b_tina_ioctl.h> +#ifndef COMPAT_OLDISA +#error "The tina device requires the old isa compatibility shims" +#endif + static int openflag = 0; int tinaprobe(struct isa_device *dev); @@ -74,11 +79,13 @@ int tinaattach(struct isa_device *dev); void tinaintr(int unit); struct isa_driver tinadriver = { + INTR_TYPE_NET, tinaprobe, tinaattach, "tina", 0 }; +COMPAT_ISA_DRIVER(tina, tinadriver); static struct tina_softc { int sc_unit; |