diff --git a/sys/arch/i386/isa/sb.c b/sys/arch/i386/isa/sb.c index 4f173f408cdd..2744e668d10a 100644 --- a/sys/arch/i386/isa/sb.c +++ b/sys/arch/i386/isa/sb.c @@ -1,4 +1,4 @@ -/* $NetBSD: sb.c,v 1.19 1995/03/08 18:27:35 brezak Exp $ */ +/* $NetBSD: sb.c,v 1.20 1995/03/14 18:43:19 brezak Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sb.c,v 1.19 1995/03/08 18:27:35 brezak Exp $ + * $Id: sb.c,v 1.20 1995/03/14 18:43:19 brezak Exp $ */ #include @@ -284,6 +284,9 @@ sbattach(parent, self, aux) sbdsp_attach(&sc->sc_sbdsp); + sprintf(sb_device.version, "%d.%d", + SBVER_MAJOR(sc->sc_model), SBVER_MINOR(sc->sc_model)); + if (audio_hardware_attach(&sb_hw_if, (caddr_t)&sc->sc_sbdsp) != 0) printf("sb: could not attach to audio pseudo-device driver\n"); } diff --git a/sys/arch/i386/isa/sbdsp.c b/sys/arch/i386/isa/sbdsp.c index b8659d0462cb..2c4a4c52d46a 100644 --- a/sys/arch/i386/isa/sbdsp.c +++ b/sys/arch/i386/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbdsp.c,v 1.3 1995/03/13 14:37:12 brezak Exp $ */ +/* $NetBSD: sbdsp.c,v 1.4 1995/03/14 18:43:22 brezak Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sbdsp.c,v 1.3 1995/03/13 14:37:12 brezak Exp $ + * $Id: sbdsp.c,v 1.4 1995/03/14 18:43:22 brezak Exp $ */ /* * SoundBlaster Pro code provided by John Kohl, based on lots of @@ -87,8 +87,6 @@ struct { int wmidi; } sberr; -extern struct audio_device sb_device; - #ifdef DEBUG void sb_printsc(struct sbdsp_softc *sc) @@ -192,8 +190,6 @@ sbdsp_attach(sc) } printf(": dsp v%d.%d\n", SBVER_MAJOR(sc->sc_model), SBVER_MINOR(sc->sc_model)); - sprintf(sb_device.version, "%d.%d", - SBVER_MAJOR(sc->sc_model), SBVER_MINOR(sc->sc_model)); } /* diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c index 4f173f408cdd..2744e668d10a 100644 --- a/sys/dev/isa/sb.c +++ b/sys/dev/isa/sb.c @@ -1,4 +1,4 @@ -/* $NetBSD: sb.c,v 1.19 1995/03/08 18:27:35 brezak Exp $ */ +/* $NetBSD: sb.c,v 1.20 1995/03/14 18:43:19 brezak Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sb.c,v 1.19 1995/03/08 18:27:35 brezak Exp $ + * $Id: sb.c,v 1.20 1995/03/14 18:43:19 brezak Exp $ */ #include @@ -284,6 +284,9 @@ sbattach(parent, self, aux) sbdsp_attach(&sc->sc_sbdsp); + sprintf(sb_device.version, "%d.%d", + SBVER_MAJOR(sc->sc_model), SBVER_MINOR(sc->sc_model)); + if (audio_hardware_attach(&sb_hw_if, (caddr_t)&sc->sc_sbdsp) != 0) printf("sb: could not attach to audio pseudo-device driver\n"); } diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c index b8659d0462cb..2c4a4c52d46a 100644 --- a/sys/dev/isa/sbdsp.c +++ b/sys/dev/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbdsp.c,v 1.3 1995/03/13 14:37:12 brezak Exp $ */ +/* $NetBSD: sbdsp.c,v 1.4 1995/03/14 18:43:22 brezak Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sbdsp.c,v 1.3 1995/03/13 14:37:12 brezak Exp $ + * $Id: sbdsp.c,v 1.4 1995/03/14 18:43:22 brezak Exp $ */ /* * SoundBlaster Pro code provided by John Kohl, based on lots of @@ -87,8 +87,6 @@ struct { int wmidi; } sberr; -extern struct audio_device sb_device; - #ifdef DEBUG void sb_printsc(struct sbdsp_softc *sc) @@ -192,8 +190,6 @@ sbdsp_attach(sc) } printf(": dsp v%d.%d\n", SBVER_MAJOR(sc->sc_model), SBVER_MINOR(sc->sc_model)); - sprintf(sb_device.version, "%d.%d", - SBVER_MAJOR(sc->sc_model), SBVER_MINOR(sc->sc_model)); } /*