summaryrefslogtreecommitdiffstats
path: root/sys/i4b
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i4b')
-rw-r--r--sys/i4b/capi/iavc/iavc_isa.c5
-rw-r--r--sys/i4b/capi/iavc/iavc_pci.c15
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_pci.c9
-rw-r--r--sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c9
-rw-r--r--sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c12
-rw-r--r--sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c4
-rw-r--r--sys/i4b/layer1/isic/i4b_avm_a1.c17
-rw-r--r--sys/i4b/layer1/isic/i4b_ctx_s0P.c34
-rw-r--r--sys/i4b/layer1/isic/i4b_drn_ngo.c6
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_pcc16.c12
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_qs1p.c18
-rw-r--r--sys/i4b/layer1/isic/i4b_isic_pnp.c12
-rw-r--r--sys/i4b/layer1/isic/i4b_itk_ix1.c8
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s016.c12
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s0163.c36
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s08.c12
-rw-r--r--sys/i4b/layer1/isic/i4b_usr_sti.c36
-rw-r--r--sys/i4b/layer1/itjc/i4b_itjc_pci.c8
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_pci.c12
19 files changed, 135 insertions, 142 deletions
diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index 050426d..3dbb8aa 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -193,9 +193,8 @@ iavc_isa_attach(device_t dev)
sc->sc_resources.irq_rid = 0;
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid, RF_ACTIVE)))
{
printf("iavc%d: can't allocate irq\n",unit);
bus_release_resource(dev, SYS_RES_IOPORT,
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index f3c75c8..0183ea1 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -143,9 +143,8 @@ iavc_pci_attach(device_t dev)
sc->sc_resources.io_rid[0] = 0x14;
if (!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0UL, ~0UL, 1, RF_ACTIVE))) {
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0], RF_ACTIVE))) {
printf("iavc%d: can't allocate io region\n", unit);
return(ENXIO);
}
@@ -159,9 +158,8 @@ iavc_pci_attach(device_t dev)
sc->sc_resources.mem_rid = 0x10;
if (!(sc->sc_resources.mem =
- bus_alloc_resource(dev, SYS_RES_MEMORY,
- &sc->sc_resources.mem_rid,
- 0UL, ~0UL, 1, RF_ACTIVE))) {
+ bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+ &sc->sc_resources.mem_rid, RF_ACTIVE))) {
printf("iavc%d: can't allocate memory region\n", unit);
return(ENXIO);
}
@@ -218,9 +216,8 @@ iavc_pci_attach(device_t dev)
sc->sc_resources.irq_rid = 0x00;
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0UL, ~0UL, 1, RF_SHAREABLE|RF_ACTIVE))) {
+ bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->sc_resources.irq_rid,
+ RF_SHAREABLE|RF_ACTIVE))) {
printf("iavc%d: can't allocate irq\n",unit);
return(ENXIO);
}
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index 6e4c354..202707d 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -515,9 +515,8 @@ avma1pp_attach_avma1pp(device_t dev)
ifpi_scp[unit] = sc;
sc->sc_resources.io_rid[0] = PCIR_BAR(1);
- sc->sc_resources.io_base[0] = bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0, ~0, 1, RF_ACTIVE);
+ sc->sc_resources.io_base[0] = bus_alloc_resource_any(dev,
+ SYS_RES_IOPORT, &sc->sc_resources.io_rid[0], RF_ACTIVE);
if (sc->sc_resources.io_base[0] == NULL) {
printf("avma1pp%d: couldn't map IO port\n", unit);
@@ -530,8 +529,8 @@ avma1pp_attach_avma1pp(device_t dev)
/* Allocate interrupt */
sc->sc_resources.irq_rid = 0;
- sc->sc_resources.irq = bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE);
+ sc->sc_resources.irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid, RF_SHAREABLE | RF_ACTIVE);
if (sc->sc_resources.irq == NULL) {
bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(1), sc->sc_resources.io_base[0]);
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index 7284af0..3f83859 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -469,9 +469,8 @@ avma1pp2_attach_avma1pp(device_t dev)
ifpi2_scp[unit] = sc;
sc->sc_resources.io_rid[0] = PCIR_BAR(1);
- sc->sc_resources.io_base[0] = bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0, ~0, 1, RF_ACTIVE);
+ sc->sc_resources.io_base[0] = bus_alloc_resource_any(dev,
+ SYS_RES_IOPORT, &sc->sc_resources.io_rid[0], RF_ACTIVE);
if (sc->sc_resources.io_base[0] == NULL) {
printf("ifpi2-%d: couldn't map IO port\n", unit);
@@ -484,8 +483,8 @@ avma1pp2_attach_avma1pp(device_t dev)
/* Allocate interrupt */
sc->sc_resources.irq_rid = 0;
- sc->sc_resources.irq = bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE);
+ sc->sc_resources.irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid, RF_SHAREABLE | RF_ACTIVE);
if (sc->sc_resources.irq == NULL) {
bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(1), sc->sc_resources.io_base[0]);
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index c1e7ce7..e267957 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -481,9 +481,9 @@ avm_pnp_attach(device_t dev)
/* get io_base */
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0UL, ~0UL, 1, RF_ACTIVE ) ))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE ) ))
{
printf("avm_pnp_attach: Couldn't get my io_base.\n");
return ENXIO;
@@ -503,9 +503,9 @@ avm_pnp_attach(device_t dev)
/* get irq, release io_base if we don't get it */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_ACTIVE)))
{
printf("avm_pnp%d: Could not get irq.\n",unit);
error = ENXIO;
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
index 1493e85..db6a6d8 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
@@ -174,9 +174,9 @@ ihfc_pnp_probe(device_t dev)
0UL, ~0UL, 2, RF_ACTIVE
);
- S_IRQ = bus_alloc_resource(
+ S_IRQ = bus_alloc_resource_any(
dev, SYS_RES_IRQ, &S_IRQRID,
- 0UL, ~0UL, 1, RF_ACTIVE
+ RF_ACTIVE
);
S_DLP = IHFC_DLP; /* set D-priority */
diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c
index 0c8c831..d786c1c 100644
--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@@ -142,9 +142,9 @@ isic_alloc_port(device_t dev, int rid, u_int base, u_int len)
bus_set_resource(dev, SYS_RES_IOPORT, rid, base, len);
if(!(sc->sc_resources.io_base[rid] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[rid],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[rid],
+ RF_ACTIVE)))
{
printf("isic%d: Error, failed to reserve io #%d!\n", unit, rid);
isic_detach_common(dev);
@@ -182,9 +182,9 @@ isic_probe_avma1(device_t dev)
/* see if an io base was supplied */
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get iobase for AVM A1/Fritz!\n",
unit);
@@ -239,9 +239,8 @@ isic_probe_avma1(device_t dev)
/* get our irq */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid, RF_ACTIVE)))
{
printf("isic%d: Could not get an irq for AVM A1/Fritz!\n",unit);
isic_detach_common(dev);
diff --git a/sys/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
index 7fd0f87..b256d78 100644
--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@@ -122,9 +122,9 @@ isic_attach_Cs0P(device_t dev)
sc->sc_resources.io_rid[1] = 1;
if(!(sc->sc_resources.io_base[1] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[1],
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[1],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get io area 1 for Creatix / Teles PnP!\n", unit);
isic_detach_common(dev);
@@ -141,9 +141,9 @@ isic_attach_Cs0P(device_t dev)
sc->sc_resources.io_rid[2] = 2;
if(!(sc->sc_resources.io_base[2] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
&sc->sc_resources.io_rid[2],
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ RF_ACTIVE)))
{
printf("isic%d: Could not get cfg io area for Compaq Microcom 610\n", unit);
isic_detach_common(dev);
@@ -187,9 +187,9 @@ isic_attach_Cs0P(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, 2, iobase1-0x20, 0x40);
if(!(sc->sc_resources.io_base[2] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[2],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[2],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get io area 2 for Creatix / Teles PnP!\n", unit);
isic_detach_common(dev);
@@ -215,9 +215,9 @@ isic_attach_Cs0P(device_t dev)
#endif
if(!(sc->sc_resources.io_base[3] =
- bus_alloc_resource(dev,SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[3],
- 0ul,~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev,SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[3],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get io area 3 for Creatix / Teles PnP!\n", unit);
isic_detach_common(dev);
@@ -231,9 +231,9 @@ isic_attach_Cs0P(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, 4, iobase2, 0x40);
if(!(sc->sc_resources.io_base[4] =
- bus_alloc_resource(dev,SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[4],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev,SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[4],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get io area 4 for Creatix / Teles PnP!\n", unit);
isic_detach_common(dev);
@@ -252,9 +252,9 @@ isic_attach_Cs0P(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, 5, iocfg, 0x01);
if(!(sc->sc_resources.io_base[5] =
- bus_alloc_resource(dev,SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[5],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev,SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[5],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get cfg io area for Compaq Microcom 610!\n", unit);
isic_detach_common(dev);
diff --git a/sys/i4b/layer1/isic/i4b_drn_ngo.c b/sys/i4b/layer1/isic/i4b_drn_ngo.c
index 74f7d3e..51a0170 100644
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@@ -224,9 +224,9 @@ isic_attach_drnngo(device_t dev)
*/
if(!(sc->sc_resources.io_base[1] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[1],
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[1],
+ RF_ACTIVE)))
{
printf("isic%d: Failed to get second io base.\n", unit);
isic_detach_common(dev);
diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
index d288414..81b09bf 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@@ -237,9 +237,9 @@ isic_probe_Epcc16(device_t dev)
/* see if an io base was supplied */
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get iobase for ELSA PCC-16.\n",
unit);
@@ -321,9 +321,9 @@ isic_probe_Epcc16(device_t dev)
/* get our irq */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_ACTIVE)))
{
printf("isic%d: Could not get an irq.\n",unit);
isic_detach_Epcc16(dev);
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
index d55ac83..68f3aa5 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -260,9 +260,9 @@ eqs1p_pci_attach(device_t dev)
sc->sc_resources.io_rid[0] = ELSA_PORT0_MAPOFF;
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE)))
{
printf("isic%d: Couldn't get first iobase for ELSA MicroLink ISDN/PCI!\n", unit);
return(ENXIO);
@@ -271,9 +271,9 @@ eqs1p_pci_attach(device_t dev)
sc->sc_resources.io_rid[1] = ELSA_PORT1_MAPOFF;
if(!(sc->sc_resources.io_base[1] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[1],
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[1],
+ RF_ACTIVE)))
{
printf("isic%d: Couldn't get second iobase for ELSA MicroLink ISDN/PCI!\n", unit);
isic_detach_common(dev);
@@ -283,9 +283,9 @@ eqs1p_pci_attach(device_t dev)
sc->sc_port = rman_get_start(sc->sc_resources.io_base[1]);
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0UL, ~0UL, 1, RF_ACTIVE | RF_SHAREABLE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_ACTIVE | RF_SHAREABLE)))
{
printf("isic%d: Could not get irq for ELSA MicroLink ISDN/PCI!\n",unit);
isic_detach_common(dev);
diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c
index af0801d..336eac5a 100644
--- a/sys/i4b/layer1/isic/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c
@@ -188,9 +188,9 @@ isic_pnp_attach(device_t dev)
/* get io_base */
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0UL, ~0UL, 1, RF_ACTIVE ) ))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE ) ))
{
printf("isic_pnp_attach: Couldn't get my io_base.\n");
return ENXIO;
@@ -203,9 +203,9 @@ isic_pnp_attach(device_t dev)
/* get irq, release io_base if we don't get it */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_ACTIVE)))
{
printf("isic%d: Could not get irq.\n",unit);
isic_detach_common(dev);
diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c
index f0e49cb..c1abe70 100644
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@@ -208,9 +208,9 @@ isic_probe_itkix1(device_t dev)
#endif
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
&sc->sc_resources.io_rid[0],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ RF_ACTIVE)))
{
printf("isic%d: Could not allocate i/o port for ITK IX1.\n", unit);
return ENXIO;
@@ -230,9 +230,9 @@ isic_probe_itkix1(device_t dev)
/* get our irq */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
&sc->sc_resources.irq_rid,
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ RF_ACTIVE)))
{
printf("isic%d: Could not allocate irq for ITK IX1.\n", unit);
bus_release_resource(dev,SYS_RES_IOPORT,
diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c
index 5bfb05a..cbce4c1 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@@ -147,9 +147,9 @@ isic_probe_s016(device_t dev)
/* see if an io base was supplied */
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE)))
{
printf("isic%d: Could not allocate i/o port for Teles S0/16.\n", unit);
return(ENXIO);
@@ -290,9 +290,9 @@ isic_probe_s016(device_t dev)
/* get our irq */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_ACTIVE)))
{
printf("isic%d: Could not allocate irq for Teles S0/16.\n", unit);
isic_detach_common(dev);
diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c
index 3ff6dba..7eca095 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@@ -135,9 +135,9 @@ isic_probe_s0163(device_t dev)
/* see if an io base was supplied */
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get iobase for Teles S0/16.3.\n",
unit);
@@ -182,9 +182,9 @@ isic_probe_s0163(device_t dev)
sc->sc_resources.io_rid[0] = 0;
bus_set_resource(dev, SYS_RES_IOPORT, 0, sc->sc_port, 0x20);
sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0ul, ~0ul, 1, RF_ACTIVE);
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE);
if(!sc->sc_resources.io_base[0])
{
printf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
@@ -196,9 +196,9 @@ isic_probe_s0163(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, 1,
sc->sc_port-ISAC_OFFS, 0x20);
sc->sc_resources.io_base[1] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[1],
- 0ul, ~0ul, 1, RF_ACTIVE);
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[1],
+ RF_ACTIVE);
if(!sc->sc_resources.io_base[1])
{
printf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
@@ -211,9 +211,9 @@ isic_probe_s0163(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, 2,
sc->sc_port-HSCXA_OFFS, 0x20);
sc->sc_resources.io_base[2] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[2],
- 0ul, ~0ul, 1, RF_ACTIVE);
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[2],
+ RF_ACTIVE);
if(!sc->sc_resources.io_base[2])
{
printf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
@@ -226,9 +226,9 @@ isic_probe_s0163(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, 3,
sc->sc_port-HSCXB_OFFS, 0x20);
sc->sc_resources.io_base[3] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[3],
- 0ul, ~0ul, 1, RF_ACTIVE);
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[3],
+ RF_ACTIVE);
if(!sc->sc_resources.io_base[3])
{
printf("isic%d: Error allocating io at 0x%x for Teles S0/16.3!\n",
@@ -307,9 +307,9 @@ isic_probe_s0163(device_t dev)
/* get our irq */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_ACTIVE)))
{
printf("isic%d: Could not get IRQ for Teles S0/16.3.\n",unit);
isic_detach_common(dev);
diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c
index 0de354d..13fa732 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@@ -143,9 +143,9 @@ isic_probe_s08(device_t dev)
/* see if an io base was supplied */
if((sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE)))
{
/* the S0/8 is completely memory mapped ! */
@@ -217,9 +217,9 @@ isic_probe_s08(device_t dev)
/* allocate our irq */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_ACTIVE)))
{
printf("isic%d: Could not allocate irq for Teles S0/8!\n",unit);
diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c
index f99f2b2..c860970 100644
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@@ -224,9 +224,9 @@ usrtai_alloc_port(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, num, base, 1);
if(!(sc->sc_resources.io_base[num] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[num],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[num],
+ RF_ACTIVE)))
{
printf("isic%d: Error, failed to reserve io #%dport %#x!\n", unit, num, base);
isic_detach_common(dev);
@@ -244,9 +244,9 @@ usrtai_alloc_port(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, num, base+i*1024, 8);
if(!(sc->sc_resources.io_base[num] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[num],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[num],
+ RF_ACTIVE)))
{
printf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
isic_detach_common(dev);
@@ -265,9 +265,9 @@ usrtai_alloc_port(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, num, base+i*1024, 8);
if(!(sc->sc_resources.io_base[num] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[num],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[num],
+ RF_ACTIVE)))
{
printf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
isic_detach_common(dev);
@@ -286,9 +286,9 @@ usrtai_alloc_port(device_t dev)
bus_set_resource(dev, SYS_RES_IOPORT, num, base+i*1024, 8);
if(!(sc->sc_resources.io_base[num] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[num],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[num],
+ RF_ACTIVE)))
{
printf("isic%d: Error, failed to reserve io #%d port %#x!\n", unit, num, base+i*1024);
isic_detach_common(dev);
@@ -325,9 +325,9 @@ isic_probe_usrtai(device_t dev)
/* see if an io base was supplied */
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE)))
{
printf("isic%d: Could not get iobase for USR Sportster TA!\n",
unit);
@@ -385,9 +385,9 @@ isic_probe_usrtai(device_t dev)
/* get our irq */
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0ul, ~0ul, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_ACTIVE)))
{
printf("isic%d: Could not get an irq for USR Sportster TA!\n",unit);
isic_detach_common(dev);
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
index f319ea0..7233dac 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -1539,8 +1539,8 @@ itjc_attach(device_t dev)
itjc_scp[unit] = sc;
sc->sc_resources.io_rid[0] = PCIR_BAR(0);
- sc->sc_resources.io_base[0] = bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0], 0, ~0, 1, RF_ACTIVE);
+ sc->sc_resources.io_base[0] = bus_alloc_resource_any(dev,
+ SYS_RES_IOPORT, &sc->sc_resources.io_rid[0], RF_ACTIVE);
if (sc->sc_resources.io_base[0] == NULL)
{
@@ -1556,8 +1556,8 @@ itjc_attach(device_t dev)
/* Allocate interrupt. */
sc->sc_resources.irq_rid = 0;
- sc->sc_resources.irq = bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE);
+ sc->sc_resources.irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid, RF_SHAREABLE | RF_ACTIVE);
if (sc->sc_resources.irq == NULL)
{
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
index c8bbbe0..d9d2bcd 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@@ -200,9 +200,9 @@ iwic_pci_attach(device_t dev)
sc->sc_resources.io_rid[0] = BADDR1;
if(!(sc->sc_resources.io_base[0] =
- bus_alloc_resource(dev, SYS_RES_IOPORT,
- &sc->sc_resources.io_rid[0],
- 0UL, ~0UL, 1, RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &sc->sc_resources.io_rid[0],
+ RF_ACTIVE)))
{
printf("iwic%d: Couldn't alloc io port!\n", unit);
return(ENXIO);
@@ -211,9 +211,9 @@ iwic_pci_attach(device_t dev)
iobase = rman_get_start(sc->sc_resources.io_base[0]);
if(!(sc->sc_resources.irq =
- bus_alloc_resource(dev, SYS_RES_IRQ,
- &sc->sc_resources.irq_rid,
- 0UL, ~0UL, 1, RF_SHAREABLE|RF_ACTIVE)))
+ bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &sc->sc_resources.irq_rid,
+ RF_SHAREABLE|RF_ACTIVE)))
{
printf("iwic%d: Couldn't alloc irq!\n",unit);
return(ENXIO);
OpenPOWER on IntegriCloud