diff options
Diffstat (limited to 'sys/dev/zs')
| -rw-r--r-- | sys/dev/zs/zs_macio.c | 12 | ||||
| -rw-r--r-- | sys/dev/zs/zs_sbus.c | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/zs/zs_macio.c b/sys/dev/zs/zs_macio.c index 264563f..7d4e179 100644 --- a/sys/dev/zs/zs_macio.c +++ b/sys/dev/zs/zs_macio.c @@ -146,15 +146,15 @@ zs_macio_attach(device_t dev) sc = device_get_softc(dev); reg = macio_get_regs(dev); - sc->sc_memres = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->sc_memrid, - 0, ~1, 1, RF_ACTIVE); + sc->sc_memres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->sc_memrid, RF_ACTIVE); if (sc->sc_memres == NULL) { device_printf(dev, "could not allocate memory\n"); goto error; } sc->sc_irqrid1 = 0; - sc->sc_irqres1 = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_irqrid1, - 0, ~0, 1, RF_ACTIVE); + sc->sc_irqres1 = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->sc_irqrid1, RF_ACTIVE); if (sc->sc_irqres1 == NULL) { device_printf(dev, "could not allocate interrupt 1\n"); goto error; @@ -165,8 +165,8 @@ zs_macio_attach(device_t dev) goto error; } sc->sc_irqrid2 = 1; - sc->sc_irqres2 = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_irqrid2, - 0, ~0, 1, RF_ACTIVE); + sc->sc_irqres2 = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->sc_irqrid2, RF_ACTIVE); if (sc->sc_irqres2 == NULL) { device_printf(dev, "could not allocate interrupt 2\n"); goto error; diff --git a/sys/dev/zs/zs_sbus.c b/sys/dev/zs/zs_sbus.c index b98a1f6..f55ccc0 100644 --- a/sys/dev/zs/zs_sbus.c +++ b/sys/dev/zs/zs_sbus.c @@ -193,13 +193,13 @@ zs_fhc_attach(device_t dev) struct zs_sbus_softc *sc; sc = device_get_softc(dev); - sc->sc_memres = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->sc_memrid, - 0, ~0, 1, RF_ACTIVE); + sc->sc_memres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->sc_memrid, RF_ACTIVE); if (sc->sc_memres == NULL) goto error; sc->sc_irqrid = FHC_UART; - sc->sc_irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_irqrid, 0, - ~0, 1, RF_ACTIVE); + sc->sc_irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->sc_irqrid, RF_ACTIVE); if (sc->sc_irqres == NULL) goto error; if (bus_setup_intr(dev, sc->sc_irqres, INTR_TYPE_TTY | INTR_FAST, @@ -220,12 +220,12 @@ zs_sbus_attach(device_t dev) struct zs_sbus_softc *sc; sc = device_get_softc(dev); - sc->sc_memres = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->sc_memrid, - 0, ~0, 1, RF_ACTIVE); + sc->sc_memres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->sc_memrid, RF_ACTIVE); if (sc->sc_memres == NULL) goto error; - sc->sc_irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_irqrid, 0, - ~0, 1, RF_ACTIVE); + sc->sc_irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->sc_irqrid, RF_ACTIVE); if (sc->sc_irqres == NULL) goto error; if (bus_setup_intr(dev, sc->sc_irqres, INTR_TYPE_TTY | INTR_FAST, |
