summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/cbus/fdc.c23
-rw-r--r--sys/pc98/cbus/olpt.c4
-rw-r--r--sys/pc98/cbus/pckbd.c2
-rw-r--r--sys/pc98/cbus/ppc.c10
-rw-r--r--sys/pc98/cbus/sio.c12
-rw-r--r--sys/pc98/pc98/canbus.c8
-rw-r--r--sys/pc98/pc98/fd.c23
-rw-r--r--sys/pc98/pc98/mse.c4
-rw-r--r--sys/pc98/pc98/olpt.c4
-rw-r--r--sys/pc98/pc98/pc98kbd.c2
-rw-r--r--sys/pc98/pc98/ppc.c10
-rw-r--r--sys/pc98/pc98/sio.c12
12 files changed, 56 insertions, 58 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index c3a4dde..72680f3 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -925,8 +925,8 @@ fdc_alloc_resources(struct fdc_data *fdc)
#ifdef PC98
rid = 3;
bus_set_resource(dev, SYS_RES_IOPORT, rid, IO_FDPORT, 1);
- fdc->res_fdsio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
- 1, RF_ACTIVE);
+ fdc->res_fdsio = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
if (fdc->res_fdsio == 0)
return ENXIO;
fdc->sc_fdsiot = rman_get_bustag(fdc->res_fdsio);
@@ -934,8 +934,8 @@ fdc_alloc_resources(struct fdc_data *fdc)
rid = 4;
bus_set_resource(dev, SYS_RES_IOPORT, rid, 0x4be, 1);
- fdc->res_fdemsio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
- 1, RF_ACTIVE);
+ fdc->res_fdemsio = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
if (fdc->res_fdemsio == 0)
return ENXIO;
fdc->sc_fdemsiot = rman_get_bustag(fdc->res_fdemsio);
@@ -980,9 +980,8 @@ fdc_alloc_resources(struct fdc_data *fdc)
* Now (finally!) allocate the control port.
*/
fdc->rid_ctl = 1;
- fdc->res_ctl = bus_alloc_resource(dev, SYS_RES_IOPORT,
- &fdc->rid_ctl,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ fdc->res_ctl = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &fdc->rid_ctl, RF_ACTIVE);
if (fdc->res_ctl == 0) {
device_printf(dev,
"cannot reserve control I/O port range (control port)\n");
@@ -993,18 +992,16 @@ fdc_alloc_resources(struct fdc_data *fdc)
}
#endif
- fdc->res_irq = bus_alloc_resource(dev, SYS_RES_IRQ,
- &fdc->rid_irq, 0ul, ~0ul, 1,
- RF_ACTIVE);
+ fdc->res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &fdc->rid_irq, RF_ACTIVE);
if (fdc->res_irq == 0) {
device_printf(dev, "cannot reserve interrupt line\n");
return ENXIO;
}
if ((fdc->flags & FDC_NODMA) == 0) {
- fdc->res_drq = bus_alloc_resource(dev, SYS_RES_DRQ,
- &fdc->rid_drq, 0ul, ~0ul, 1,
- RF_ACTIVE);
+ fdc->res_drq = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &fdc->rid_drq, RF_ACTIVE);
if (fdc->res_drq == 0) {
device_printf(dev, "cannot reserve DMA request line\n");
return ENXIO;
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 0ebd84c..6fbdcdf 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -431,8 +431,8 @@ lpt_attach(device_t dev)
sc->sc_irq = 0;
if (isa_get_irq(dev) != -1) {
rid = 0;
- sc->res_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
- 0, ~0, 1, RF_ACTIVE);
+ sc->res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+ RF_ACTIVE);
if (sc->res_irq == NULL) {
bus_release_resource(dev, SYS_RES_IOPORT, 0,
sc->res_port);
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index c7c793a..2d1fc01 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -134,7 +134,7 @@ pckbdattach(device_t dev)
device_get_flags(dev));
rid = 0;
- res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_ACTIVE);
+ res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
if (res == NULL)
return ENXIO;
BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY,
diff --git a/sys/pc98/cbus/ppc.c b/sys/pc98/cbus/ppc.c
index af78af8..a2adc3f 100644
--- a/sys/pc98/cbus/ppc.c
+++ b/sys/pc98/cbus/ppc.c
@@ -1937,10 +1937,12 @@ ppc_probe(device_t dev)
ppc->ppc_flags = device_get_flags(dev);
if (!(ppc->ppc_flags & 0x20)) {
- ppc->res_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &ppc->rid_irq,
- 0ul, ~0ul, 1, RF_SHAREABLE);
- ppc->res_drq = bus_alloc_resource(dev, SYS_RES_DRQ, &ppc->rid_drq,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ ppc->res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &ppc->rid_irq,
+ RF_SHAREABLE);
+ ppc->res_drq = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &ppc->rid_drq,
+ RF_ACTIVE);
}
if (ppc->res_irq)
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 39269ea..a15e5d9 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -851,8 +851,8 @@ sioprobe(dev, xrid, rclk, noprobe)
rid = xrid;
#ifdef PC98
if (IS_8251(iod.if_type)) {
- port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
- 0, ~0, 1, RF_ACTIVE);
+ port = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
} else if (iod.if_type == COM_IF_MODEM_CARD ||
iod.if_type == COM_IF_RSA98III ||
isa_get_vendorid(dev)) {
@@ -1442,8 +1442,8 @@ sioattach(dev, xrid, rclk)
rid = xrid;
#ifdef PC98
if (IS_8251(if_type)) {
- port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
- 0, ~0, 1, RF_ACTIVE);
+ port = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
} else if (if_type == COM_IF_MODEM_CARD ||
if_type == COM_IF_RSA98III ||
isa_get_vendorid(dev)) {
@@ -1831,8 +1831,8 @@ determined_type: ;
pps_init(&com->pps);
rid = 0;
- com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, ~0ul, 1,
- RF_ACTIVE);
+ com->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+ RF_ACTIVE);
if (com->irqres) {
ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres,
INTR_TYPE_TTY | INTR_FAST,
diff --git a/sys/pc98/pc98/canbus.c b/sys/pc98/pc98/canbus.c
index 1a58a23..893ac29 100644
--- a/sys/pc98/pc98/canbus.c
+++ b/sys/pc98/pc98/canbus.c
@@ -393,10 +393,10 @@ alloc_ioresource(device_t dev)
{
struct canbus_softc *sc = device_get_softc(dev);
- sc->index_res = bus_alloc_resource(
- dev, SYS_RES_IOPORT, &sc->index_id, 0ul, ~0ul, 1, RF_ACTIVE);
- sc->data_res = bus_alloc_resource(
- dev, SYS_RES_IOPORT, &sc->data_id, 0ul, ~0ul, 1, RF_ACTIVE);
+ sc->index_res = bus_alloc_resource_any(
+ dev, SYS_RES_IOPORT, &sc->index_id, RF_ACTIVE);
+ sc->data_res = bus_alloc_resource_any(
+ dev, SYS_RES_IOPORT, &sc->data_id, RF_ACTIVE);
if (sc->index_res == NULL || sc->data_res == NULL) {
device_printf(dev, "could not map I/O\n");
return (ENXIO);
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index c3a4dde..72680f3 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -925,8 +925,8 @@ fdc_alloc_resources(struct fdc_data *fdc)
#ifdef PC98
rid = 3;
bus_set_resource(dev, SYS_RES_IOPORT, rid, IO_FDPORT, 1);
- fdc->res_fdsio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
- 1, RF_ACTIVE);
+ fdc->res_fdsio = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
if (fdc->res_fdsio == 0)
return ENXIO;
fdc->sc_fdsiot = rman_get_bustag(fdc->res_fdsio);
@@ -934,8 +934,8 @@ fdc_alloc_resources(struct fdc_data *fdc)
rid = 4;
bus_set_resource(dev, SYS_RES_IOPORT, rid, 0x4be, 1);
- fdc->res_fdemsio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0,
- 1, RF_ACTIVE);
+ fdc->res_fdemsio = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
if (fdc->res_fdemsio == 0)
return ENXIO;
fdc->sc_fdemsiot = rman_get_bustag(fdc->res_fdemsio);
@@ -980,9 +980,8 @@ fdc_alloc_resources(struct fdc_data *fdc)
* Now (finally!) allocate the control port.
*/
fdc->rid_ctl = 1;
- fdc->res_ctl = bus_alloc_resource(dev, SYS_RES_IOPORT,
- &fdc->rid_ctl,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ fdc->res_ctl = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+ &fdc->rid_ctl, RF_ACTIVE);
if (fdc->res_ctl == 0) {
device_printf(dev,
"cannot reserve control I/O port range (control port)\n");
@@ -993,18 +992,16 @@ fdc_alloc_resources(struct fdc_data *fdc)
}
#endif
- fdc->res_irq = bus_alloc_resource(dev, SYS_RES_IRQ,
- &fdc->rid_irq, 0ul, ~0ul, 1,
- RF_ACTIVE);
+ fdc->res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &fdc->rid_irq, RF_ACTIVE);
if (fdc->res_irq == 0) {
device_printf(dev, "cannot reserve interrupt line\n");
return ENXIO;
}
if ((fdc->flags & FDC_NODMA) == 0) {
- fdc->res_drq = bus_alloc_resource(dev, SYS_RES_DRQ,
- &fdc->rid_drq, 0ul, ~0ul, 1,
- RF_ACTIVE);
+ fdc->res_drq = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &fdc->rid_drq, RF_ACTIVE);
if (fdc->res_drq == 0) {
device_printf(dev, "cannot reserve DMA request line\n");
return ENXIO;
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index 4ddeb63..541d056 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -390,8 +390,8 @@ mse_attach(dev)
return ENXIO;
}
#endif
- 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/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index 0ebd84c..6fbdcdf 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -431,8 +431,8 @@ lpt_attach(device_t dev)
sc->sc_irq = 0;
if (isa_get_irq(dev) != -1) {
rid = 0;
- sc->res_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
- 0, ~0, 1, RF_ACTIVE);
+ sc->res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+ RF_ACTIVE);
if (sc->res_irq == NULL) {
bus_release_resource(dev, SYS_RES_IOPORT, 0,
sc->res_port);
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index c7c793a..2d1fc01 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.c
@@ -134,7 +134,7 @@ pckbdattach(device_t dev)
device_get_flags(dev));
rid = 0;
- res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_ACTIVE);
+ res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
if (res == NULL)
return ENXIO;
BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY,
diff --git a/sys/pc98/pc98/ppc.c b/sys/pc98/pc98/ppc.c
index af78af8..a2adc3f 100644
--- a/sys/pc98/pc98/ppc.c
+++ b/sys/pc98/pc98/ppc.c
@@ -1937,10 +1937,12 @@ ppc_probe(device_t dev)
ppc->ppc_flags = device_get_flags(dev);
if (!(ppc->ppc_flags & 0x20)) {
- ppc->res_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &ppc->rid_irq,
- 0ul, ~0ul, 1, RF_SHAREABLE);
- ppc->res_drq = bus_alloc_resource(dev, SYS_RES_DRQ, &ppc->rid_drq,
- 0ul, ~0ul, 1, RF_ACTIVE);
+ ppc->res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+ &ppc->rid_irq,
+ RF_SHAREABLE);
+ ppc->res_drq = bus_alloc_resource_any(dev, SYS_RES_DRQ,
+ &ppc->rid_drq,
+ RF_ACTIVE);
}
if (ppc->res_irq)
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 39269ea..a15e5d9 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -851,8 +851,8 @@ sioprobe(dev, xrid, rclk, noprobe)
rid = xrid;
#ifdef PC98
if (IS_8251(iod.if_type)) {
- port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
- 0, ~0, 1, RF_ACTIVE);
+ port = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
} else if (iod.if_type == COM_IF_MODEM_CARD ||
iod.if_type == COM_IF_RSA98III ||
isa_get_vendorid(dev)) {
@@ -1442,8 +1442,8 @@ sioattach(dev, xrid, rclk)
rid = xrid;
#ifdef PC98
if (IS_8251(if_type)) {
- port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
- 0, ~0, 1, RF_ACTIVE);
+ port = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+ RF_ACTIVE);
} else if (if_type == COM_IF_MODEM_CARD ||
if_type == COM_IF_RSA98III ||
isa_get_vendorid(dev)) {
@@ -1831,8 +1831,8 @@ determined_type: ;
pps_init(&com->pps);
rid = 0;
- com->irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0ul, ~0ul, 1,
- RF_ACTIVE);
+ com->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+ RF_ACTIVE);
if (com->irqres) {
ret = BUS_SETUP_INTR(device_get_parent(dev), dev, com->irqres,
INTR_TYPE_TTY | INTR_FAST,
OpenPOWER on IntegriCloud