diff options
author | imp <imp@FreeBSD.org> | 2005-02-01 07:43:34 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-02-01 07:43:34 +0000 |
commit | 7da1992a2abaadecf40180c27a55f6f3aab3c555 (patch) | |
tree | 65ee1086b81bec2b99695e4b574ca5ede5307354 | |
parent | 2579b2e0bf8255cd6039f424664cd62abfdb31c5 (diff) | |
download | FreeBSD-src-7da1992a2abaadecf40180c27a55f6f3aab3c555.zip FreeBSD-src-7da1992a2abaadecf40180c27a55f6f3aab3c555.tar.gz |
BUS_SPACE_UNRESTRICTED shouldn't be used with the bus_alloc_resource
interface. Instead, move to the convenience _any interface.
-rw-r--r-- | sys/dev/sound/pci/cmi.c | 4 | ||||
-rw-r--r-- | sys/dev/sound/pci/maestro.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 196fb69..2ae837a 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -850,8 +850,8 @@ cmi_attach(device_t dev) sc->dev = dev; sc->regid = PCIR_BAR(0); - sc->reg = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->regid, - 0, BUS_SPACE_UNRESTRICTED, 1, RF_ACTIVE); + sc->reg = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &sc->regid, + RF_ACTIVE); if (!sc->reg) { device_printf(dev, "cmi_attach: Cannot allocate bus resource\n"); goto bad; diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index 9d329c0..d1b9b5b 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -1843,8 +1843,8 @@ agg_attach(device_t dev) /* Allocate resources. */ if (data & PCIM_CMD_PORTEN) - reg = bus_alloc_resource(dev, SYS_RES_IOPORT, ®id, - 0, BUS_SPACE_UNRESTRICTED, 256, RF_ACTIVE); + reg = bus_alloc_resource_any(dev, SYS_RES_IOPORT, ®id, + RF_ACTIVE); if (reg != NULL) { ess->reg = reg; ess->regid = regid; @@ -1855,8 +1855,8 @@ agg_attach(device_t dev) ret = ENXIO; goto bad; } - irq = bus_alloc_resource(dev, SYS_RES_IRQ, &irqid, - 0, BUS_SPACE_UNRESTRICTED, 1, RF_ACTIVE | RF_SHAREABLE); + irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &irqid, + RF_ACTIVE | RF_SHAREABLE); if (irq != NULL) { ess->irq = irq; ess->irqid = irqid; |