summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound/isa
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sound/isa')
-rw-r--r--sys/dev/sound/isa/ad1816.c16
-rw-r--r--sys/dev/sound/isa/ess.c22
-rw-r--r--sys/dev/sound/isa/gusc.c13
-rw-r--r--sys/dev/sound/isa/gusmidi.c6
-rw-r--r--sys/dev/sound/isa/mpu.c3
-rw-r--r--sys/dev/sound/isa/mss.c30
-rw-r--r--sys/dev/sound/isa/sb16.c12
-rw-r--r--sys/dev/sound/isa/sb8.c9
-rw-r--r--sys/dev/sound/isa/sbc.c12
-rw-r--r--sys/dev/sound/isa/uartsio.c3
10 files changed, 72 insertions, 54 deletions
diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index a7b8fdf..3de4804 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -518,17 +518,17 @@ ad1816_alloc_resources(struct ad1816_info *ad1816, device_t dev)
int ok = 1, pdma, rdma;
if (!ad1816->io_base)
- ad1816->io_base = bus_alloc_resource(dev, SYS_RES_IOPORT, &ad1816->io_rid,
- 0, ~0, 1, RF_ACTIVE);
+ ad1816->io_base = bus_alloc_resource_any(dev,
+ SYS_RES_IOPORT, &ad1816->io_rid, RF_ACTIVE);
if (!ad1816->irq)
- ad1816->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &ad1816->irq_rid,
- 0, ~0, 1, RF_ACTIVE);
+ ad1816->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &ad1816->irq_rid, RF_ACTIVE);
if (!ad1816->drq1)
- ad1816->drq1 = bus_alloc_resource(dev, SYS_RES_DRQ, &ad1816->drq1_rid,
- 0, ~0, 1, RF_ACTIVE);
+ ad1816->drq1 = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &ad1816->drq1_rid, RF_ACTIVE);
if (!ad1816->drq2)
- ad1816->drq2 = bus_alloc_resource(dev, SYS_RES_DRQ, &ad1816->drq2_rid,
- 0, ~0, 1, RF_ACTIVE);
+ ad1816->drq2 = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &ad1816->drq2_rid, RF_ACTIVE);
if (!ad1816->io_base || !ad1816->drq1 || !ad1816->irq) ok = 0;
diff --git a/sys/dev/sound/isa/ess.c b/sys/dev/sound/isa/ess.c
index a8dccfd..fc49efd 100644
--- a/sys/dev/sound/isa/ess.c
+++ b/sys/dev/sound/isa/ess.c
@@ -316,24 +316,20 @@ ess_alloc_resources(struct ess_info *sc, device_t dev)
rid = 0;
if (!sc->io_base)
- sc->io_base = bus_alloc_resource(dev, SYS_RES_IOPORT,
- &rid, 0, ~0, 1,
- RF_ACTIVE);
+ sc->io_base = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &rid, RF_ACTIVE);
rid = 0;
if (!sc->irq)
- sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ,
- &rid, 0, ~0, 1,
- RF_ACTIVE);
+ sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &rid, RF_ACTIVE);
rid = 0;
if (!sc->drq1)
- sc->drq1 = bus_alloc_resource(dev, SYS_RES_DRQ,
- &rid, 0, ~0, 1,
- RF_ACTIVE);
+ sc->drq1 = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &rid, RF_ACTIVE);
rid = 1;
if (!sc->drq2)
- sc->drq2 = bus_alloc_resource(dev, SYS_RES_DRQ,
- &rid, 0, ~0, 1,
- RF_ACTIVE);
+ sc->drq2 = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &rid, RF_ACTIVE);
if (sc->io_base && sc->drq1 && sc->irq) {
isa_dma_acquire(rman_get_start(sc->drq1));
@@ -968,7 +964,7 @@ esscontrol_attach(device_t dev)
int rid, i, x;
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);
x = 0;
for (i = 0; i < 0x100; i++) {
port_wr(io, 0, i);
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 54b2928..908b486 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -504,8 +504,10 @@ alloc_resource(sc_p scp)
}
if (scp->irq == NULL) {
scp->irq_rid = 0;
- scp->irq = bus_alloc_resource(scp->dev, SYS_RES_IRQ, &scp->irq_rid,
- 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
+ scp->irq =
+ bus_alloc_resource_any(scp->dev, SYS_RES_IRQ,
+ &scp->irq_rid,
+ RF_ACTIVE|RF_SHAREABLE);
if (scp->irq == NULL)
return (1);
scp->irq_alloced = 0;
@@ -514,8 +516,11 @@ alloc_resource(sc_p scp)
if (scp->drq[i] == NULL) {
scp->drq_rid[i] = i;
if (base == 0 || i == 0)
- scp->drq[i] = bus_alloc_resource(scp->dev, SYS_RES_DRQ, &scp->drq_rid[i],
- 0, ~0, 1, RF_ACTIVE);
+ scp->drq[i] =
+ bus_alloc_resource_any(
+ scp->dev, SYS_RES_DRQ,
+ &scp->drq_rid[i],
+ RF_ACTIVE);
else if ((flags & DV_F_DUAL_DMA) != 0)
/* XXX The secondary drq is specified in the flag. */
scp->drq[i] = bus_alloc_resource(scp->dev, SYS_RES_DRQ, &scp->drq_rid[i],
diff --git a/sys/dev/sound/isa/gusmidi.c b/sys/dev/sound/isa/gusmidi.c
index e5788d1..16a2d18 100644
--- a/sys/dev/sound/isa/gusmidi.c
+++ b/sys/dev/sound/isa/gusmidi.c
@@ -487,7 +487,8 @@ static int
gusmidi_allocres(sc_p scp, device_t dev)
{
if (scp->io == NULL) {
- scp->io = bus_alloc_resource(dev, SYS_RES_IOPORT, &scp->io_rid, 0, ~0, 2, RF_ACTIVE);
+ scp->io = bus_alloc_resource(dev, SYS_RES_IOPORT,
+ &scp->io_rid, 0, ~0, 2, RF_ACTIVE);
if (scp->io == NULL)
return (1);
}
@@ -496,7 +497,8 @@ gusmidi_allocres(sc_p scp, device_t dev)
#else
if (scp->irq == NULL) {
#endif /* notdef */
- scp->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &scp->irq_rid, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
+ scp->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &scp->irq_rid, RF_ACTIVE | RF_SHAREABLE);
if (scp->irq == NULL)
return (1);
}
diff --git a/sys/dev/sound/isa/mpu.c b/sys/dev/sound/isa/mpu.c
index 5ca32bd..3f259a7 100644
--- a/sys/dev/sound/isa/mpu.c
+++ b/sys/dev/sound/isa/mpu.c
@@ -747,7 +747,8 @@ mpu_allocres(sc_p scp, device_t dev)
}
if (scp->irq == NULL && !(device_get_flags(dev) & MPU_DF_NO_IRQ)) {
if (scp->irq_val == 0)
- scp->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &scp->irq_rid, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
+ scp->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &scp->irq_rid, RF_ACTIVE | RF_SHAREABLE);
else
scp->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &scp->irq_rid, scp->irq_val, scp->irq_val, 1, RF_ACTIVE | RF_SHAREABLE);
if (scp->irq == NULL)
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index c71030e..9e2ecce 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -314,20 +314,23 @@ mss_alloc_resources(struct mss_info *mss, device_t dev)
{
int pdma, rdma, ok = 1;
if (!mss->io_base)
- mss->io_base = bus_alloc_resource(dev, SYS_RES_IOPORT, &mss->io_rid,
- 0, ~0, 1, RF_ACTIVE);
+ mss->io_base = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &mss->io_rid, RF_ACTIVE);
if (!mss->irq)
- mss->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &mss->irq_rid,
- 0, ~0, 1, RF_ACTIVE);
+ mss->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &mss->irq_rid, RF_ACTIVE);
if (!mss->drq1)
- mss->drq1 = bus_alloc_resource(dev, SYS_RES_DRQ, &mss->drq1_rid,
- 0, ~0, 1, RF_ACTIVE);
+ mss->drq1 = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &mss->drq1_rid,
+ RF_ACTIVE);
if (mss->conf_rid >= 0 && !mss->conf_base)
- mss->conf_base = bus_alloc_resource(dev, SYS_RES_IOPORT, &mss->conf_rid,
- 0, ~0, 1, RF_ACTIVE);
+ mss->conf_base = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &mss->conf_rid,
+ RF_ACTIVE);
if (mss->drq2_rid >= 0 && !mss->drq2)
- mss->drq2 = bus_alloc_resource(dev, SYS_RES_DRQ, &mss->drq2_rid,
- 0, ~0, 1, RF_ACTIVE);
+ mss->drq2 = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &mss->drq2_rid,
+ RF_ACTIVE);
if (!mss->io_base || !mss->drq1 || !mss->irq) ok = 0;
if (mss->conf_rid >= 0 && !mss->conf_base) ok = 0;
@@ -705,8 +708,8 @@ mss_init(struct mss_info *mss, device_t dev)
/* end of reset */
rid = 0;
- alt = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
- 0, ~0, 1, RF_ACTIVE);
+ alt = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
if (alt == NULL) {
printf("XXX couldn't init GUS PnP/MAX\n");
break;
@@ -1889,8 +1892,7 @@ azt2320_mss_mode(struct mss_info *mss, device_t dev)
rid = 0;
ret = -1;
- sbport = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
- 0, ~0, 1, RF_ACTIVE);
+ sbport = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
if (sbport) {
for (i = 0; i < 1000; i++) {
if ((port_rd(sbport, SBDSP_STATUS) & 0x80))
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index 753cef8..da82611 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -440,19 +440,23 @@ sb16_alloc_resources(struct sb_info *sb, device_t dev)
rid = 0;
if (!sb->io_base)
- sb->io_base = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE);
+ sb->io_base = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &rid, RF_ACTIVE);
rid = 0;
if (!sb->irq)
- sb->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_ACTIVE);
+ sb->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+ RF_ACTIVE);
rid = 0;
if (!sb->drq1)
- sb->drq1 = bus_alloc_resource(dev, SYS_RES_DRQ, &rid, 0, ~0, 1, RF_ACTIVE);
+ sb->drq1 = bus_alloc_resource_any(dev, SYS_RES_DRQ, &rid,
+ RF_ACTIVE);
rid = 1;
if (!sb->drq2)
- sb->drq2 = bus_alloc_resource(dev, SYS_RES_DRQ, &rid, 0, ~0, 1, RF_ACTIVE);
+ sb->drq2 = bus_alloc_resource_any(dev, SYS_RES_DRQ, &rid,
+ RF_ACTIVE);
if (sb->io_base && sb->drq1 && sb->irq) {
isa_dma_acquire(rman_get_start(sb->drq1));
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index 566aa83..877971e 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -286,13 +286,16 @@ sb_alloc_resources(struct sb_info *sb, device_t dev)
rid = 0;
if (!sb->io_base)
- sb->io_base = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE);
+ sb->io_base = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &rid, RF_ACTIVE);
rid = 0;
if (!sb->irq)
- sb->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_ACTIVE);
+ sb->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &rid, RF_ACTIVE);
rid = 0;
if (!sb->drq)
- sb->drq = bus_alloc_resource(dev, SYS_RES_DRQ, &rid, 0, ~0, 1, RF_ACTIVE);
+ sb->drq = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &rid, RF_ACTIVE);
if (sb->io_base && sb->drq && sb->irq) {
isa_dma_acquire(rman_get_start(sb->drq));
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 21cb639..6abb596 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -700,8 +700,10 @@ alloc_resource(struct sbc_softc *scp)
for (i = 0 ; i < DRQ_MAX ; i++) {
if (scp->drq[i] == NULL) {
scp->drq_rid[i] = i;
- scp->drq[i] = bus_alloc_resource(scp->dev, SYS_RES_DRQ, &scp->drq_rid[i],
- 0, ~0, 1, RF_ACTIVE);
+ scp->drq[i] = bus_alloc_resource_any(scp->dev,
+ SYS_RES_DRQ,
+ &scp->drq_rid[i],
+ RF_ACTIVE);
if (i == 0 && scp->drq[i] == NULL)
return (1);
scp->drq_alloced[i] = 0;
@@ -710,8 +712,10 @@ alloc_resource(struct sbc_softc *scp)
for (i = 0 ; i < IRQ_MAX ; i++) {
if (scp->irq[i] == NULL) {
scp->irq_rid[i] = i;
- scp->irq[i] = bus_alloc_resource(scp->dev, SYS_RES_IRQ, &scp->irq_rid[i],
- 0, ~0, 1, RF_ACTIVE);
+ scp->irq[i] = bus_alloc_resource_any(scp->dev,
+ SYS_RES_IRQ,
+ &scp->irq_rid[i],
+ RF_ACTIVE);
if (i == 0 && scp->irq[i] == NULL)
return (1);
scp->irq_alloced[i] = 0;
diff --git a/sys/dev/sound/isa/uartsio.c b/sys/dev/sound/isa/uartsio.c
index ab9fd9d..384e183 100644
--- a/sys/dev/sound/isa/uartsio.c
+++ b/sys/dev/sound/isa/uartsio.c
@@ -487,7 +487,8 @@ uartsio_allocres(sc_p scp, device_t dev)
{
if (scp->irq == NULL) {
scp->irq_rid = 0;
- scp->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &scp->irq_rid, 0, ~0, 1, RF_ACTIVE);
+ scp->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &scp->irq_rid, RF_ACTIVE);
}
if (scp->irq == NULL)
return (1);
OpenPOWER on IntegriCloud