From 4e6d744d3b4fe4554162409f4219712ccc3aed64 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Tue, 24 May 2005 09:52:15 +0000
Subject: [PATCH] Use bus_alloc_resource_any when possible.

---
 sys/dev/netif/an/if_an.c            |  6 +++---
 sys/dev/netif/awi/if_awi_pccard.c   |  6 +++---
 sys/dev/netif/bfe/if_bfe.c          | 10 +++++-----
 sys/dev/netif/cm/smc90cx6.c         |  5 ++---
 sys/dev/netif/cs/if_cs.c            |  6 +++---
 sys/dev/netif/dc/if_dc.c            |  7 +++----
 sys/dev/netif/de/if_de.c            | 12 +++++-------
 sys/dev/netif/ed/if_ed.c            |  6 +++---
 sys/dev/netif/ep/if_ep.c            |  9 ++++-----
 sys/dev/netif/ep/if_ep_eisa.c       |  5 ++---
 sys/dev/netif/ex/if_ex.c            | 10 +++++-----
 sys/dev/netif/fe/if_fe.c            |  5 ++---
 sys/dev/netif/fea/if_fea.c          | 11 ++++-------
 sys/dev/netif/fxp/if_fxp.c          | 14 +++++++-------
 sys/dev/netif/gx/if_gx.c            | 12 ++++++------
 sys/dev/netif/lge/if_lge.c          |  7 +++----
 sys/dev/netif/lnc/if_lnc_isa.c      | 18 +++++++++---------
 sys/dev/netif/lnc/if_lnc_pci.c      | 10 +++++-----
 sys/dev/netif/mn/if_mn.c            | 12 +++++-------
 sys/dev/netif/my/if_my.c            |  9 ++++-----
 sys/dev/netif/ndis/if_ndis_pccard.c | 10 ++++------
 sys/dev/netif/ndis/if_ndis_pci.c    | 24 ++++++++++++------------
 sys/dev/netif/nge/if_nge.c          |  7 +++----
 sys/dev/netif/nv/if_nv.c            |  9 ++++-----
 sys/dev/netif/owi/if_owi.c          | 10 +++++-----
 sys/dev/netif/owi/if_owi_pci.c      | 10 +++++-----
 sys/dev/netif/pcn/if_pcn.c          | 11 +++++------
 sys/dev/netif/ray/if_ray.c          |  6 +++---
 sys/dev/netif/rl/if_rl.c            |  5 ++---
 sys/dev/netif/sbni/if_sbni_isa.c    |  6 +++---
 sys/dev/netif/sbni/if_sbni_pci.c    |  6 +++---
 sys/dev/netif/sbsh/if_sbsh.c        |  6 +++---
 sys/dev/netif/sf/if_sf.c            |  7 +++----
 sys/dev/netif/sis/if_sis.c          |  7 +++----
 sys/dev/netif/sk/if_sk.c            |  7 +++----
 sys/dev/netif/sn/if_sn.c            |  6 +++---
 sys/dev/netif/snc/if_snc.c          |  6 +++---
 sys/dev/netif/sr/if_sr.c            |  6 +++---
 sys/dev/netif/ste/if_ste.c          |  7 +++----
 sys/dev/netif/ti/if_ti.c            |  8 ++++----
 sys/dev/netif/tl/if_tl.c            | 20 ++++++++++----------
 sys/dev/netif/tx/if_tx.c            |  7 +++----
 sys/dev/netif/txp/if_txp.c          |  7 +++----
 sys/dev/netif/vx/if_vx_eisa.c       | 11 ++++-------
 sys/dev/netif/vx/if_vx_pci.c        |  8 ++++----
 sys/dev/netif/wb/if_wb.c            |  7 +++----
 sys/dev/netif/xe/if_xe.c            |  6 +++---
 47 files changed, 190 insertions(+), 220 deletions(-)

diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c
index 05126d6917..e673365054 100644
--- a/sys/dev/netif/an/if_an.c
+++ b/sys/dev/netif/an/if_an.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.19 2005/05/24 08:16:07 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.20 2005/05/24 09:52:12 joerg Exp $
  */
 
 /*
@@ -435,8 +435,8 @@ an_alloc_irq(dev, rid, flags)
 	struct an_softc *sc = device_get_softc(dev);
 	struct resource *res;
 
-	res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				 0ul, ~0ul, 1, (RF_ACTIVE | flags));
+	res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    (RF_ACTIVE | flags));
 	if (res) {
 		sc->irq_rid = rid;
 		sc->irq_res = res;
diff --git a/sys/dev/netif/awi/if_awi_pccard.c b/sys/dev/netif/awi/if_awi_pccard.c
index 2272ebec45..276215cfa4 100644
--- a/sys/dev/netif/awi/if_awi_pccard.c
+++ b/sys/dev/netif/awi/if_awi_pccard.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.5.2.1 2000/12/07 04:09:39 imp Exp $
- * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.10 2004/07/27 14:25:56 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.11 2005/05/24 09:52:12 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -161,8 +161,8 @@ awi_pccard_attach(device_t dev)
 	sc->sc_chip.sc_ioh = rman_get_bushandle(psc->sc_port_res);
 
 	psc->sc_irq_rid = 0;
-	psc->sc_irq_res = bus_alloc_resource(dev, SYS_RES_IRQ,
-	    &psc->sc_irq_rid, 0, ~0, 1, RF_ACTIVE);
+	psc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+	    &psc->sc_irq_rid, RF_ACTIVE);
 	if (!psc->sc_irq_res) {
 		device_printf(dev, "awi_pccard_attach: irq alloc failed\n");
 		goto fail;
diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c
index e4571b5ad1..da60f7b527 100644
--- a/sys/dev/netif/bfe/if_bfe.c
+++ b/sys/dev/netif/bfe/if_bfe.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bfe/if_bfe.c 1.4.4.7 2004/03/02 08:41:33 julian Exp  v
- * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.13 2005/05/23 18:22:41 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.14 2005/05/24 09:52:12 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -332,8 +332,8 @@ bfe_attach(device_t dev)
 	pci_enable_busmaster(dev);
 
 	rid = BFE_PCI_MEMLO;
-	sc->bfe_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 0, ~0, 1,
-					 RF_ACTIVE);
+	sc->bfe_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
 	if (sc->bfe_res == NULL) {
 		device_printf(dev, "couldn't map memory\n");
 		error = ENXIO;
@@ -346,8 +346,8 @@ bfe_attach(device_t dev)
 	/* Allocate interrupt */
 	rid = 0;
 
