diff options
| author | cgd <cgd@NetBSD.org> | 1995-04-17 12:06:30 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 1995-04-17 12:06:30 +0000 |
| commit | 8a640328edd60eb5a19fc29a8847efd3baeb4fa8 (patch) | |
| tree | 8f8ab3df0b9f5b324f7c9ac9288e1c3123eb36a5 /sys/dev/isa/rtfps.c | |
| parent | 78ec8e770169b76edc642d16e220a93f577713f9 (diff) | |
clean up several ISA device interfaces: autoconfiguration, header
inclusion, and interrupt configuration. more work still needs to be done,
but it's getting better...
Diffstat (limited to 'sys/dev/isa/rtfps.c')
| -rw-r--r-- | sys/dev/isa/rtfps.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c index 2c6d9899343..af1f506f778 100644 --- a/sys/dev/isa/rtfps.c +++ b/sys/dev/isa/rtfps.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtfps.c,v 1.11 1995/01/04 00:47:58 mycroft Exp $ */ +/* $NetBSD: rtfps.c,v 1.12 1995/04/17 12:09:22 cgd Exp $ */ /* * Copyright (c) 1995 Charles Hannum. All rights reserved. @@ -37,11 +37,11 @@ #include <machine/pio.h> -#include <i386/isa/isavar.h> +#include <dev/isa/isavar.h> struct rtfps_softc { struct device sc_dev; - struct intrhand sc_ih; + void *sc_ih; int sc_iobase; int sc_irqport; @@ -51,7 +51,7 @@ struct rtfps_softc { int rtfpsprobe(); void rtfpsattach(); -int rtfpsintr __P((struct rtfps_softc *)); +int rtfpsintr __P((void *)); struct cfdriver rtfpscd = { NULL, "rtfps", rtfpsprobe, rtfpsattach, DV_TTY, sizeof(struct rtfps_softc) @@ -145,16 +145,15 @@ rtfpsattach(parent, self, aux) } } - sc->sc_ih.ih_fun = rtfpsintr; - sc->sc_ih.ih_arg = sc; - sc->sc_ih.ih_level = IPL_TTY; - intr_establish(ia->ia_irq, IST_EDGE, &sc->sc_ih); + sc->sc_ih = isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_TTY, + rtfpsintr, sc); } int -rtfpsintr(sc) - struct rtfps_softc *sc; +rtfpsintr(arg) + void *arg; { + struct rtfps_softc *sc = arg; int iobase = sc->sc_iobase; int alive = sc->sc_alive; |
