diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-15 09:19:30 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-15 09:19:30 +0000 |
| commit | 4bb0184455d45c540c061c3bcfa28d76f816fa48 (patch) | |
| tree | 19dd5e3713808e98e35869b4ba4226abdc05ec36 /firmware/drivers | |
| parent | 7a6a8c64fe27cae8efddc8f803af22c302cca4e7 (diff) | |
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
Diffstat (limited to 'firmware/drivers')
| -rw-r--r-- | firmware/drivers/audio/as3514.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index 25a7bef796..4bd32ce894 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 |