diff options
| author | njl <njl@FreeBSD.org> | 2004-03-17 17:50:55 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2004-03-17 17:50:55 +0000 |
| commit | 05a1f56fc999f634406946e831eea6deaaa75a99 (patch) | |
| tree | a1c3f00139d832c8e80338cfc56c8b1aaffd88ab /sys/i386/isa | |
| parent | 2283471bb53a546e9d7dfb662c8db5ca06907c85 (diff) | |
| download | FreeBSD-src-05a1f56fc999f634406946e831eea6deaaa75a99.zip FreeBSD-src-05a1f56fc999f634406946e831eea6deaaa75a99.tar.gz | |
Convert callers to the new bus_alloc_resource_any(9) API.
Submitted by: Mark Santcroos <marks@ripe.net>
Reviewed by: imp, dfr, bde
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/atpic.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/if_el.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/mse.c | 3 | ||||
| -rw-r--r-- | sys/i386/isa/spic.c | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sys/i386/isa/atpic.c b/sys/i386/isa/atpic.c index 6341286..87b91d8 100644 --- a/sys/i386/isa/atpic.c +++ b/sys/i386/isa/atpic.c @@ -414,7 +414,7 @@ atpic_attach(device_t dev) /* Try to allocate our IRQ and then free it. */ rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, 0); + res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, 0); if (res != NULL) bus_release_resource(dev, SYS_RES_IRQ, rid, res); return (0); diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index 7486374..65ab1c6 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -241,7 +241,7 @@ el_attach(device_t dev) return(ENXIO); rid = 0; - sc->el_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, + sc->el_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); if (sc->el_irq == NULL) { diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index 8cd40f1..3f4acc5 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -331,8 +331,7 @@ mse_attach(dev) MSE_IOSIZE, RF_ACTIVE); if (sc->sc_port == NULL) return ENXIO; - sc->sc_intr = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_ACTIVE); + sc->sc_intr = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (sc->sc_intr == NULL) { bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port); return ENXIO; diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c index a649f13..98fc8ab 100644 --- a/sys/i386/isa/spic.c +++ b/sys/i386/isa/spic.c @@ -240,8 +240,8 @@ spic_probe(device_t dev) sc->sc_port_addr = (u_short)rman_get_start(sc->sc_port_res); #ifdef notyet - if (!(sc->sc_intr_res = bus_alloc_resource(dev, SYS_RES_IRQ, - &sc->sc_intr_rid, 0, ~0, 1, RF_ACTIVE))) { + if (!(sc->sc_intr_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->sc_intr_rid, RF_ACTIVE))) { device_printf(dev,"Couldn't map IRQ\n"); bus_release_resource(dev, SYS_RES_IOPORT, sc->sc_port_rid, sc->sc_port_res); |
