diff options
author | Mihail Zenkov <mihail.zenkov@gmail.com> | 2015-02-15 00:26:02 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2015-06-02 02:04:34 +0200 |
commit | 3e5e9cf7d7daaf5db194040662ff3d6e97edd116 (patch) | |
tree | 87d4abafc86c7285bb4865835f551199a52271ad | |
parent | 2ec6fbc827b559847b4f0d54d44de5299b8ab6cc (diff) | |
download | rockbox-3e5e9cf7d7daaf5db194040662ff3d6e97edd116.tar.gz rockbox-3e5e9cf7d7daaf5db194040662ff3d6e97edd116.zip |
AS3543: Fix recording volume setting and voice
Fix regressions introduced by 42219b6e7
Change-Id: I1f3edb5f269f60e9431b45a43c4370836ecac733
-rw-r--r-- | firmware/drivers/audio/as3514.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index 6cad8259f7..11eb14cf75 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c | |||
@@ -299,7 +299,8 @@ void audiohw_set_volume(int vol_l, int vol_r) | |||
299 | } | 299 | } |
300 | 300 | ||
301 | #ifdef HAVE_AS3543 | 301 | #ifdef HAVE_AS3543 |
302 | if (!(as3514_regs[AS3514_HPH_OUT_R] & 0x40)) { /*if not radio or recording*/ | 302 | /*if not radio or recording*/ |
303 | if (!(as3514_regs[AS3514_AUDIOSET1] & (AUDIOSET1_ADC_on | AUDIOSET1_LIN1_on))) { | ||
303 | if (!hph_l || !hph_r) { /*if volume higher, disable the mixer to slightly improve noise*/ | 304 | if (!hph_l || !hph_r) { /*if volume higher, disable the mixer to slightly improve noise*/ |
304 | as3514_write(AS3514_AUDIOSET1, AUDIOSET1_DAC_on | AUDIOSET1_DAC_GAIN_on); | 305 | as3514_write(AS3514_AUDIOSET1, AUDIOSET1_DAC_on | AUDIOSET1_DAC_GAIN_on); |
305 | as3514_write(AS3514_AUDIOSET2, AUDIOSET2_AGC_off | AUDIOSET2_HPH_QUALITY_LOW_POWER); | 306 | as3514_write(AS3514_AUDIOSET2, AUDIOSET2_AGC_off | AUDIOSET2_HPH_QUALITY_LOW_POWER); |
@@ -484,7 +485,7 @@ void audiohw_set_monitor(bool enable) | |||
484 | { | 485 | { |
485 | if (enable) { | 486 | if (enable) { |
486 | #ifdef HAVE_AS3543 | 487 | #ifdef HAVE_AS3543 |
487 | as3514_write_masked(AS3514_HPH_OUT_R, HPH_OUT_R_HP_OUT_LINE, HPH_OUT_R_HP_OUT_MASK); | 488 | as3514_write_masked(AS3514_HPH_OUT_R, HPH_OUT_R_HP_OUT_SUM, HPH_OUT_R_HP_OUT_MASK); |
488 | #endif | 489 | #endif |
489 | /* select either LIN1 or LIN2 */ | 490 | /* select either LIN1 or LIN2 */ |
490 | as3514_write_masked(AS3514_AUDIOSET1, AUDIOSET1_LIN_on, | 491 | as3514_write_masked(AS3514_AUDIOSET1, AUDIOSET1_LIN_on, |