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/dev/wi | |
| 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/dev/wi')
| -rw-r--r-- | sys/dev/wi/if_wi.c | 8 | ||||
| -rw-r--r-- | sys/dev/wi/if_wi_pci.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c index 6792136..d8a83a2 100644 --- a/sys/dev/wi/if_wi.c +++ b/sys/dev/wi/if_wi.c @@ -2841,8 +2841,8 @@ wi_alloc(device_t dev, int rid) sc->wi_bhandle = rman_get_bushandle(sc->iobase); } else { sc->mem_rid = rid; - sc->mem = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->mem_rid, 0, ~0, 1, RF_ACTIVE); + sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->mem_rid, RF_ACTIVE); if (!sc->mem) { device_printf(dev, "No Mem space on prism2.5?\n"); @@ -2855,8 +2855,8 @@ wi_alloc(device_t dev, int rid) sc->irq_rid = 0; - sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irq_rid, - 0, ~0, 1, RF_ACTIVE | + sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid, + RF_ACTIVE | ((sc->wi_bus_type == WI_BUS_PCCARD) ? 0 : RF_SHAREABLE)); if (!sc->irq) { diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c index 6639fc1..89c9d97 100644 --- a/sys/dev/wi/if_wi_pci.c +++ b/sys/dev/wi/if_wi_pci.c @@ -166,8 +166,8 @@ wi_pci_attach(device_t dev) /* We have to do a magic PLX poke to enable interrupts */ sc->local_rid = WI_PCI_LOCALRES; - sc->local = bus_alloc_resource(dev, SYS_RES_IOPORT, - &sc->local_rid, 0, ~0, 1, RF_ACTIVE); + sc->local = bus_alloc_resource_any(dev, SYS_RES_IOPORT, + &sc->local_rid, RF_ACTIVE); sc->wi_localtag = rman_get_bustag(sc->local); sc->wi_localhandle = rman_get_bushandle(sc->local); command = bus_space_read_4(sc->wi_localtag, sc->wi_localhandle, @@ -180,8 +180,8 @@ wi_pci_attach(device_t dev) sc->local = NULL; sc->mem_rid = WI_PCI_MEMRES; - sc->mem = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->mem_rid, - 0, ~0, 1, RF_ACTIVE); + sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->mem_rid, RF_ACTIVE); if (sc->mem == NULL) { device_printf(dev, "couldn't allocate memory\n"); wi_free(dev); |
