diff options
| author | Nate Lawson <njl@FreeBSD.org> | 2004-03-17 17:50:55 +0000 |
|---|---|---|
| committer | Nate Lawson <njl@FreeBSD.org> | 2004-03-17 17:50:55 +0000 |
| commit | 5f96beb9e08be2b08309a6b98967246b64272ade (patch) | |
| tree | a1c3f00139d832c8e80338cfc56c8b1aaffd88ab /sys/dev/si | |
| parent | 902aa2e784bda6cef99fb99db6acd4f435a3ff09 (diff) | |
Notes
Diffstat (limited to 'sys/dev/si')
| -rw-r--r-- | sys/dev/si/si_eisa.c | 15 | ||||
| -rw-r--r-- | sys/dev/si/si_isa.c | 11 | ||||
| -rw-r--r-- | sys/dev/si/si_pci.c | 11 |
3 files changed, 19 insertions, 18 deletions
diff --git a/sys/dev/si/si_eisa.c b/sys/dev/si/si_eisa.c index fe42c238babc..f86f534c27ec 100644 --- a/sys/dev/si/si_eisa.c +++ b/sys/dev/si/si_eisa.c @@ -73,9 +73,8 @@ si_eisa_attach(device_t dev) sc->sc_type = SIEISA; sc->sc_port_rid = 0; - sc->sc_port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, - &sc->sc_port_rid, - 0, ~0, 1, RF_ACTIVE); + sc->sc_port_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, + &sc->sc_port_rid, RF_ACTIVE); if (!sc->sc_port_res) { device_printf(dev, "couldn't allocate ioports\n"); goto fail; @@ -83,9 +82,8 @@ si_eisa_attach(device_t dev) sc->sc_iobase = rman_get_start(sc->sc_port_res); sc->sc_mem_rid = 0; - sc->sc_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->sc_mem_rid, - 0, ~0, 1, RF_ACTIVE); + sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->sc_mem_rid, RF_ACTIVE); if (!sc->sc_mem_res) { device_printf(dev, "couldn't allocate iomemory"); goto fail; @@ -94,8 +92,9 @@ si_eisa_attach(device_t dev) sc->sc_maddr = rman_get_virtual(sc->sc_mem_res); sc->sc_irq_rid = 0; - sc->sc_irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_irq_rid, - 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); + sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->sc_irq_rid, + RF_ACTIVE | RF_SHAREABLE); if (!sc->sc_irq_res) { device_printf(dev, "couldn't allocate interrupt"); goto fail; diff --git a/sys/dev/si/si_isa.c b/sys/dev/si/si_isa.c index 2defec798fd0..e9974a892b72 100644 --- a/sys/dev/si/si_isa.c +++ b/sys/dev/si/si_isa.c @@ -271,9 +271,9 @@ si_isa_attach(device_t dev) sc = device_get_softc(dev); sc->sc_mem_rid = 0; - sc->sc_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->sc_mem_rid, - 0, ~0, 1, RF_ACTIVE); + sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->sc_mem_rid, + RF_ACTIVE); if (!sc->sc_mem_res) { device_printf(dev, "couldn't map memory\n"); goto fail; @@ -282,8 +282,9 @@ si_isa_attach(device_t dev) sc->sc_maddr = rman_get_virtual(sc->sc_mem_res); sc->sc_irq_rid = 0; - sc->sc_irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_irq_rid, - 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); + sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->sc_irq_rid, + RF_ACTIVE | RF_SHAREABLE); if (!sc->sc_irq_res) { device_printf(dev, "couldn't allocate interrupt\n"); goto fail; diff --git a/sys/dev/si/si_pci.c b/sys/dev/si/si_pci.c index 397b2f041b70..c72b94dc9393 100644 --- a/sys/dev/si/si_pci.c +++ b/sys/dev/si/si_pci.c @@ -77,9 +77,9 @@ si_pci_attach(device_t dev) break; } - sc->sc_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->sc_mem_rid, - 0, ~0, 1, RF_ACTIVE); + sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->sc_mem_rid, + RF_ACTIVE); if (!sc->sc_mem_res) { device_printf(dev, "couldn't map memory\n"); goto fail; @@ -88,8 +88,9 @@ si_pci_attach(device_t dev) sc->sc_maddr = rman_get_virtual(sc->sc_mem_res); sc->sc_irq_rid = 0; - sc->sc_irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_irq_rid, - 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); + sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->sc_irq_rid, + RF_ACTIVE | RF_SHAREABLE); if (!sc->sc_irq_res) { device_printf(dev, "couldn't map interrupt\n"); goto fail; |