From 58ec61dff3a45a7e59296b53ad321219c1ffd90f Mon Sep 17 00:00:00 2001 From: funman Date: Sat, 15 May 2010 09:19:30 +0000 Subject: [PATCH] as3543: output sum of line & dac to have voicing work while using FM git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26045 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/audio/as3514.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index 25a7bef79..4bd32ce89 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c @@ -442,20 +442,12 @@ void audiohw_set_monitor(bool enable) AUDIOSET1_LIN1_on | AUDIOSET1_LIN2_on); as3514_set(AS3514_LINE_IN_R, LINE_IN1_R_LI1R_MUTE_off); as3514_set(AS3514_LINE_IN_L, LINE_IN1_L_LI1L_MUTE_off); - -#ifdef HAVE_AS3543 - as3514_write_masked(AS3514_HPH_OUT_R, - HPH_OUT_R_HP_OUT_LINE, HPH_OUT_R_HP_OUT_MASK); -#endif } else { - /* turn off both LIN1 and LIN2 */ + /* turn off both LIN1 and LIN2 (if present) */ as3514_clear(AS3514_LINE_IN1_R, LINE_IN1_R_LI1R_MUTE_off); as3514_clear(AS3514_LINE_IN1_L, LINE_IN1_L_LI1L_MUTE_off); -#ifdef HAVE_AS3543 - as3514_write_masked(AS3514_HPH_OUT_R, - HPH_OUT_R_HP_OUT_SUM, HPH_OUT_R_HP_OUT_MASK); -#else +#ifndef HAVE_AS3543 as3514_clear(AS3514_LINE_IN2_R, LINE_IN2_R_LI2R_MUTE_off); as3514_clear(AS3514_LINE_IN2_L, LINE_IN2_L_LI2L_MUTE_off); #endif -- 2.11.4.GIT