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/cy | |
| 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/cy')
| -rw-r--r-- | sys/dev/cy/cy.c | 11 | ||||
| -rw-r--r-- | sys/dev/cy/cy_isa.c | 11 |
2 files changed, 20 insertions, 2 deletions
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; |
