diff options
| author | marius <marius@FreeBSD.org> | 2005-06-04 20:29:28 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2005-06-04 20:29:28 +0000 |
| commit | ba798e730cc935095a1520e37541f02b99d7fc99 (patch) | |
| tree | 74f69efea6eaeb5805d42a80b50689a9cdf12d8c /sys/dev/pcf | |
| parent | 9cdfa3f22a029a13bf24cd70d28e39312f597470 (diff) | |
| download | FreeBSD-src-ba798e730cc935095a1520e37541f02b99d7fc99.zip FreeBSD-src-ba798e730cc935095a1520e37541f02b99d7fc99.tar.gz | |
Account for ebus(4) defaulting to SYS_RES_MEMORY for memory resources
since ebus.c rev. 1.22.
Diffstat (limited to 'sys/dev/pcf')
| -rw-r--r-- | sys/dev/pcf/envctrl.c | 10 | ||||
| -rw-r--r-- | sys/dev/pcf/pcf_ebus.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/pcf/envctrl.c b/sys/dev/pcf/envctrl.c index 7b5f064..25a163c 100644 --- a/sys/dev/pcf/envctrl.c +++ b/sys/dev/pcf/envctrl.c @@ -110,7 +110,7 @@ envctrl_attach(device_t dev) bzero(sc, sizeof(struct pcf_softc)); /* IO port is mandatory */ - sc->res_ioport = bus_alloc_resource_any(dev, SYS_RES_IOPORT, + sc->res_ioport = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid_ioport, RF_ACTIVE); if (sc->res_ioport == 0) { device_printf(dev, "cannot reserve I/O port range\n"); @@ -157,9 +157,9 @@ error: sc->res_irq); } if (sc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, + bus_deactivate_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); - bus_release_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, + bus_release_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); } return (rv); @@ -186,8 +186,8 @@ envctrl_detach(device_t dev) bus_release_resource(dev, SYS_RES_IRQ, sc->rid_irq, sc->res_irq); } - bus_deactivate_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, sc->res_ioport); - bus_release_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, sc->res_ioport); + bus_deactivate_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); + bus_release_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); return (0); } diff --git a/sys/dev/pcf/pcf_ebus.c b/sys/dev/pcf/pcf_ebus.c index b23c8dd..3ea2051 100644 --- a/sys/dev/pcf/pcf_ebus.c +++ b/sys/dev/pcf/pcf_ebus.c @@ -151,7 +151,7 @@ pcf_ebus_attach(device_t dev) } /* IO port is mandatory */ - sc->res_ioport = bus_alloc_resource_any(dev, SYS_RES_IOPORT, + sc->res_ioport = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid_ioport, RF_ACTIVE); if (sc->res_ioport == 0) { device_printf(dev, "cannot reserve I/O port range\n"); @@ -218,9 +218,9 @@ error: sc->res_irq); } if (sc->res_ioport != 0) { - bus_deactivate_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, + bus_deactivate_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); - bus_release_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, + bus_release_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); } return (rv); @@ -249,9 +249,9 @@ pcf_ebus_detach(device_t dev) sc->res_irq); } - bus_deactivate_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, + bus_deactivate_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); - bus_release_resource(dev, SYS_RES_IOPORT, sc->rid_ioport, + bus_release_resource(dev, SYS_RES_MEMORY, sc->rid_ioport, sc->res_ioport); return (0); |
