diff options
| author | Matthew N. Dodd <mdodd@FreeBSD.org> | 1999-08-01 22:57:09 +0000 |
|---|---|---|
| committer | Matthew N. Dodd <mdodd@FreeBSD.org> | 1999-08-01 22:57:09 +0000 |
| commit | 0d6ab4a16a8d61a4fbb5235daa4742f5ea429850 (patch) | |
| tree | 7fa39dc51e29a13517622d2adc571092d72a53b7 /sys/dev/aic7xxx/ahc_eisa.c | |
| parent | cc5aedfb1a1217f597900cca1923d625ea3514bc (diff) | |
| download | src-0d6ab4a16a8d61a4fbb5235daa4742f5ea429850.tar.gz src-0d6ab4a16a8d61a4fbb5235daa4742f5ea429850.zip | |
Move the specification of EDGE/LEVEL triggered interrupts to
eisa_add_intr() which now takes an additional arguement (one of
EISA_TRIGGER_LEVEL or EISA_TRIGGER_EDGE).
The flag RR_SHAREABLE has no effect when passed to
bus_alloc_resource(dev, SYS_RES_IRQ, ...) in an EISA device context as
the eisa_alloc_resource() call (bus_alloc_resource method) now deals
with this flag directly, depending on the device ivars.
This change does nothing more than move all the 'shared = inb(foo + iobsse)'
nonesense to the device probe methods rather than the device attach.
Also, print out 'edge' or 'level' in the IRQ announcement message.
Reviewed by: dfr
Notes
Notes:
svn path=/head/; revision=49360
Diffstat (limited to 'sys/dev/aic7xxx/ahc_eisa.c')
| -rw-r--r-- | sys/dev/aic7xxx/ahc_eisa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c index 95c9f4f3ba49..f11d563c7084 100644 --- a/sys/dev/aic7xxx/ahc_eisa.c +++ b/sys/dev/aic7xxx/ahc_eisa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_eisa.c,v 1.9 1999/05/17 21:51:41 gibbs Exp $ + * $Id: ahc_eisa.c,v 1.10 1999/05/17 21:56:00 gibbs Exp $ */ #include "eisa.h" @@ -97,6 +97,7 @@ aic7770_probe(device_t dev) u_int32_t irq; u_int8_t intdef; u_int8_t hcntrl; + int shared; desc = aic7770_match(eisa_get_id(dev)); if (!desc) @@ -113,6 +114,7 @@ aic7770_probe(device_t dev) eisa_add_iospace(dev, iobase, AHC_EISA_IOSIZE, RESVADDR_NONE); intdef = inb(INTDEF + iobase); + shared = (intdef & 0x80) ? EISA_TRIGGER_EDGE : EISA_TRIGGER_LEVEL; irq = intdef & 0xf; switch (irq) { case 9: @@ -132,7 +134,7 @@ aic7770_probe(device_t dev) if (irq == 0) return ENXIO; - eisa_add_intr(dev, irq); + eisa_add_intr(dev, irq, shared); return 0; } @@ -145,7 +147,6 @@ aic7770_attach(device_t dev) struct ahc_softc *ahc; struct resource *io; int error, rid; - int shared; rid = 0; io = NULL; @@ -205,10 +206,9 @@ aic7770_attach(device_t dev) * The IRQMS bit enables level sensitive interrupts. Only allow * IRQ sharing if it's set. */ - shared = (ahc->pause & IRQMS) ? RF_SHAREABLE : 0; rid = 0; ahc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, - 0, ~0, 1, shared | RF_ACTIVE); + 0, ~0, 1, RF_ACTIVE); if (ahc->irq == NULL) { device_printf(dev, "Can't allocate interrupt\n"); goto bad; |