-	sc->bfe_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
-					 RF_SHAREABLE | RF_ACTIVE);
+	sc->bfe_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_SHAREABLE | RF_ACTIVE);
 	if (sc->bfe_irq == NULL) {
 		device_printf(dev, "couldn't map interrupt\n");
 		error = ENXIO;
diff --git a/sys/dev/netif/cm/smc90cx6.c b/sys/dev/netif/cm/smc90cx6.c
index 20ac62b971..da3bdc1387 100644
--- a/sys/dev/netif/cm/smc90cx6.c
+++ b/sys/dev/netif/cm/smc90cx6.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
 /*	$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.1.2.3 2003/02/05 18:42:14 fjoe Exp $ */
-/*	$DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.11 2005/02/11 22:25:56 joerg Exp $ */
+/*	$DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.12 2005/05/24 09:52:12 joerg Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -230,8 +230,7 @@ cm_alloc_irq(dev, rid)
 	struct cm_softc *sc = device_get_softc(dev);
 	struct resource *res;
 
-	res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				 0ul, ~0ul, 1, RF_ACTIVE);
+	res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
 	if (res) {
 		sc->irq_rid = rid;
 		sc->irq_res = res;
diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index 629bf0c0da..22ff5d53ff 100644
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $
- * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.14 2005/02/21 18:40:36 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.15 2005/05/24 09:52:13 joerg Exp $
  */
 
 /*
@@ -541,8 +541,8 @@ int cs_alloc_irq(device_t dev, int rid, int flags)
         struct cs_softc *sc = device_get_softc(dev);
         struct resource *res;
 
-        res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-                                 0ul, ~0ul, 1, (RF_ACTIVE | flags));
+        res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    (RF_ACTIVE | flags));
         if (res) {
                 sc->irq_rid = rid;
                 sc->irq_res = res;
diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c
index c3e639516d..a9eccb7a4e 100644
--- a/sys/dev/netif/dc/if_dc.c
+++ b/sys/dev/netif/dc/if_dc.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $
- * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.24 2005/05/05 22:57:44 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.25 2005/05/24 09:52:13 joerg Exp $
  */
 
 /*
@@ -1817,8 +1817,7 @@ static int dc_attach(dev)
 #endif
 
 	rid = DC_RID;
-	sc->dc_res = bus_alloc_resource(dev, DC_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->dc_res = bus_alloc_resource_any(dev, DC_RES, &rid, RF_ACTIVE);
 
 	if (sc->dc_res == NULL) {
 		printf("dc%d: couldn't map ports/memory\n", unit);
@@ -1831,7 +1830,7 @@ static int dc_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->dc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->dc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->dc_irq == NULL) {
diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c
index cb1d2099a7..9ea123833b 100644
--- a/sys/dev/netif/de/if_de.c
+++ b/sys/dev/netif/de/if_de.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $	*/
 
 /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */
-/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.34 2005/05/12 01:41:07 drhodus Exp $ */
+/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.35 2005/05/24 09:52:13 joerg Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -4138,12 +4138,10 @@ tulip_pci_attach(device_t dev)
     sc->tulip_if.if_softc = sc;
 #if defined(TULIP_IOMAPPED)
     rid = PCI_CBIO;
-    res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-			     0, ~0, 1, RF_ACTIVE);
+    res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
 #else
     rid = PCI_CBMA;
-    res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
-			     0, ~0, 1, RF_ACTIVE);
+    res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
 #endif
     if (!res)
 	return ENXIO;
@@ -4191,8 +4189,8 @@ tulip_pci_attach(device_t dev)
 	    void *ih;
 
 	    rid = 0;
