diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index f38cacf09d05..b565b9554d64 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,4 +1,4 @@ -/* $NetBSD: gus.c,v 1.21 1997/03/20 06:48:53 mycroft Exp $ */ +/* $NetBSD: gus.c,v 1.22 1997/04/06 00:54:22 augustss Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -178,6 +178,8 @@ struct gus_softc { struct device sc_dev; /* base device */ struct isadev sc_id; /* ISA device */ void *sc_ih; /* interrupt vector */ + bus_space_tag_t sc_iot; /* tag */ + bus_space_handle_t sc_ioh; /* handle */ int sc_iobase; /* I/O base address */ int sc_irq; /* IRQ used */ @@ -681,6 +683,7 @@ gusprobe(parent, match, aux) register int iobase = ia->ia_iobase; int recdrq = cf->cf_flags; + sc->sc_iot = ia->ia_iot; /* * Before we do anything else, make sure requested IRQ and DRQ are * valid for this card. @@ -2952,6 +2955,7 @@ gus_init_cs4231(sc) outb(port+GUS_MAX_CTRL, ctrl); + sc->sc_codec.sc_iot = sc->sc_iot; sc->sc_codec.sc_iobase = port+GUS_MAX_CODEC_BASE; if (ad1848_probe(&sc->sc_codec) == 0) { diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c index 12cdc13ee004..5cb70d57b25f 100644 --- a/sys/dev/isa/pas.c +++ b/sys/dev/isa/pas.c @@ -1,4 +1,4 @@ -/* $NetBSD: pas.c,v 1.23 1997/03/24 05:30:28 jtk Exp $ */ +/* $NetBSD: pas.c,v 1.24 1997/04/06 00:54:25 augustss Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -341,6 +341,7 @@ pasprobe(parent, match, aux) /* Now a SoundBlaster */ sc->sc_sbdsp.sc_iobase = ia->ia_iobase; + sc->sc_sbdsp.sc_iot = ia->ia_iot; if (sbdsp_reset(&sc->sc_sbdsp) < 0) { DPRINTF(("pas: couldn't reset card\n")); return 0; diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c index fbc7fab74ab3..210fc369513b 100644 --- a/sys/dev/isa/pss.c +++ b/sys/dev/isa/pss.c @@ -1,4 +1,4 @@ -/* $NetBSD: pss.c,v 1.23 1997/04/05 23:50:25 augustss Exp $ */ +/* $NetBSD: pss.c,v 1.24 1997/04/06 00:54:25 augustss Exp $ */ /* * Copyright (c) 1994 John Brezak @@ -844,9 +844,11 @@ spprobe(parent, match, aux) struct ad1848_softc *sc = match; struct pss_softc *pc = (void *) parent; struct cfdata *cf = (void *)sc->sc_dev.dv_cfdata; + struct isa_attach_args *ia = aux; u_char bits; int i; + sc->sc_iot = ia->ia_iot; sc->sc_iobase = cf->cf_iobase + WSS_CODEC; /* Set WSS io address */ diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c index f6df3a9f84ed..e87645c5f1e9 100644 --- a/sys/dev/isa/wss.c +++ b/sys/dev/isa/wss.c @@ -1,4 +1,4 @@ -/* $NetBSD: wss.c,v 1.21 1997/04/06 00:33:08 augustss Exp $ */ +/* $NetBSD: wss.c,v 1.22 1997/04/06 00:54:27 augustss Exp $ */ /* * Copyright (c) 1994 John Brezak @@ -222,6 +222,7 @@ wssprobe(parent, match, aux) }; static u_char dma_bits[4] = {1, 2, 0, 3}; + sc->sc_iot = ia->ia_iot; if (sc->sc_dev.dv_cfdata->cf_flags & 1) sc->mad_chip_type = madprobe(sc, ia->ia_iobase); else @@ -236,6 +237,7 @@ wssprobe(parent, match, aux) if (bus_space_map(sc->sc_iot, ia->ia_iobase, WSS_CODEC, 0, &sc->sc_ioh)) return 0; + sc->sc_ad1848.sc_iot = sc->sc_iot; sc->sc_ad1848.sc_iobase = ia->ia_iobase + WSS_CODEC; /* Is there an ad1848 chip at (WSS iobase + WSS_CODEC)? */