aboutsummaryrefslogtreecommitdiff
path: root/sys/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/bios/smapi.c7
-rw-r--r--sys/i386/bios/smbios.c7
-rw-r--r--sys/i386/bios/vpd.c7
-rw-r--r--sys/i386/isa/atpic.c2
-rw-r--r--sys/i386/isa/if_el.c2
-rw-r--r--sys/i386/isa/mse.c3
-rw-r--r--sys/i386/isa/spic.c4
7 files changed, 14 insertions, 18 deletions
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c
index 3e9aab8189f7..c4897d1f2c98 100644
--- a/sys/i386/bios/smapi.c
+++ b/sys/i386/bios/smapi.c
@@ -183,8 +183,7 @@ smapi_probe (device_t dev)
error = 0;
rid = 0;
- res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
if (res == NULL) {
device_printf(dev, "Unable to allocate memory resource.\n");
error = ENOMEM;
@@ -214,8 +213,8 @@ smapi_attach (device_t dev)
sc->dev = dev;
sc->rid = 0;
- sc->res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->rid,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid,
+ RF_ACTIVE);
if (sc->res == NULL) {
device_printf(dev, "Unable to allocate memory resource.\n");
error = ENOMEM;
diff --git a/sys/i386/bios/smbios.c b/sys/i386/bios/smbios.c
index 9bf433e8be9f..cef10f39b0c9 100644
--- a/sys/i386/bios/smbios.c
+++ b/sys/i386/bios/smbios.c
@@ -130,8 +130,7 @@ smbios_probe (device_t dev)
error = 0;
rid = 0;
- res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
if (res == NULL) {
device_printf(dev, "Unable to allocate memory resource.\n");
error = ENOMEM;
@@ -161,8 +160,8 @@ smbios_attach (device_t dev)
sc->dev = dev;
sc->rid = 0;
- sc->res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->rid,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid,
+ RF_ACTIVE);
if (sc->res == NULL) {
device_printf(dev, "Unable to allocate memory resource.\n");
error = ENOMEM;
diff --git a/sys/i386/bios/vpd.c b/sys/i386/bios/vpd.c
index 74395c2e2740..b78a3033e4e8 100644
--- a/sys/i386/bios/vpd.c
+++ b/sys/i386/bios/vpd.c
@@ -145,8 +145,7 @@ vpd_probe (device_t dev)
error = 0;
rid = 0;
- res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
if (res == NULL) {
device_printf(dev, "Unable to allocate memory resource.\n");
error = ENOMEM;
@@ -177,8 +176,8 @@ vpd_attach (device_t dev)
sc->dev = dev;
sc->rid = 0;
- sc->res = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->rid,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid,
+ RF_ACTIVE);
if (sc->res == NULL) {
device_printf(dev, "Unable to allocate memory resource.\n");
error = ENOMEM;
diff --git a/sys/i386/isa/atpic.c b/sys/i386/isa/atpic.c
index 634128610557..87b91d8cba05 100644
--- a/sys/i386/isa/atpic.c
+++ b/sys/i386/isa/atpic.c
@@ -414,7 +414,7 @@ atpic_attach(device_t dev)
/* Try to allocate our IRQ and then free it. */
rid = 0;
- res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, 0);
+ res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, 0);
if (res != NULL)
bus_release_resource(dev, SYS_RES_IRQ, rid, res);
return (0);
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 7486374eb1c2..65ab1c63c0b0 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -241,7 +241,7 @@ el_attach(device_t dev)
return(ENXIO);
rid = 0;
- sc->el_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+ sc->el_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
RF_SHAREABLE | RF_ACTIVE);
if (sc->el_irq == NULL) {
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 8cd40f1bbd03..3f4acc5e77ad 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -331,8 +331,7 @@ mse_attach(dev)
MSE_IOSIZE, RF_ACTIVE);
if (sc->sc_port == NULL)
return ENXIO;
- sc->sc_intr = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
- RF_ACTIVE);
+ sc->sc_intr = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
if (sc->sc_intr == NULL) {
bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->sc_port);
return ENXIO;
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index a649f13e1003..98fc8ab87243 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -240,8 +240,8 @@ spic_probe(device_t dev)
sc->sc_port_addr = (u_short)rman_get_start(sc->sc_port_res);
#ifdef notyet
- if (!(sc->sc_intr_res = bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_intr_rid, 0, ~0, 1, RF_ACTIVE))) {
+ if (!(sc->sc_intr_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_intr_rid, RF_ACTIVE))) {
device_printf(dev,"Couldn't map IRQ\n");
bus_release_resource(dev, SYS_RES_IOPORT,
sc->sc_port_rid, sc->sc_port_res);