diff options
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/isavar.h | 30 | ||||
| -rw-r--r-- | sys/isa/psm.c | 17 | ||||
| -rw-r--r-- | sys/isa/sio.c | 17 | ||||
| -rw-r--r-- | sys/isa/syscons.c | 17 |
4 files changed, 52 insertions, 29 deletions
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h index 756333a58378..bb8ee55c780f 100644 --- a/sys/isa/isavar.h +++ b/sys/isa/isavar.h @@ -23,14 +23,34 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: isavar.h,v 1.1 1998/08/06 08:49:09 dfr Exp $ */ +#define ISA_NPORT_IVARS 2 +#define ISA_NMEM_IVARS 2 +#define ISA_NIRQ_IVARS 2 +#define ISA_NDRQ_IVARS 2 + enum isa_device_ivars { - ISA_IVAR_PORT, - ISA_IVAR_PORTSIZE, - ISA_IVAR_FLAGS, - ISA_IVAR_IRQ + ISA_IVAR_PORT, + ISA_IVAR_PORT_0 = ISA_IVAR_PORT, + ISA_IVAR_PORT_1, + ISA_IVAR_PORTSIZE, + ISA_IVAR_PORTSIZE_0 = ISA_IVAR_PORTSIZE, + ISA_IVAR_PORTSIZE_1, + ISA_IVAR_MADDR, + ISA_IVAR_MADDR_0 = ISA_IVAR_MADDR, + ISA_IVAR_MADDR_1, + ISA_IVAR_MSIZE, + ISA_IVAR_MSIZE_0 = ISA_IVAR_MSIZE, + ISA_IVAR_MSIZE_1, + ISA_IVAR_FLAGS, + ISA_IVAR_IRQ, + ISA_IVAR_IRQ_0 = ISA_IVAR_IRQ, + ISA_IVAR_IRQ_1, + ISA_IVAR_DRQ, + ISA_IVAR_DRQ_0 = ISA_IVAR_DRQ, + ISA_IVAR_DRQ_1 }; extern int isa_irq_pending(void); diff --git a/sys/isa/psm.c b/sys/isa/psm.c index 68eb46a69b30..5b999e1b36af 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.56 1998/10/22 05:58:40 bde Exp $ + * $Id: psm.c,v 1.1 1998/11/08 18:43:03 dfr Exp $ */ /* @@ -76,6 +76,7 @@ #include <sys/poll.h> #include <sys/syslog.h> #include <sys/malloc.h> +#include <sys/rman.h> #ifdef DEVFS #include <sys/devfsext.h> #endif @@ -85,6 +86,7 @@ #include <machine/clock.h> #include <machine/limits.h> #include <machine/mouse.h> +#include <machine/resource.h> #include <isa/isareg.h> #include <isa/isavar.h> @@ -981,6 +983,8 @@ psmattach(device_t dev) int unit = device_get_unit(dev); struct psm_softc *sc = device_get_softc(dev); void *ih; + struct resource *res; + int zero = 0; if (sc == NULL) /* shouldn't happen */ return (ENXIO); @@ -1023,14 +1027,11 @@ psmattach(device_t dev) if (bootverbose) --verbose; - ih = BUS_CREATE_INTR(device_get_parent(dev), dev, - isa_get_irq(dev), - psmintr, sc); - if (!ih) - return ENXIO; + res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, 0ul, ~0ul, 1, + RF_SHAREABLE | RF_ACTIVE); + BUS_SETUP_INTR(device_get_parent(dev), dev, res, psmintr, sc, + &ih); - BUS_CONNECT_INTR(device_get_parent(dev), ih); - return (0); } diff --git a/sys/isa/sio.c b/sys/isa/sio.c index d5b48cee1ecb..683c59ea3fb0 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.216 1998/09/26 13:59:26 peter Exp $ + * $Id: sio.c,v 1.217 1998/09/26 14:47:16 dfr Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.215 */ @@ -68,6 +68,7 @@ #include <sys/syslog.h> #include <sys/sysctl.h> #include <sys/bus.h> +#include <sys/rman.h> #ifdef DEVFS #include <sys/devfsext.h> #endif @@ -78,6 +79,7 @@ #include <machine/clock.h> #include <machine/ipl.h> +#include <machine/resource.h> #include <isa/sioreg.h> @@ -921,6 +923,8 @@ sioattach(dev) int s; int unit; void *ih; + struct resource *res; + int zero = 0; u_int flags = isa_get_flags(dev); #if 0 @@ -1136,13 +1140,10 @@ determined_type: ; #endif com->flags = isa_get_flags(dev); /* Heritate id_flags for later */ - ih = BUS_CREATE_INTR(device_get_parent(dev), dev, - isa_get_irq(dev), - siointr, com); - if (!ih) - return ENXIO; - - BUS_CONNECT_INTR(device_get_parent(dev), ih); + res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, 0ul, ~0ul, 1, + RF_SHAREABLE | RF_ACTIVE); + BUS_SETUP_INTR(device_get_parent(dev), dev, res, siointr, com, + &ih); return (0); } diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 65a51537b4b7..e44fe37ee308 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.275 1998/10/31 10:35:23 dfr Exp $ + * $Id: syscons.c,v 1.276 1998/11/08 12:39:04 dfr Exp $ * from: i386/isa syscons.c,v 1.278 */ @@ -54,10 +54,12 @@ #include <sys/tty.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/rman.h> #ifdef DEVFS #include <sys/devfsext.h> #endif +#include <machine/resource.h> #include <machine/clock.h> #include <machine/cons.h> #include <machine/console.h> @@ -694,6 +696,8 @@ scattach(device_t dev) int vc; #endif void *ih; + struct resource *res; + int zero = 0; scinit(); flags = isa_get_flags(dev); @@ -771,13 +775,10 @@ scattach(device_t dev) UID_ROOT, GID_WHEEL, 0600, "consolectl"); #endif - ih = BUS_CREATE_INTR(device_get_parent(dev), dev, - isa_get_irq(dev), - scintr, 0); - if (!ih) - return ENXIO; - - BUS_CONNECT_INTR(device_get_parent(dev), ih); + res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, 0ul, ~0ul, 1, + RF_SHAREABLE | RF_ACTIVE); + BUS_SETUP_INTR(device_get_parent(dev), dev, res, scintr, 0, + &ih); return 0; } |