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 | |
parent | 7a6a8c64fe27cae8efddc8f803af22c302cca4e7 (diff) | |
download | rockbox-4bb0184455d45c540c061c3bcfa28d76f816fa48.tar.gz rockbox-4bb0184455d45c540c061c3bcfa28d76f816fa48.zip |
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
-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) | |||
442 | AUDIOSET1_LIN1_on | AUDIOSET1_LIN2_on); | 442 | AUDIOSET1_LIN1_on | AUDIOSET1_LIN2_on); |
443 | as3514_set(AS3514_LINE_IN_R, LINE_IN1_R_LI1R_MUTE_off); | 443 | as3514_set(AS3514_LINE_IN_R, LINE_IN1_R_LI1R_MUTE_off); |
444 | as3514_set(AS3514_LINE_IN_L, LINE_IN1_L_LI1L_MUTE_off); | 444 | as3514_set(AS3514_LINE_IN_L, LINE_IN1_L_LI1L_MUTE_off); |
445 | |||
446 | #ifdef HAVE_AS3543 | ||
447 | as3514_write_masked(AS3514_HPH_OUT_R, | ||
448 | HPH_OUT_R_HP_OUT_LINE, HPH_OUT_R_HP_OUT_MASK); | ||
449 | #endif | ||
450 | } | 445 | } |
451 | else { | 446 | else { |
452 | /* turn off both LIN1 and LIN2 */ | 447 | /* turn off both LIN1 and LIN2 (if present) */ |
453 | as3514_clear(AS3514_LINE_IN1_R, LINE_IN1_R_LI1R_MUTE_off); | 448 | as3514_clear(AS3514_LINE_IN1_R, LINE_IN1_R_LI1R_MUTE_off); |
454 | as3514_clear(AS3514_LINE_IN1_L, LINE_IN1_L_LI1L_MUTE_off); | 449 | as3514_clear(AS3514_LINE_IN1_L, LINE_IN1_L_LI1L_MUTE_off); |
455 | #ifdef HAVE_AS3543 | 450 | #ifndef HAVE_AS3543 |
456 | as3514_write_masked(AS3514_HPH_OUT_R, | ||
457 | HPH_OUT_R_HP_OUT_SUM, HPH_OUT_R_HP_OUT_MASK); | ||
458 | #else | ||
459 | as3514_clear(AS3514_LINE_IN2_R, LINE_IN2_R_LI2R_MUTE_off); | 451 | as3514_clear(AS3514_LINE_IN2_R, LINE_IN2_R_LI2R_MUTE_off); |
460 | as3514_clear(AS3514_LINE_IN2_L, LINE_IN2_L_LI2L_MUTE_off); | 452 | as3514_clear(AS3514_LINE_IN2_L, LINE_IN2_L_LI2L_MUTE_off); |
461 | #endif | 453 | #endif |