diff options
| author | cg <cg@FreeBSD.org> | 1999-12-21 06:18:03 +0000 |
|---|---|---|
| committer | cg <cg@FreeBSD.org> | 1999-12-21 06:18:03 +0000 |
| commit | 8c2d08d7dc311a606cc80d9193e986f1436bbdbf (patch) | |
| tree | 2717bb0b2894bc1b48ccc61aa23da877c5ff8206 /sys | |
| parent | 25ab62d5d58446b1089f6d46607f5bd8407ad59f (diff) | |
| download | FreeBSD-src-8c2d08d7dc311a606cc80d9193e986f1436bbdbf.zip FreeBSD-src-8c2d08d7dc311a606cc80d9193e986f1436bbdbf.tar.gz | |
don't use the sbpro mic vol register during init on ess cards; it causes
feedback and we use the native one elsewhere.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/sound/isa/sb.c | 3 | ||||
| -rw-r--r-- | sys/dev/sound/isa/sb16.c | 3 | ||||
| -rw-r--r-- | sys/dev/sound/isa/sb8.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/sound/isa/sb.c b/sys/dev/sound/isa/sb.c index 622df44..5eaa1f5 100644 --- a/sys/dev/sound/isa/sb.c +++ b/sys/dev/sound/isa/sb.c @@ -978,7 +978,8 @@ sbmix_init(snd_mixer *m) mix_setdevs(m, SBPRO_MIXER_DEVICES); mix_setrecdevs(m, SBPRO_RECORDING_DEVICES); sb_setmixer(sb, 0, 1); /* reset mixer */ - sb_setmixer(sb, MIC_VOL, 0x6); /* mic volume max */ + if (!(sb->bd_flags & BD_F_ESS)) + sb_setmixer(sb, MIC_VOL, 0x6); /* mic volume max */ sb_setmixer(sb, RECORD_SRC, 0x0); /* mic source */ sb_setmixer(sb, FM_VOL, 0x0); /* no midi */ break; diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c index 622df44..5eaa1f5 100644 --- a/sys/dev/sound/isa/sb16.c +++ b/sys/dev/sound/isa/sb16.c @@ -978,7 +978,8 @@ sbmix_init(snd_mixer *m) mix_setdevs(m, SBPRO_MIXER_DEVICES); mix_setrecdevs(m, SBPRO_RECORDING_DEVICES); sb_setmixer(sb, 0, 1); /* reset mixer */ - sb_setmixer(sb, MIC_VOL, 0x6); /* mic volume max */ + if (!(sb->bd_flags & BD_F_ESS)) + sb_setmixer(sb, MIC_VOL, 0x6); /* mic volume max */ sb_setmixer(sb, RECORD_SRC, 0x0); /* mic source */ sb_setmixer(sb, FM_VOL, 0x0); /* no midi */ break; diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c index 622df44..5eaa1f5 100644 --- a/sys/dev/sound/isa/sb8.c +++ b/sys/dev/sound/isa/sb8.c @@ -978,7 +978,8 @@ sbmix_init(snd_mixer *m) mix_setdevs(m, SBPRO_MIXER_DEVICES); mix_setrecdevs(m, SBPRO_RECORDING_DEVICES); sb_setmixer(sb, 0, 1); /* reset mixer */ - sb_setmixer(sb, MIC_VOL, 0x6); /* mic volume max */ + if (!(sb->bd_flags & BD_F_ESS)) + sb_setmixer(sb, MIC_VOL, 0x6); /* mic volume max */ sb_setmixer(sb, RECORD_SRC, 0x0); /* mic source */ sb_setmixer(sb, FM_VOL, 0x0); /* no midi */ break; |
