diff options
| author | dfr <dfr@FreeBSD.org> | 1999-05-08 21:59:43 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1999-05-08 21:59:43 +0000 |
| commit | e4989c23fe81c5060ef3a4e0e3bb1bb4430d1a76 (patch) | |
| tree | ba748fea961d917292e2b4a959796c7415efbf31 /sys/alpha/isa | |
| parent | d1098a6692d3c3b23bc870a491d680451c3356a7 (diff) | |
| download | FreeBSD-src-e4989c23fe81c5060ef3a4e0e3bb1bb4430d1a76.zip FreeBSD-src-e4989c23fe81c5060ef3a4e0e3bb1bb4430d1a76.tar.gz | |
Move the declaration of the interrupt type from the driver structure
to the BUS_SETUP_INTR call.
Diffstat (limited to 'sys/alpha/isa')
| -rw-r--r-- | sys/alpha/isa/isa.c | 5 | ||||
| -rw-r--r-- | sys/alpha/isa/isavar.h | 5 | ||||
| -rw-r--r-- | sys/alpha/isa/mcclock_isa.c | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c index db1104c..6e01cec 100644 --- a/sys/alpha/isa/isa.c +++ b/sys/alpha/isa/isa.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa.c,v 1.10 1999/04/16 21:21:37 peter Exp $ + * $Id: isa.c,v 1.11 1999/04/21 07:26:23 peter Exp $ */ #include <sys/param.h> @@ -105,7 +105,6 @@ static device_method_t isa_methods[] = { static driver_t isa_driver = { "isa", isa_methods, - DRIVER_TYPE_MISC, 1, /* no softc */ }; @@ -680,7 +679,7 @@ isa_handle_intr(void *arg) int isa_setup_intr(device_t dev, device_t child, - struct resource *irq, + struct resource *irq, int flags, driver_intr_t *intr, void *arg, void **cookiep) { struct isa_intr *ii; diff --git a/sys/alpha/isa/isavar.h b/sys/alpha/isa/isavar.h index ce0e8ce..0eee66e 100644 --- a/sys/alpha/isa/isavar.h +++ b/sys/alpha/isa/isavar.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: isavar.h,v 1.1 1999/04/16 21:21:37 peter Exp $ */ /* @@ -33,7 +33,8 @@ void isa_init_intr(void); struct resource *isa_alloc_intr(device_t bus, device_t child, int irq); int isa_release_intr(device_t bus, device_t child, struct resource *r); -int isa_setup_intr(device_t dev, device_t child, struct resource *irq, +int isa_setup_intr(device_t dev, device_t child, + struct resource *irq, int flags, driver_intr_t *intr, void *arg, void **cookiep); int isa_teardown_intr(device_t dev, device_t child, struct resource *irq, void *cookie); diff --git a/sys/alpha/isa/mcclock_isa.c b/sys/alpha/isa/mcclock_isa.c index 08345f2..3c6ca80 100644 --- a/sys/alpha/isa/mcclock_isa.c +++ b/sys/alpha/isa/mcclock_isa.c @@ -1,4 +1,4 @@ -/* $Id: mcclock_isa.c,v 1.2 1998/07/22 08:30:25 dfr Exp $ */ +/* $Id: mcclock_isa.c,v 1.3 1998/07/31 09:20:35 dfr Exp $ */ /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */ /* @@ -68,7 +68,6 @@ static device_method_t mcclock_isa_methods[] = { static driver_t mcclock_isa_driver = { "mcclock", mcclock_isa_methods, - DRIVER_TYPE_MISC, 1, /* XXX no softc */ }; |
