diff options
author | jhb <jhb@FreeBSD.org> | 2003-09-02 17:30:40 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2003-09-02 17:30:40 +0000 |
commit | dc11e45b68dec5003e226a26f7fa2ee9a1e351c2 (patch) | |
tree | 1a7743437055722d93fce73b145dde1eb1915e7f /sys/dev/sound/pci/solo.c | |
parent | 480ed8b5934d938866a31bd84aa636de31845487 (diff) | |
download | FreeBSD-src-dc11e45b68dec5003e226a26f7fa2ee9a1e351c2.zip FreeBSD-src-dc11e45b68dec5003e226a26f7fa2ee9a1e351c2.tar.gz |
Use PCIR_BAR(x) instead of PCIR_MAPS.
Glanced over by: imp, gibbs
Tested by: i386 LINT
Diffstat (limited to 'sys/dev/sound/pci/solo.c')
-rw-r--r-- | sys/dev/sound/pci/solo.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index d166b29..2051680 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -812,27 +812,27 @@ ess_release_resources(struct ess_info *sc, device_t dev) sc->irq = 0; } if (sc->io) { - bus_release_resource(dev, SYS_RES_IOPORT, 0 * 4 + PCIR_MAPS, sc->io); + bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0), sc->io); sc->io = 0; } if (sc->sb) { - bus_release_resource(dev, SYS_RES_IOPORT, 1 * 4 + PCIR_MAPS, sc->sb); + bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(1), sc->sb); sc->sb = 0; } if (sc->vc) { - bus_release_resource(dev, SYS_RES_IOPORT, 2 * 4 + PCIR_MAPS, sc->vc); + bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(2), sc->vc); sc->vc = 0; } if (sc->mpu) { - bus_release_resource(dev, SYS_RES_IOPORT, 3 * 4 + PCIR_MAPS, sc->mpu); + bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(3), sc->mpu); sc->mpu = 0; } if (sc->gp) { - bus_release_resource(dev, SYS_RES_IOPORT, 4 * 4 + PCIR_MAPS, sc->gp); + bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(4), sc->gp); sc->gp = 0; } @@ -849,19 +849,19 @@ ess_alloc_resources(struct ess_info *sc, device_t dev) { int rid; - rid = 0 * 4 + PCIR_MAPS; + rid = PCIR_BAR(0); sc->io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE); - rid = 1 * 4 + PCIR_MAPS; + rid = PCIR_BAR(1); sc->sb = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE); - rid = 2 * 4 + PCIR_MAPS; + rid = PCIR_BAR(2); sc->vc = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE); - rid = 3 * 4 + PCIR_MAPS; + rid = PCIR_BAR(3); sc->mpu = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE); - rid = 4 * 4 + PCIR_MAPS; + rid = PCIR_BAR(4); sc->gp = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE); rid = 0; |