-	    res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				     0, ~0, 1, RF_SHAREABLE | RF_ACTIVE);
+	    res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+				         RF_SHAREABLE | RF_ACTIVE);
 	    if (res == 0 || bus_setup_intr(dev, res, INTR_TYPE_NET,
 					   intr_rtn, sc, &ih)) {
 		device_printf(dev, "couldn't map interrupt\n");
diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c
index ede7cf0b7d..72e6f02d70 100644
--- a/sys/dev/netif/ed/if_ed.c
+++ b/sys/dev/netif/ed/if_ed.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.224 2003/12/08 07:54:12 obrien Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.19 2005/02/15 20:26:29 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.20 2005/05/24 09:52:13 joerg Exp $
  */
 
 /*
@@ -1661,8 +1661,8 @@ ed_alloc_irq(dev, rid, flags)
 	struct ed_softc *sc = device_get_softc(dev);
 	struct resource *res;
 
-	res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				 0ul, ~0ul, 1, (RF_ACTIVE | flags));
+	res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    (RF_ACTIVE | flags));
 	if (res) {
 		sc->irq_rid = rid;
 		sc->irq_res = res;
diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c
index 9078e72174..8980571dad 100644
--- a/sys/dev/netif/ep/if_ep.c
+++ b/sys/dev/netif/ep/if_ep.c
@@ -39,7 +39,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.95.2.3 2002/03/06 07:26:35 imp Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.14 2005/02/18 15:48:11 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.15 2005/05/24 09:52:13 joerg Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -181,8 +181,8 @@ ep_alloc(device_t dev)
 	int			error = 0;
 
         rid = 0;
-        sc->iobase = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-                                        0, ~0, 1, RF_ACTIVE);
+        sc->iobase = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+	    RF_ACTIVE);
         if (!sc->iobase) {
                 device_printf(dev, "No I/O space?!\n");
 		error = ENXIO;
@@ -190,8 +190,7 @@ ep_alloc(device_t dev)
         }
 
         rid = 0;
-        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);
         if (!sc->irq) {
                 device_printf(dev, "No irq?!\n");
 		error = ENXIO;
diff --git a/sys/dev/netif/ep/if_ep_eisa.c b/sys/dev/netif/ep/if_ep_eisa.c
index 1cdec2f846..f254b70e49 100644
--- a/sys/dev/netif/ep/if_ep_eisa.c
+++ b/sys/dev/netif/ep/if_ep_eisa.c
@@ -20,7 +20,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.18 2000/01/14 07:14:00 peter Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.6 2005/05/24 09:52:13 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -189,8 +189,7 @@ ep_eisa_attach(device_t dev)
 	int			rid;
 
 	rid = 1;
-	eisa_io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-				     0, ~0, 1, RF_ACTIVE);
+	eisa_io = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
 	if (!eisa_io) {
 		device_printf(dev, "No I/O space?!\n");
 		error = ENXIO;
diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c
index a48bd5864e..0e9b122d23 100644
--- a/sys/dev/netif/ex/if_ex.c
+++ b/sys/dev/netif/ex/if_ex.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ex/if_ex.c,v 1.26.2.3 2001/03/05 05:33:20 imp Exp $
- * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.15 2005/02/18 22:59:32 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.16 2005/05/24 09:52:13 joerg Exp $
  *
  * MAINTAINER: Matthew N. Dodd <winter@jurai.net>
  *                             <mdodd@FreeBSD.org>
@@ -168,16 +168,16 @@ ex_alloc_resources (device_t dev)
 	struct ex_softc *	sc = device_get_softc(dev);
 	int			error = 0;
 
-	sc->ioport = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->ioport_rid,
-					0, ~0, 1, RF_ACTIVE);
+	sc->ioport = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &sc->ioport_rid,
+	    RF_ACTIVE);
 	if (!sc->ioport) {
 		device_printf(dev, "No I/O space?!\n");
 		error = ENOMEM;
 		goto bad;
 	}
 
-	sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irq_rid,
-					0, ~0, 1, RF_ACTIVE);
+	sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid,
+	    RF_ACTIVE);
 
 	if (!sc->irq) {
 		device_printf(dev, "No IRQ?!\n");
diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c
index c62684fffb..304eff9fc5 100644
--- a/sys/dev/netif/fe/if_fe.c
+++ b/sys/dev/netif/fe/if_fe.c
@@ -22,7 +22,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/fe/if_fe.c,v 1.65.2.1 2000/09/22 10:01:47 nyan Exp $
- * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.13 2005/02/18 23:06:00 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.14 2005/05/24 09:52:13 joerg Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * Contributed by M. Sekiguchi. <seki@sysrap.cs.fujitsu.co.jp>
@@ -894,8 +894,7 @@ fe_alloc_irq(device_t dev, int flags)
 	int rid;
 
 	rid = 0;
-	res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				 0ul, ~0ul, 1, RF_ACTIVE | flags);
+	res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE | flags);
 	if (res) {
 		sc->irq_res = res;
 		return (0);
diff --git a/sys/dev/netif/fea/if_fea.c b/sys/dev/netif/fea/if_fea.c
index 712c79df3f..d486d4186c 100644
--- a/sys/dev/netif/fea/if_fea.c
+++ b/sys/dev/netif/fea/if_fea.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/pdq/if_fea.c,v 1.19 2000/01/14 07:14:03 peter Exp $
- * $DragonFly: src/sys/dev/netif/fea/Attic/if_fea.c,v 1.6 2004/01/06 03:17:23 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fea/Attic/if_fea.c,v 1.7 2005/05/24 09:52:13 joerg Exp $
  */
 
 /*
@@ -178,8 +178,7 @@ pdq_eisa_attach (dev)
 	u_int32_t		m_addr, m_size;
 
 	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);
 
 	if (!io) {
 		device_printf(dev, "No I/O space?!\n");
@@ -187,8 +186,7 @@ pdq_eisa_attach (dev)
 	}
 
 	rid = 0;
-	mspace = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
-				    0, ~0, 1, RF_ACTIVE);
+	mspace = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
 
 	if (!mspace) {
 		device_printf(dev, "No memory space?!\n");
@@ -196,8 +194,7 @@ pdq_eisa_attach (dev)
 	}
 
 	rid = 0;
-	irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				 0, ~0, 1, RF_ACTIVE);
+	irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
 
 	if (!irq) {
 		device_printf(dev, "No, irq?!\n");
diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c
index 33f7739ec6..ddcf76058b 100644
--- a/sys/dev/netif/fxp/if_fxp.c
+++ b/sys/dev/netif/fxp/if_fxp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.110.2.30 2003/06/12 16:47:05 mux Exp $
- * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.24 2005/05/05 22:57:44 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.25 2005/05/24 09:52:13 joerg Exp $
  */
 
 /*
@@ -427,15 +427,15 @@ fxp_attach(device_t dev)
 		sc->rtp =
 		    (m1 == PCIM_CMD_MEMEN)? SYS_RES_MEMORY : SYS_RES_IOPORT;
 		sc->rgd = (m1 == PCIM_CMD_MEMEN)? FXP_PCI_MMBA : FXP_PCI_IOBA;
-		sc->mem = bus_alloc_resource(dev, sc->rtp, &sc->rgd,
-	                                     0, ~0, 1, RF_ACTIVE);
+		sc->mem = bus_alloc_resource_any(dev, sc->rtp, &sc->rgd,
+		    RF_ACTIVE);
 	}
 	if (sc->mem == NULL && (val & m2)) {
 		sc->rtp =
 		    (m2 == PCIM_CMD_MEMEN)? SYS_RES_MEMORY : SYS_RES_IOPORT;
 		sc->rgd = (m2 == PCIM_CMD_MEMEN)? FXP_PCI_MMBA : FXP_PCI_IOBA;
-		sc->mem = bus_alloc_resource(dev, sc->rtp, &sc->rgd,
-                                            0, ~0, 1, RF_ACTIVE);
+		sc->mem = bus_alloc_resource_any(dev, sc->rtp, &sc->rgd,
+            	    RF_ACTIVE);
 	}
 
 	if (!sc->mem) {
@@ -455,8 +455,8 @@ fxp_attach(device_t dev)
 	 * Allocate our interrupt.
 	 */
 	rid = 0;
-	sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
-				 RF_SHAREABLE | RF_ACTIVE);
+	sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_SHAREABLE | RF_ACTIVE);
 	if (sc->irq == NULL) {
 		device_printf(dev, "could not map interrupt\n");
 		error = ENXIO;
diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c
index cd321504a8..f20a97fe30 100644
--- a/sys/dev/netif/gx/if_gx.c
+++ b/sys/dev/netif/gx/if_gx.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.13 2005/02/18 23:15:00 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.14 2005/05/24 09:52:13 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -272,13 +272,13 @@ gx_attach(device_t dev)
 	}
 
 	rid = GX_PCI_LOMEM;
-	gx->gx_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	gx->gx_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
 #if 0
 /* support PIO mode */
 	rid = PCI_LOIO;
