diff options
Diffstat (limited to 'sys/pccard')
| -rw-r--r-- | sys/pccard/mecia.c | 2 | ||||
| -rw-r--r-- | sys/pccard/pcic_pci.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/pccard/mecia.c b/sys/pccard/mecia.c index f3c5b11..07e58ca 100644 --- a/sys/pccard/mecia.c +++ b/sys/pccard/mecia.c @@ -153,7 +153,7 @@ mecia_attach(device_t dev) validunits++; rid = 0; - r = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE); + r = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); if (!r) return (ENXIO); diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c index c145f92..d6a52e2 100644 --- a/sys/pccard/pcic_pci.c +++ b/sys/pccard/pcic_pci.c @@ -1141,7 +1141,7 @@ pcic_pci_probe(device_t dev) pci_write_config(dev, PCIR_INTLINE, 255, 1); } #endif - res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, + res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (res) bus_release_resource(dev, SYS_RES_IRQ, rid, res); @@ -1249,8 +1249,8 @@ pcic_pci_attach(device_t dev) sockbase = pci_read_config(dev, 0x10, 4); if (sockbase & 0x1) { sc->iorid = CB_PCI_SOCKET_BASE; - sc->iores = bus_alloc_resource(dev, SYS_RES_IOPORT, - &sc->iorid, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); + sc->iores = bus_alloc_resource_any(dev, SYS_RES_IOPORT, + &sc->iorid, RF_ACTIVE | RF_SHAREABLE); if (sc->iores == NULL) return (ENOMEM); @@ -1281,8 +1281,8 @@ pcic_pci_attach(device_t dev) intr = pcic_isa_intr; } else { sc->memrid = CB_PCI_SOCKET_BASE; - sc->memres = bus_alloc_resource(dev, SYS_RES_MEMORY, - &sc->memrid, 0, ~0, 1, RF_ACTIVE); + sc->memres = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->memrid, RF_ACTIVE); if (sc->memres == NULL && pcic_pci_get_memory(dev) != 0) return (ENOMEM); sp->getb = pcic_pci_getb2; @@ -1317,7 +1317,7 @@ pcic_pci_attach(device_t dev) if (sc->csc_route == pcic_iw_pci) { rid = 0; - r = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, + r = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE | RF_SHAREABLE); if (r == NULL) { sc->csc_route = pcic_iw_isa; |
