From 5f96beb9e08be2b08309a6b98967246b64272ade Mon Sep 17 00:00:00 2001 From: Nate Lawson Date: Wed, 17 Mar 2004 17:50:55 +0000 Subject: Convert callers to the new bus_alloc_resource_any(9) API. Submitted by: Mark Santcroos Reviewed by: imp, dfr, bde --- sys/dev/aha/aha_isa.c | 4 ++-- sys/dev/aha/aha_mca.c | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'sys/dev/aha') diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c index 5e7831ed1dcc..7215cb069cbd 100644 --- a/sys/dev/aha/aha_isa.c +++ b/sys/dev/aha/aha_isa.c @@ -204,7 +204,7 @@ aha_isa_attach(device_t dev) } aha->irqrid = 0; - aha->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &aha->irqrid, 0, ~0, 1, + aha->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &aha->irqrid, RF_ACTIVE); if (!aha->irq) { device_printf(dev, "Unable to allocate excluse use of irq\n"); @@ -213,7 +213,7 @@ aha_isa_attach(device_t dev) } aha->drqrid = 0; - aha->drq = bus_alloc_resource(dev, SYS_RES_DRQ, &aha->drqrid, 0, ~0, 1, + aha->drq = bus_alloc_resource_any(dev, SYS_RES_DRQ, &aha->drqrid, RF_ACTIVE); if (!aha->drq) { device_printf(dev, "Unable to allocate drq\n"); diff --git a/sys/dev/aha/aha_mca.c b/sys/dev/aha/aha_mca.c index caa110f6e8fc..730e57e79429 100644 --- a/sys/dev/aha/aha_mca.c +++ b/sys/dev/aha/aha_mca.c @@ -126,8 +126,7 @@ aha_mca_attach (device_t dev) void * ih; rid = 0; - io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, - 0, ~0, 1, RF_ACTIVE); + io = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); if (!io) { device_printf(dev, "No I/O space?!\n"); error = ENOMEM; @@ -135,8 +134,7 @@ aha_mca_attach (device_t dev) } rid = 0; - irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, - 0, ~0, 1, RF_ACTIVE); + irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (irq == NULL) { device_printf(dev, "No IRQ?!\n"); error = ENOMEM; @@ -144,8 +142,7 @@ aha_mca_attach (device_t dev) } rid = 0; - drq = bus_alloc_resource(dev, SYS_RES_DRQ, &rid, - 0, ~0, 1, RF_ACTIVE); + drq = bus_alloc_resource_any(dev, SYS_RES_DRQ, &rid, RF_ACTIVE); if (drq == NULL) { device_printf(dev, "No DRQ?!\n"); error = ENOMEM; -- cgit v1.3