-	gx->gx_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	gx->gx_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+	    RF_ACTIVE);
 #endif
 
 	if (gx->gx_res == NULL) {
@@ -292,7 +292,7 @@ gx_attach(device_t dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	gx->gx_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	gx->gx_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (gx->gx_irq == NULL) {
diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index f5c8d24776..2c219be5f8 100644
--- a/sys/dev/netif/lge/if_lge.c
+++ b/sys/dev/netif/lge/if_lge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.22 2005/05/24 07:26:41 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.23 2005/05/24 09:52:13 joerg Exp $
  */
 
 /*
@@ -485,8 +485,7 @@ lge_attach(device_t dev)
 #endif
 
 	rid = LGE_RID;
-	sc->lge_res = bus_alloc_resource(dev, LGE_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->lge_res = bus_alloc_resource_any(dev, LGE_RES, &rid, RF_ACTIVE);
 
 	if (sc->lge_res == NULL) {
 		printf("lge%d: couldn't map ports/memory\n", unit);
@@ -499,7 +498,7 @@ lge_attach(device_t dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->lge_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->lge_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->lge_irq == NULL) {
diff --git a/sys/dev/netif/lnc/if_lnc_isa.c b/sys/dev/netif/lnc/if_lnc_isa.c
index 83618e7f2e..cb0de46359 100644
--- a/sys/dev/netif/lnc/if_lnc_isa.c
+++ b/sys/dev/netif/lnc/if_lnc_isa.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lnc/if_lnc_isa.c,v 1.12 2001/07/04 13:00:19 nyan Exp $
- * $DragonFly: src/sys/dev/netif/lnc/if_lnc_isa.c,v 1.2 2004/03/14 15:36:50 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/lnc/if_lnc_isa.c,v 1.3 2005/05/24 09:52:13 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -61,8 +61,8 @@ lnc_legacy_probe(device_t dev)
 	struct lnc_softc *sc = device_get_softc(dev);
 
 	sc->portrid = 0;
-	sc->portres = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->portrid,
-					 0, ~0, 1, RF_ACTIVE);
+	sc->portres = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &sc->portrid,
+	    RF_ACTIVE);
 
 	if (! sc->portres) {
 		device_printf(dev, "Failed to allocate I/O ports\n");
@@ -140,8 +140,8 @@ lnc_isa_attach(device_t dev)
 	device_printf(dev, "Attaching %s\n", device_get_desc(dev));
 
 	sc->portrid = 0;
-	sc->portres = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->portrid,
-					 0, ~0, 1, RF_ACTIVE);
+	sc->portres = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &sc->portrid,
+	    RF_ACTIVE);
 
 	if (! sc->portres) {
 		device_printf(dev, "Failed to allocate I/O ports\n");
@@ -150,8 +150,8 @@ lnc_isa_attach(device_t dev)
 	}
 
 	sc->drqrid = 0;
-	sc->drqres = bus_alloc_resource(dev, SYS_RES_DRQ, &sc->drqrid,
-					 0, ~0, 1, RF_ACTIVE);
+	sc->drqres = bus_alloc_resource_any(dev, SYS_RES_DRQ, &sc->drqrid,
+	    RF_ACTIVE);
 
 	if (! sc->drqres) {
 		device_printf(dev, "Failed to allocate DMA channel\n");
@@ -163,8 +163,8 @@ lnc_isa_attach(device_t dev)
 		bus_set_resource(dev, SYS_RES_IRQ, 0, 10, 1);
 
 	sc->irqrid = 0;
-	sc->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irqrid, 0, ~0, 1,
-	                                RF_ACTIVE);
+	sc->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqrid,
+	    RF_ACTIVE);
 
 	if (! sc->irqres) {
 		device_printf(dev, "Failed to allocate irq\n");
diff --git a/sys/dev/netif/lnc/if_lnc_pci.c b/sys/dev/netif/lnc/if_lnc_pci.c
index 659aa28819..d2131f3ed7 100644
--- a/sys/dev/netif/lnc/if_lnc_pci.c
+++ b/sys/dev/netif/lnc/if_lnc_pci.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lnc/if_lnc_pci.c,v 1.25 2001/07/04 13:00:19 nyan Exp $
- * $DragonFly: src/sys/dev/netif/lnc/if_lnc_pci.c,v 1.3 2004/08/23 09:39:29 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/lnc/if_lnc_pci.c,v 1.4 2005/05/24 09:52:13 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -103,15 +103,15 @@ lnc_pci_attach(device_t dev)
 	pci_write_config(dev, PCIR_COMMAND, command, 4);
 
 	rid = PCIR_MAPS;
-	sc->portres = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1,
-	                                 RF_ACTIVE);
+	sc->portres = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+	    RF_ACTIVE);
 
 	if (! sc->portres)
 		device_printf(dev, "Cannot allocate I/O ports\n");
 
 	rid = 0;
-	sc->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
-	                                RF_ACTIVE|RF_SHAREABLE);
+	sc->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE | RF_SHAREABLE);
 
 	if (! sc->irqres)
 		device_printf(dev, "Cannot allocate irq\n");
diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c
index 21ab3f2f6c..3466e28485 100644
--- a/sys/dev/netif/mn/if_mn.c
+++ b/sys/dev/netif/mn/if_mn.c
@@ -22,7 +22,7 @@
  * this gadget.
  *
  * $FreeBSD: src/sys/pci/if_mn.c,v 1.11.2.3 2001/01/23 12:47:09 phk Exp $
- * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.7 2004/09/14 23:49:51 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.8 2005/05/24 09:52:13 joerg Exp $
  */
 
 /*
@@ -1321,8 +1321,7 @@ mn_attach (device_t self)
 	sprintf(sc->name, "mn%d", sc->unit);
 
         rid = PCIR_MAPS;
-        res = bus_alloc_resource(self, SYS_RES_MEMORY, &rid,
-            0, ~0, 1, RF_ACTIVE);
+        res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
         if (res == NULL) {
                 device_printf(self, "Could not map memory\n");
                 return ENXIO;
@@ -1331,8 +1330,7 @@ mn_attach (device_t self)
         sc->m0p = rman_get_start(res);
 
         rid = PCIR_MAPS + 4;
-        res = bus_alloc_resource(self, SYS_RES_MEMORY, &rid,
-            0, ~0, 1, RF_ACTIVE);
+        res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE);
         if (res == NULL) {
                 device_printf(self, "Could not map memory\n");
                 return ENXIO;
@@ -1342,8 +1340,8 @@ mn_attach (device_t self)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->irq = bus_alloc_resource(self, SYS_RES_IRQ, &rid, 0, ~0,
-	    1, RF_SHAREABLE | RF_ACTIVE);
+	sc->irq = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid,
+	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->irq == NULL) {
 		printf("couldn't map interrupt\n");
diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c
index 46566da085..7c1898408f 100644
--- a/sys/dev/netif/my/if_my.c
+++ b/sys/dev/netif/my/if_my.c
@@ -26,7 +26,7 @@
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
  * $FreeBSD: src/sys/dev/my/if_my.c,v 1.2.2.4 2002/04/17 02:05:27 julian Exp $
- * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.16 2005/02/19 00:40:45 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.17 2005/05/24 09:52:13 joerg Exp $
  *
  * Myson fast ethernet PCI NIC driver
  *
@@ -914,8 +914,7 @@ my_attach(device_t dev)
 	}
 
 	rid = MY_RID;
-	sc->my_res = bus_alloc_resource(dev, MY_RES, &rid,
-					0, ~0, 1, RF_ACTIVE);
+	sc->my_res = bus_alloc_resource_any(dev, MY_RES, &rid, RF_ACTIVE);
 
 	if (sc->my_res == NULL) {
 		printf("my%d: couldn't map ports/memory\n", unit);
@@ -926,8 +925,8 @@ my_attach(device_t dev)
 	sc->my_bhandle = rman_get_bushandle(sc->my_res);
 
 	rid = 0;
-	sc->my_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
-					RF_SHAREABLE | RF_ACTIVE);
+	sc->my_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->my_irq == NULL) {
 		printf("my%d: couldn't map interrupt\n", unit);
diff --git a/sys/dev/netif/ndis/if_ndis_pccard.c b/sys/dev/netif/ndis/if_ndis_pccard.c
index 617bf5a1ff..8e474f15e4 100644
--- a/sys/dev/netif/ndis/if_ndis_pccard.c
+++ b/sys/dev/netif/ndis/if_ndis_pccard.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.6 2004/07/11 00:19:30 wpaul Exp $
- * $DragonFly: src/sys/dev/netif/ndis/if_ndis_pccard.c,v 1.3 2004/10/14 18:31:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ndis/if_ndis_pccard.c,v 1.4 2005/05/24 09:52:13 joerg Exp $
  */
 
 #include <sys/ctype.h>
@@ -184,9 +184,8 @@ ndis_attach_pccard(dev)
 	resource_list_init(&sc->ndis_rl);
 
 	sc->ndis_io_rid = 0;
-	sc->ndis_res_io = bus_alloc_resource(dev,
-	    SYS_RES_IOPORT, &sc->ndis_io_rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->ndis_res_io = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+	    &sc->ndis_io_rid, RF_ACTIVE);
 	if (sc->ndis_res_io == NULL) {
 		device_printf(dev,
 		    "couldn't map iospace\n");
@@ -199,8 +198,7 @@ ndis_attach_pccard(dev)
 	    rman_get_size(sc->ndis_res_io));
 
 	rid = 0;
-	sc->ndis_irq = bus_alloc_resource(dev,
-	    SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->ndis_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 	if (sc->ndis_irq == NULL) {
 		device_printf(dev,
diff --git a/sys/dev/netif/ndis/if_ndis_pci.c b/sys/dev/netif/ndis/if_ndis_pci.c
index 89cd1122bc..339255a20e 100644
--- a/sys/dev/netif/ndis/if_ndis_pci.c
+++ b/sys/dev/netif/ndis/if_ndis_pci.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.7 2004/07/11 00:19:30 wpaul Exp $
- * $DragonFly: src/sys/dev/netif/ndis/if_ndis_pci.c,v 1.2 2004/10/14 18:31:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ndis/if_ndis_pci.c,v 1.3 2005/05/24 09:52:13 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -189,9 +189,9 @@ ndis_attach_pci(dev)
 			switch (rle->type) {
 			case SYS_RES_IOPORT:
 				sc->ndis_io_rid = rle->rid;
-				sc->ndis_res_io = bus_alloc_resource(dev,
+				sc->ndis_res_io = bus_alloc_resource_any(dev,
 				    SYS_RES_IOPORT, &sc->ndis_io_rid,
-				    0, ~0, 1, RF_ACTIVE);
+				    RF_ACTIVE);
 				if (sc->ndis_res_io == NULL) {
 					device_printf(dev,
 					    "couldn't map iospace\n");
@@ -210,10 +210,10 @@ ndis_attach_pci(dev)
 				if (rle->rid == PCIR_BAR(2)) {
 					sc->ndis_altmem_rid = rle->rid;
 					sc->ndis_res_altmem =
-					    bus_alloc_resource(dev,
+					    bus_alloc_resource_any(dev,
 					        SYS_RES_MEMORY,
 						&sc->ndis_altmem_rid,
-						0, ~0, 1, RF_ACTIVE);
+						RF_ACTIVE);
 					if (sc->ndis_res_altmem == NULL) {
 						device_printf(dev,
 						    "couldn't map alt "
@@ -224,10 +224,10 @@ ndis_attach_pci(dev)
 				} else {
 					sc->ndis_mem_rid = rle->rid;
 					sc->ndis_res_mem =
-					    bus_alloc_resource(dev,
+					    bus_alloc_resource_any(dev,
 					        SYS_RES_MEMORY,
 						&sc->ndis_mem_rid,
-						0, ~0, 1, RF_ACTIVE);
+						RF_ACTIVE);
 					if (sc->ndis_res_mem == NULL) {
 						device_printf(dev,
 						    "couldn't map memory\n");
@@ -238,9 +238,9 @@ ndis_attach_pci(dev)
 				break;
 			case SYS_RES_IRQ:
 				rid = rle->rid;
-				sc->ndis_irq = bus_alloc_resource(dev,
-				    SYS_RES_IRQ, &rid, 0, ~0, 1,
-	    			    RF_SHAREABLE | RF_ACTIVE);
+				sc->ndis_irq = bus_alloc_resource_any(dev,
+				    SYS_RES_IRQ, &rid,
+				    RF_SHAREABLE | RF_ACTIVE);
 				if (sc->ndis_irq == NULL) {
 					device_printf(dev,
 					    "couldn't map interrupt\n");
@@ -265,8 +265,8 @@ ndis_attach_pci(dev)
 	 */
 	if (sc->ndis_irq == NULL) {
 		rid = 0;
-		sc->ndis_irq = bus_alloc_resource(dev, SYS_RES_IRQ,
-		    &rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE);
+		sc->ndis_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+		    &rid, RF_SHAREABLE | RF_ACTIVE);
 		if (sc->ndis_irq == NULL) {
 			device_printf(dev, "couldn't route interrupt\n");
 			error = ENXIO;
diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index b8bed73b7c..5208160eff 100644
--- a/sys/dev/netif/nge/if_nge.c
+++ b/sys/dev/netif/nge/if_nge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.19 2005/02/21 18:40:36 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.20 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -875,8 +875,7 @@ static int nge_attach(dev)
 #endif
 
 	rid = NGE_RID;
-	sc->nge_res = bus_alloc_resource(dev, NGE_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->nge_res = bus_alloc_resource_any(dev, NGE_RES, &rid, RF_ACTIVE);
 
 	if (sc->nge_res == NULL) {
 		printf("nge%d: couldn't map ports/memory\n", unit);
@@ -889,7 +888,7 @@ static int nge_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->nge_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->nge_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->nge_irq == NULL) {
diff --git a/sys/dev/netif/nv/if_nv.c b/sys/dev/netif/nv/if_nv.c
index eb9cf94713..5547219766 100644
--- a/sys/dev/netif/nv/if_nv.c
+++ b/sys/dev/netif/nv/if_nv.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  * 
  * $Id: if_nv.c,v 1.20 2005/03/12 01:11:00 q Exp $
- * $DragonFly: src/sys/dev/netif/nv/Attic/if_nv.c,v 1.10 2005/04/04 18:45:07 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/nv/Attic/if_nv.c,v 1.11 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -302,8 +302,7 @@ nv_attach(device_t dev)
 
 	/* Allocate memory mapped address space */
 	rid = NV_RID;
-	sc->res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
-				     0, ~0, 1, RF_ACTIVE);
+	sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
 
 	if (sc->res == NULL) {
 		device_printf(dev, "couldn't map memory\n");
@@ -315,8 +314,8 @@ nv_attach(device_t dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
-				     RF_SHAREABLE | RF_ACTIVE);
+	sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->irq == NULL) {
 		device_printf(dev, "couldn't map interrupt\n");
diff --git a/sys/dev/netif/owi/if_owi.c b/sys/dev/netif/owi/if_owi.c
index 63d603c62c..06b4a527b2 100644
--- a/sys/dev/netif/owi/if_owi.c
+++ b/sys/dev/netif/owi/if_owi.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.103.2.2 2002/08/02 07:11:34 imp Exp $
- * $DragonFly: src/sys/dev/netif/owi/Attic/if_owi.c,v 1.4 2005/02/19 01:13:46 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/owi/Attic/if_owi.c,v 1.5 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -2493,8 +2493,8 @@ owi_alloc(dev, rid)
 		sc->wi_bhandle = rman_get_bushandle(sc->iobase);
 	} else {
 		sc->mem_rid = rid;
-		sc->mem = bus_alloc_resource(dev, SYS_RES_MEMORY,
-		    &sc->mem_rid, 0, ~0, 1, RF_ACTIVE);
+		sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+		    &sc->mem_rid, RF_ACTIVE);
 
 		if (!sc->mem) {
 			device_printf(dev, "No Mem space on prism2.5?\n");
@@ -2507,8 +2507,8 @@ owi_alloc(dev, rid)
 
 
 	sc->irq_rid = 0;
-	sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irq_rid,
-	    0, ~0, 1, RF_ACTIVE |
+	sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid,
+	    RF_ACTIVE |
 	    ((sc->wi_bus_type == WI_BUS_PCCARD) ? 0 : RF_SHAREABLE));
 
 	if (!sc->irq) {
diff --git a/sys/dev/netif/owi/if_owi_pci.c b/sys/dev/netif/owi/if_owi_pci.c
index 066370f0b0..0b5ed500bd 100644
--- a/sys/dev/netif/owi/if_owi_pci.c
+++ b/sys/dev/netif/owi/if_owi_pci.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/wi/if_wi_pci.c,v 1.8.2.3 2002/06/16 18:07:18 nsayer Exp $
- * $DragonFly: src/sys/dev/netif/owi/Attic/if_owi_pci.c,v 1.1 2004/09/05 13:34:56 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/owi/Attic/if_owi_pci.c,v 1.2 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -158,8 +158,8 @@ wi_pci_attach(device_t dev)
 
 		/* We have to do a magic PLX poke to enable interrupts */
 		sc->local_rid = WI_PCI_LOCALRES;
-		sc->local = bus_alloc_resource(dev, SYS_RES_IOPORT,
-		    &sc->local_rid, 0, ~0, 1, RF_ACTIVE);
+		sc->local = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+		    &sc->local_rid, RF_ACTIVE);
 		sc->wi_localtag = rman_get_bustag(sc->local);
 		sc->wi_localhandle = rman_get_bushandle(sc->local);
 		command = bus_space_read_4(sc->wi_localtag, sc->wi_localhandle,
@@ -172,8 +172,8 @@ wi_pci_attach(device_t dev)
 		sc->local = NULL;
 
 		sc->mem_rid = WI_PCI_MEMRES;
-		sc->mem = bus_alloc_resource(dev, SYS_RES_MEMORY, &sc->mem_rid,
-					0, ~0, 1, RF_ACTIVE);
+		sc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+		    &sc->mem_rid, RF_ACTIVE);
 		if (sc->mem == NULL) {
 			device_printf(dev, "couldn't allocate memory\n");
 			owi_free(dev);
diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c
index 6ad1ee0db1..722c8d2160 100644
--- a/sys/dev/netif/pcn/if_pcn.c
+++ b/sys/dev/netif/pcn/if_pcn.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.17 2005/02/21 18:40:36 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.18 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -405,8 +405,8 @@ static int pcn_probe(dev)
 			 * so we can read the chip ID register.
 			 */
 			rid = PCN_RID;
-			sc->pcn_res = bus_alloc_resource(dev, PCN_RES, &rid,
-			    0, ~0, 1, RF_ACTIVE);
+			sc->pcn_res = bus_alloc_resource_any(dev, PCN_RES,
+			    &rid, RF_ACTIVE);
 			if (sc->pcn_res == NULL) {
 				device_printf(dev,
 				    "couldn't map ports/memory\n");
@@ -552,8 +552,7 @@ static int pcn_attach(dev)
 #endif
 
 	rid = PCN_RID;
-	sc->pcn_res = bus_alloc_resource(dev, PCN_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->pcn_res = bus_alloc_resource_any(dev, PCN_RES, &rid, RF_ACTIVE);
 
 	if (sc->pcn_res == NULL) {
 		printf("pcn%d: couldn't map ports/memory\n", unit);
@@ -566,7 +565,7 @@ static int pcn_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->pcn_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->pcn_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->pcn_irq == NULL) {
diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c
index 6fd533f6f1..6c03ffe831 100644
--- a/sys/dev/netif/ray/if_ray.c
+++ b/sys/dev/netif/ray/if_ray.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.47.2.4 2001/08/14 22:54:05 dmlb Exp $
- * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.17 2005/02/19 22:24:13 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.18 2005/05/24 09:52:14 joerg Exp $
  *
  */
 
@@ -3735,8 +3735,8 @@ ray_res_alloc_irq(struct ray_softc *sc)
 	    bus_get_resource_count(sc->dev, SYS_RES_IRQ, 0));
 
 	sc->irq_rid = 0;
-	sc->irq_res = bus_alloc_resource(sc->dev, SYS_RES_IRQ, &sc->irq_rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->irq_res = bus_alloc_resource_any(sc->dev, SYS_RES_IRQ,
+	    &sc->irq_rid, RF_ACTIVE);
 	if (!sc->irq_res) {
 		RAY_PRINTF(sc, "Cannot allocate irq");
 		return (ENOMEM);
diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c
index 71244bf095..1fb1d645b5 100644
--- a/sys/dev/netif/rl/if_rl.c
+++ b/sys/dev/netif/rl/if_rl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.19 2005/05/20 14:30:33 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.20 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -791,8 +791,7 @@ rl_attach(device_t dev)
 	pci_enable_io(dev, RL_RES);
 
 	rid = RL_RID; 
-	sc->rl_res = bus_alloc_resource(dev, RL_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->rl_res = bus_alloc_resource_any(dev, RL_RES, &rid, RF_ACTIVE);
 
 	if (sc->rl_res == NULL) {
 		device_printf(dev, "couldn't map ports/memory\n");
diff --git a/sys/dev/netif/sbni/if_sbni_isa.c b/sys/dev/netif/sbni/if_sbni_isa.c
index 861242138a..fee330c9e0 100644
--- a/sys/dev/netif/sbni/if_sbni_isa.c
+++ b/sys/dev/netif/sbni/if_sbni_isa.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.1.2.5 2002/08/11 09:32:00 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbni/Attic/if_sbni_isa.c,v 1.4 2004/01/06 01:40:48 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sbni/Attic/if_sbni_isa.c,v 1.5 2005/05/24 09:52:14 joerg Exp $
  */
 
 
@@ -116,8 +116,8 @@ sbni_attach_isa(device_t dev)
 
 	printf("sbni%d: <Granch SBNI12/ISA adapter> port 0x%lx",
 	       next_sbni_unit, rman_get_start(sc->io_res));
-	sc->irq_res = bus_alloc_resource(
-	    dev, SYS_RES_IRQ, &sc->irq_rid, 0ul, ~0ul, 1, RF_ACTIVE);
+	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid,
+	    RF_ACTIVE);
 
 	if (sc->irq_res) {
 		printf(" irq %ld\n", rman_get_start(sc->irq_res));
diff --git a/sys/dev/netif/sbni/if_sbni_pci.c b/sys/dev/netif/sbni/if_sbni_pci.c
index cf18d430d8..03b0f65795 100644
--- a/sys/dev/netif/sbni/if_sbni_pci.c
+++ b/sys/dev/netif/sbni/if_sbni_pci.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbni/if_sbni_pci.c,v 1.4 2004/04/07 05:45:29 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sbni/if_sbni_pci.c,v 1.5 2005/05/24 09:52:14 joerg Exp $
  */
 
  
@@ -132,8 +132,8 @@ sbni_pci_attach(device_t dev)
 	printf("sbni%d: <Granch SBNI12/PCI%sadapter> port 0x%lx",
 	       next_sbni_unit, sc->slave_sc ? " Dual " : " ",
 	       rman_get_start(sc->io_res));
-	sc->irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irq_rid,
-					 0ul, ~0ul, 1, RF_SHAREABLE);
+	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid,
+	    RF_SHAREABLE);
 
 	if (sc->irq_res) {
 		printf(" irq %ld\n", rman_get_start(sc->irq_res));
diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c
index 3fb6b48756..e729463075 100644
--- a/sys/dev/netif/sbsh/if_sbsh.c
+++ b/sys/dev/netif/sbsh/if_sbsh.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.15 2005/02/19 23:05:07 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.16 2005/05/24 09:52:14 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -239,8 +239,8 @@ sbsh_attach(device_t dev)
 	}
 
 	rid = 0;
-	sc->irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
-						RF_SHAREABLE | RF_ACTIVE);
+	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->irq_res == NULL) {
 		printf("sbsh%d: couldn't map interrupt\n", unit);
diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c
index d37f319356..095a988e5c 100644
--- a/sys/dev/netif/sf/if_sf.c
+++ b/sys/dev/netif/sf/if_sf.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $
- * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.16 2005/02/21 18:40:37 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.17 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -732,8 +732,7 @@ static int sf_attach(dev)
 #endif
 
 	rid = SF_RID;
-	sc->sf_res = bus_alloc_resource(dev, SF_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->sf_res = bus_alloc_resource_any(dev, SF_RES, &rid, RF_ACTIVE);
 
 	if (sc->sf_res == NULL) {
 		printf ("sf%d: couldn't map ports\n", unit);
@@ -746,7 +745,7 @@ static int sf_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->sf_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->sf_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->sf_irq == NULL) {
diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c
index ec7c39e6be..09c9dc52fc 100644
--- a/sys/dev/netif/sis/if_sis.c
+++ b/sys/dev/netif/sis/if_sis.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.20 2005/02/21 18:40:37 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.21 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -1023,8 +1023,7 @@ sis_attach(device_t dev)
 #endif
 
 	rid = SIS_RID;
-	sc->sis_res = bus_alloc_resource(dev, SIS_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->sis_res = bus_alloc_resource_any(dev, SIS_RES, &rid, RF_ACTIVE);
 
 	if (sc->sis_res == NULL) {
 		device_printf(dev, "couldn't map ports/memory\n");
@@ -1037,7 +1036,7 @@ sis_attach(device_t dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->sis_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->sis_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->sis_irq == NULL) {
diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index e9099799b2..fee7b4500e 100644
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.26 2005/02/21 18:40:37 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.27 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -1615,8 +1615,7 @@ static int skc_attach(dev)
 #endif
 
 	rid = SK_RID;
-	sc->sk_res = bus_alloc_resource(dev, SK_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->sk_res = bus_alloc_resource_any(dev, SK_RES, &rid, RF_ACTIVE);
 
 	if (sc->sk_res == NULL) {
 		printf("sk%d: couldn't map ports/memory\n", unit);
@@ -1629,7 +1628,7 @@ static int skc_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->sk_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->sk_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->sk_irq == NULL) {
diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index 53c2117a65..8092f28fd0 100644
--- a/sys/dev/netif/sn/if_sn.c
+++ b/sys/dev/netif/sn/if_sn.c
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *   $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $
- *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.13 2005/02/20 05:45:11 joerg Exp $
+ *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.14 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -1242,8 +1242,8 @@ sn_activate(device_t dev)
 	}
 
 	sc->irq_rid = 0;
-	sc->irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irq_rid, 
-	    0, ~0, 1, RF_ACTIVE);
+	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid, 
+	    RF_ACTIVE);
 	if (!sc->irq_res) {
 #ifdef SN_DEBUG
 		device_printf(dev, "Cannot allocate irq\n");
diff --git a/sys/dev/netif/snc/if_snc.c b/sys/dev/netif/snc/if_snc.c
index 250fa59142..24aa6af18d 100644
--- a/sys/dev/netif/snc/if_snc.c
+++ b/sys/dev/netif/snc/if_snc.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/snc/if_snc.c,v 1.2.2.1 2000/10/21 03:30:03 nyan Exp $
- * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc.c,v 1.5 2005/02/19 15:47:44 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc.c,v 1.6 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -139,8 +139,8 @@ snc_alloc_irq(dev, rid, flags)
 	struct snc_softc *sc = device_get_softc(dev);
 	struct resource *res;
 
-	res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				 0ul, ~0ul, 1, (RF_ACTIVE | flags));
+	res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    (RF_ACTIVE | flags));
 	if (res) {
 		sc->irq = res;
 		sc->irq_rid = rid;
diff --git a/sys/dev/netif/sr/if_sr.c b/sys/dev/netif/sr/if_sr.c
index 1990d02564..f3b177e302 100644
--- a/sys/dev/netif/sr/if_sr.c
+++ b/sys/dev/netif/sr/if_sr.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48.2.1 2002/06/17 15:10:58 jhay Exp $
- * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.12 2005/01/23 20:21:31 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.13 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -515,8 +515,8 @@ sr_allocate_irq(device_t device, int rid, u_long size)
 	struct sr_hardc *hc = device_get_softc(device);
 
 	hc->rid_irq = rid;
-	hc->res_irq = bus_alloc_resource(device, SYS_RES_IRQ,
-			&hc->rid_irq, 0ul, ~0ul, 1, RF_SHAREABLE|RF_ACTIVE);
+	hc->res_irq = bus_alloc_resource_any(device, SYS_RES_IRQ,
+	    &hc->rid_irq, RF_SHAREABLE|RF_ACTIVE);
 	if (hc->res_irq == NULL) {
 		goto errexit;
 	}
diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index 2867b0d24a..38d4408fcf 100644
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.16 2005/02/21 18:40:37 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.17 2005/05/24 09:52:14 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -971,8 +971,7 @@ static int ste_attach(dev)
 #endif
 
 	rid = STE_RID;
-	sc->ste_res = bus_alloc_resource(dev, STE_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->ste_res = bus_alloc_resource_any(dev, STE_RES, &rid, RF_ACTIVE);
 
 	if (sc->ste_res == NULL) {
 		printf ("ste%d: couldn't map ports/memory\n", unit);
@@ -984,7 +983,7 @@ static int ste_attach(dev)
 	sc->ste_bhandle = rman_get_bushandle(sc->ste_res);
 
 	rid = 0;
-	sc->ste_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->ste_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->ste_irq == NULL) {
diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index 70e25a8701..b050f128d8 100644
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.19 2005/05/05 22:57:45 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.20 2005/05/24 09:52:14 joerg Exp $
  */
 
 /*
@@ -1544,8 +1544,8 @@ static int ti_attach(dev)
 	}
 
 	rid = TI_PCI_LOMEM;
-	sc->ti_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->ti_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
 
 	if (sc->ti_res == NULL) {
 		printf ("ti%d: couldn't map memory\n", unit);
@@ -1560,7 +1560,7 @@ static int ti_attach(dev)
 	/* Allocate interrupt */
 	rid = 0;
 	
-	sc->ti_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->ti_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->ti_irq == NULL) {
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index 8a59e1cd07..f56b586fbc 100644
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
- * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.17 2005/05/05 22:57:45 swildner Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.18 2005/05/24 09:52:15 joerg Exp $
  */
 
 /*
@@ -1146,8 +1146,8 @@ static int tl_attach(dev)
 	}
 
 	rid = TL_PCI_LOIO;
-	sc->tl_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-		0, ~0, 1, RF_ACTIVE);
+	sc->tl_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+		RF_ACTIVE);
 
 	/*
 	 * Some cards have the I/O and memory mapped address registers
@@ -1155,8 +1155,8 @@ static int tl_attach(dev)
 	 */
 	if (sc->tl_res == NULL) {
 		rid = TL_PCI_LOMEM;
-		sc->tl_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-		    0, ~0, 1, RF_ACTIVE);
+		sc->tl_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+		    RF_ACTIVE);
 	}
 #else
 	if (!(command & PCIM_CMD_MEMEN)) {
@@ -1166,12 +1166,12 @@ static int tl_attach(dev)
 	}
 
 	rid = TL_PCI_LOMEM;
-	sc->tl_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->tl_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
 	if (sc->tl_res == NULL) {
 		rid = TL_PCI_LOIO;
-		sc->tl_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
-		    0, ~0, 1, RF_ACTIVE);
+		sc->tl_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+		    RF_ACTIVE);
 	}
 #endif
 
@@ -1198,7 +1198,7 @@ static int tl_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->tl_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->tl_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->tl_irq == NULL) {
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index 172a002f44..38a83d551e 100644
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.16 2005/02/20 03:08:29 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.17 2005/05/24 09:52:15 joerg Exp $
  */
 
 /*
@@ -263,8 +263,7 @@ epic_attach(dev)
 #endif
 
 	rid = EPIC_RID;
-	sc->res = bus_alloc_resource(dev, EPIC_RES, &rid, 0, ~0, 1,
-	    RF_ACTIVE);
+	sc->res = bus_alloc_resource_any(dev, EPIC_RES, &rid, RF_ACTIVE);
 
 	if (sc->res == NULL) {
 		device_printf(dev, "couldn't map ports/memory\n");
@@ -277,7 +276,7 @@ epic_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->irq == NULL) {
diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c
index 2fdb6d1de9..35ccc49bea 100644
--- a/sys/dev/netif/txp/if_txp.c
+++ b/sys/dev/netif/txp/if_txp.c
@@ -1,6 +1,6 @@
 /*	$OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $	*/
 /*	$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */
-/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.17 2005/02/21 18:40:37 joerg Exp $ */
+/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.18 2005/05/24 09:52:15 joerg Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -240,8 +240,7 @@ txp_attach(dev)
 #endif
 
 	rid = TXP_RID;
-	sc->sc_res = bus_alloc_resource(dev, TXP_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->sc_res = bus_alloc_resource_any(dev, TXP_RES, &rid, RF_ACTIVE);
 
 	if (sc->sc_res == NULL) {
 		device_printf(dev, "couldn't map ports/memory\n");
@@ -254,7 +253,7 @@ txp_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->sc_irq == NULL) {
diff --git a/sys/dev/netif/vx/if_vx_eisa.c b/sys/dev/netif/vx/if_vx_eisa.c
index fc118d107d..dab3239459 100644
--- a/sys/dev/netif/vx/if_vx_eisa.c
+++ b/sys/dev/netif/vx/if_vx_eisa.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.14 2000/01/29 14:50:31 peter Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.7 2004/08/12 06:42:59 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.8 2005/05/24 09:52:15 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -124,16 +124,14 @@ vx_eisa_attach(device_t dev)
      * driver comes first.
      */
     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);
     if (!io) {
 	device_printf(dev, "No I/O space?!\n");
 	goto bad;
     }
 
     rid = 1;
-    eisa_io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-				 0, ~0, 1, RF_ACTIVE);
+    eisa_io = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
     if (!eisa_io) {
 	device_printf(dev, "No I/O space?!\n");
 	goto bad;
@@ -146,8 +144,7 @@ vx_eisa_attach(device_t dev)
     sc->vx_btag = rman_get_bustag(io);
 
     rid = 0;
-    irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-			     0, ~0, 1, RF_ACTIVE);
+    irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
     if (!irq) {
 	device_printf(dev, "No irq?!\n");
 	goto bad;
diff --git a/sys/dev/netif/vx/if_vx_pci.c b/sys/dev/netif/vx/if_vx_pci.c
index 55e802000d..2b9cd0dec2 100644
--- a/sys/dev/netif/vx/if_vx_pci.c
+++ b/sys/dev/netif/vx/if_vx_pci.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx_pci.c,v 1.21 2000/05/28 15:59:52 peter Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.5 2003/12/07 19:23:40 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.6 2005/05/24 09:52:15 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -128,8 +128,8 @@ vx_pci_attach(
     sc = device_get_softc(dev);
 
     rid = PCIR_MAPS;
-    sc->vx_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-	0, ~0, 1, RF_ACTIVE);
+    sc->vx_res = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+	RF_ACTIVE);
 
     if (sc->vx_res == NULL)
 	goto bad;
@@ -138,7 +138,7 @@ vx_pci_attach(
     sc->vx_bhandle = rman_get_bushandle(sc->vx_res);
 
     rid = 0;
-    sc->vx_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+    sc->vx_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	RF_SHAREABLE | RF_ACTIVE);
 
     if (sc->vx_irq == NULL)
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index be50a583af..0a0ae6608e 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.17 2005/02/21 18:40:37 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.18 2005/05/24 09:52:15 joerg Exp $
  */
 
 /*
@@ -870,8 +870,7 @@ static int wb_attach(dev)
 #endif
 
 	rid = WB_RID;
-	sc->wb_res = bus_alloc_resource(dev, WB_RES, &rid,
-	    0, ~0, 1, RF_ACTIVE);
+	sc->wb_res = bus_alloc_resource_any(dev, WB_RES, &rid, RF_ACTIVE);
 
 	if (sc->wb_res == NULL) {
 		printf("wb%d: couldn't map ports/memory\n", unit);
@@ -884,7 +883,7 @@ static int wb_attach(dev)
 
 	/* Allocate interrupt */
 	rid = 0;
-	sc->wb_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+	sc->wb_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->wb_irq == NULL) {
diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c
index d193c43069..7f6c220646 100644
--- a/sys/dev/netif/xe/if_xe.c
+++ b/sys/dev/netif/xe/if_xe.c
@@ -25,7 +25,7 @@
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
  * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.13.2.6 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.16 2005/02/20 04:02:14 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.17 2005/05/24 09:52:15 joerg Exp $
  */
 
 /*
@@ -2194,8 +2194,8 @@ xe_activate(device_t dev)
 	}
 
 	sc->irq_rid = 0;
-	sc->irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irq_rid, 
-	    0, ~0, 1, RF_ACTIVE);
+	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid, 
+	    RF_ACTIVE);
 	if (!sc->irq_res) {
 #if XE_DEBUG > 0
 		device_printf(dev, "Cannot allocate irq\n");
-- 
2.41.0