summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authoraugustss <augustss@NetBSD.org>1997-08-19 23:35:44 +0000
committeraugustss <augustss@NetBSD.org>1997-08-19 23:35:44 +0000
commitf78dfdfe6ed3fcbdb4a3bedc8ec1631c62a30ca5 (patch)
treeef286f4868ba8114dc38da7a6997918f009020a0 /sys
parent68a9b3513475f0f4933b461fb87e202ad6e4fcf0 (diff)
Avoid munging audio_defaults.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/isa/ad1848.c10
-rw-r--r--sys/dev/isa/sbdsp.c10
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c
index 2bb987c384e..80cf3f10ec3 100644
--- a/sys/dev/isa/ad1848.c
+++ b/sys/dev/isa/ad1848.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848.c,v 1.37 1997/08/04 19:05:27 augustss Exp $ */
+/* $NetBSD: ad1848.c,v 1.38 1997/08/19 23:35:45 augustss Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -494,7 +494,7 @@ ad1848_attach(sc)
int i;
struct ad1848_volume vol_mid = {220, 220};
struct ad1848_volume vol_0 = {0, 0};
- struct audio_params xparams;
+ struct audio_params params, xparams;
sc->sc_locked = 0;
sc->sc_playrun = NOTRUNNING;
@@ -529,8 +529,10 @@ ad1848_attach(sc)
}
ad1848_reset(sc);
- (void) ad1848_set_params(sc, AUMODE_RECORD, &audio_default, &xparams);
- (void) ad1848_set_params(sc, AUMODE_PLAY, &audio_default, &xparams);
+ params = audio_default;
+ (void) ad1848_set_params(sc, AUMODE_RECORD, &params, &xparams);
+ params = audio_default;
+ (void) ad1848_set_params(sc, AUMODE_PLAY, &params, &xparams);
/* Set default gains */
(void) ad1848_set_rec_gain(sc, &vol_mid);
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index f6453ddabd6..8712a381c27 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbdsp.c,v 1.66 1997/08/11 01:08:13 augustss Exp $ */
+/* $NetBSD: sbdsp.c,v 1.67 1997/08/19 23:35:44 augustss Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -316,7 +316,7 @@ void
sbdsp_attach(sc)
struct sbdsp_softc *sc;
{
- struct audio_params xparams;
+ struct audio_params params, xparams;
int i;
u_int v;
@@ -340,8 +340,10 @@ sbdsp_attach(sc)
}
}
- sbdsp_set_params(sc, AUMODE_RECORD, &audio_default, &xparams);
- sbdsp_set_params(sc, AUMODE_PLAY, &audio_default, &xparams);
+ params = audio_default;
+ sbdsp_set_params(sc, AUMODE_RECORD, &params, &xparams);
+ params = audio_default;
+ sbdsp_set_params(sc, AUMODE_PLAY, &params, &xparams);
sbdsp_set_in_port(sc, SB_MIC_VOL);
sbdsp_set_out_port(sc, SB_MASTER_VOL);