diff options
Diffstat (limited to 'sys/dev/ata')
-rw-r--r-- | sys/dev/ata/ata-all.c | 4 | ||||
-rw-r--r-- | sys/dev/ata/ata-cbus.c | 4 | ||||
-rw-r--r-- | sys/dev/ata/ata-chipset.c | 28 | ||||
-rw-r--r-- | sys/dev/ata/ata-pci.c | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 8fff15a..f94f977 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -140,8 +140,8 @@ ata_attach(device_t dev) return ENXIO; rid = ATA_IRQ_RID; - ch->r_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE); + ch->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE); if (!ch->r_irq) { ata_printf(ch, -1, "unable to allocate interrupt\n"); return ENXIO; diff --git a/sys/dev/ata/ata-cbus.c b/sys/dev/ata/ata-cbus.c index 008883a..54569ca 100644 --- a/sys/dev/ata/ata-cbus.c +++ b/sys/dev/ata/ata-cbus.c @@ -136,8 +136,8 @@ ata_cbus_attach(device_t dev) } rid = ATA_IRQ_RID; - if (!(ctlr->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, - 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE))) { + if (!(ctlr->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE | RF_SHAREABLE))) { device_printf(dev, "unable to alloc interrupt\n"); bus_release_resource(dev, SYS_RES_IOPORT, ATA_IOADDR_RID, ctlr->io); bus_release_resource(dev, SYS_RES_IOPORT, ATA_ALTADDR_RID, ctlr->altio); diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c index 4bc172a..659bce0 100644 --- a/sys/dev/ata/ata-chipset.c +++ b/sys/dev/ata/ata-chipset.c @@ -218,8 +218,8 @@ ata_acard_chipinit(device_t dev) struct ata_pci_controller *ctlr = device_get_softc(dev); int rid = ATA_IRQ_RID; - if (!(ctlr->r_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE))) { + if (!(ctlr->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE))) { device_printf(dev, "unable to map interrupt\n"); return ENXIO; } @@ -660,8 +660,8 @@ ata_highpoint_chipinit(device_t dev) struct ata_pci_controller *ctlr = device_get_softc(dev); int rid = ATA_IRQ_RID; - if (!(ctlr->r_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE))) { + if (!(ctlr->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE))) { device_printf(dev, "unable to map interrupt\n"); return ENXIO; } @@ -1136,8 +1136,8 @@ ata_promise_chipinit(device_t dev) struct ata_pci_controller *ctlr = device_get_softc(dev); int rid = ATA_IRQ_RID; - if (!(ctlr->r_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE))) { + if (!(ctlr->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE))) { device_printf(dev, "unable to map interrupt\n"); return ENXIO; } @@ -1173,8 +1173,8 @@ ata_promise_chipinit(device_t dev) ctlr->r_type2 = SYS_RES_MEMORY; ctlr->r_rid2 = 0x1c; if (!(ctlr->r_res2 = - bus_alloc_resource(dev, ctlr->r_type2, &ctlr->r_rid2, - 0, ~0, 1, RF_ACTIVE))) + bus_alloc_resource_any(dev, ctlr->r_type2, &ctlr->r_rid2, + RF_ACTIVE))) return ENXIO; ctlr->dmainit = ata_promise_mio_dmainit; @@ -1619,8 +1619,8 @@ ata_sii_chipinit(device_t dev) struct ata_pci_controller *ctlr = device_get_softc(dev); int rid = ATA_IRQ_RID; - if (!(ctlr->r_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE))) { + if (!(ctlr->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE))) { device_printf(dev, "unable to map interrupt\n"); return ENXIO; } @@ -1635,8 +1635,8 @@ ata_sii_chipinit(device_t dev) ctlr->r_type2 = SYS_RES_MEMORY; ctlr->r_rid2 = 0x24; if (!(ctlr->r_res2 = - bus_alloc_resource(dev, ctlr->r_type2, &ctlr->r_rid2, - 0, ~0, 1, RF_ACTIVE))) + bus_alloc_resource_any(dev, ctlr->r_type2, &ctlr->r_rid2, + RF_ACTIVE))) return ENXIO; if (ctlr->chip->cfg2 & SIISETCLK) { @@ -2330,8 +2330,8 @@ ata_setup_interrupt(device_t dev) int rid = ATA_IRQ_RID; if (!ATA_MASTERDEV(dev)) { - if (!(ctlr->r_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, - RF_SHAREABLE | RF_ACTIVE))) { + if (!(ctlr->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_SHAREABLE | RF_ACTIVE))) { device_printf(dev, "unable to map interrupt\n"); return ENXIO; } diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 8fab433..414175f 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -177,8 +177,8 @@ ata_pci_attach(device_t dev) if ((cmd & PCIM_CMD_BUSMASTEREN) == PCIM_CMD_BUSMASTEREN) { ctlr->r_type1 = SYS_RES_IOPORT; ctlr->r_rid1 = ATA_BMADDR_RID; - ctlr->r_res1 = bus_alloc_resource(dev, ctlr->r_type1, &ctlr->r_rid1, - 0, ~0, 1, RF_ACTIVE); + ctlr->r_res1 = bus_alloc_resource_any(dev, ctlr->r_type1, &ctlr->r_rid1, + RF_ACTIVE); } ctlr->chipinit(dev); |