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/dev/sr | |
| 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/dev/sr')
| -rw-r--r-- | sys/dev/sr/if_sr.c | 13 | ||||
| -rw-r--r-- | sys/dev/sr/if_sr_isa.c | 13 |
2 files changed, 24 insertions, 2 deletions
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. |
