diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-08-24 05:03:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-08-24 05:03:19 +0000 |
| commit | ddaf243afb250670a6edb0a73cdec8d579110114 (patch) | |
| tree | 24dcc28d99aadef3d123c7ca795067f9570b0a29 /sys/dev/isa | |
| parent | 4c3e26f1485b97d9a69743b237cc9b7c9da2a69c (diff) | |
probe-time fix provided by jfw@jfwhome.funhouse.com
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/pas.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c index 8afde25ff14..b18526d13d3 100644 --- a/sys/dev/isa/pas.c +++ b/sys/dev/isa/pas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pas.c,v 1.11 1996/05/26 00:27:26 deraadt Exp $ */ +/* $OpenBSD: pas.c,v 1.12 1996/08/24 05:03:18 deraadt Exp $ */ /* $NetBSD: pas.c,v 1.17 1996/05/12 23:53:18 mycroft Exp $ */ /* @@ -87,18 +87,12 @@ int pasdebug = 0; * most basic communications with the sb card. */ struct pas_softc { - struct device sc_dev; /* base device */ - struct isadev sc_id; /* ISA device */ - void *sc_ih; /* interrupt vectoring */ - - int sc_iobase; /* PAS iobase */ - int sc_irq; /* PAS irq */ - int sc_drq; /* PAS drq */ - - int model; + struct sbdsp_softc sc_sbdsp; /* use sc_dev, sc_id, sc_ih, + * sc_iobase, sc_irq, sc_drq + * from here */ + int model; /* unique to PAS */ int rev; - struct sbdsp_softc sc_sbdsp; }; int pasopen __P((dev_t, int)); @@ -351,7 +345,7 @@ pasprobe(parent, match, aux) } /* Now a SoundBlaster */ - sc->sc_iobase = ia->ia_iobase; +/* sc->sc_iobase = ia->ia_iobase; /* and set the SB iobase into the DSP as well ... */ sc->sc_sbdsp.sc_iobase = ia->ia_iobase; if (sbdsp_reset(&sc->sc_sbdsp) < 0) { @@ -438,9 +432,9 @@ pasattach(parent, self, aux) register int iobase = ia->ia_iobase; int err; - sc->sc_iobase = iobase; - sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, - IPL_AUDIO, sbdsp_intr, &sc->sc_sbdsp, sc->sc_dev.dv_xname); + sc->sc_sbdsp.sc_iobase = iobase; + sc->sc_sbdsp.sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, + IPL_AUDIO, sbdsp_intr, &sc->sc_sbdsp, sc->sc_sbdsp.sc_dev.dv_xname); printf(" ProAudio Spectrum %s [rev %d] ", pasnames[sc->model], sc->rev); |