[src/netbsd-1-4]: src/sys/dev/isa Pull up revision 1.49 (requested by mycroft):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e5a66d60e9f3
branches:  netbsd-1-4
changeset: 470094:e5a66d60e9f3
user:      he <he%NetBSD.org@localhost>
date:      Thu Jan 20 20:45:01 2000 +0000

description:
Pull up revision 1.49 (requested by mycroft):
  Make CD passthrough work when the audio playback/record device
  is closed.

diffstat:

 sys/dev/isa/ess.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (32 lines):

diff -r 1ec1d018190f -r e5a66d60e9f3 sys/dev/isa/ess.c
--- a/sys/dev/isa/ess.c Tue Jan 18 20:18:09 2000 +0000
+++ b/sys/dev/isa/ess.c Thu Jan 20 20:45:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ess.c,v 1.44.2.1 1999/06/22 14:20:24 perry Exp $       */
+/*     $NetBSD: ess.c,v 1.44.2.2 2000/01/20 20:45:01 he Exp $  */
 
 /*
  * Copyright 1997
@@ -2382,18 +2382,16 @@
 ess_speaker_on(sc)
        struct ess_softc *sc;
 {
-       /* Disable mute on left- and right-master volume. */
-       ess_clear_mreg_bits(sc, ESS_MREG_VOLUME_LEFT, ESS_VOLUME_MUTE);
-       ess_clear_mreg_bits(sc, ESS_MREG_VOLUME_RIGHT, ESS_VOLUME_MUTE);
+       /* Unmute the DAC. */
+       ess_set_gain(sc, ESS_DAC_PLAY_VOL, 1);
 }
 
 void
 ess_speaker_off(sc)
        struct ess_softc *sc;
 {
-       /* Enable mute on left- and right-master volume. */
-       ess_set_mreg_bits(sc, ESS_MREG_VOLUME_LEFT, ESS_VOLUME_MUTE);
-       ess_set_mreg_bits(sc, ESS_MREG_VOLUME_RIGHT, ESS_VOLUME_MUTE);
+       /* Mute the DAC. */
+       ess_set_gain(sc, ESS_DAC_PLAY_VOL, 0);
 }
 
 /*