diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-04-26 23:42:12 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-04-26 23:42:12 +0000 |
| commit | 5e88c4b4de14eeb16ddfa6632523ed6d5068f368 (patch) | |
| tree | 7bea19ebbc301f137dd53608c2b5b28b5f8db150 | |
| parent | be177138d381d3bb23feb51d600ecfe3727f19ff (diff) | |
| download | rockbox-5e88c4b4de14eeb16ddfa6632523ed6d5068f368.zip rockbox-5e88c4b4de14eeb16ddfa6632523ed6d5068f368.tar.gz rockbox-5e88c4b4de14eeb16ddfa6632523ed6d5068f368.tar.bz2 rockbox-5e88c4b4de14eeb16ddfa6632523ed6d5068f368.tar.xz | |
as3525v2: fix volume setting (can now go very low)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25732 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/audio/as3514.c | 4 | ||||
| -rw-r--r-- | firmware/export/as3514.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index d9ff94a..5817ff8 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c @@ -199,7 +199,7 @@ void audiohw_preinit(void) #endif #ifdef HAVE_AS3543 - as3514_write(AS3514_HPH_OUT_R, (0<<7) /* out */ | HPH_OUT_R_HP_OUT_DAC | + as3514_write(AS3514_HPH_OUT_R, (0<<7) /* out */ | HPH_OUT_R_HP_OUT_SUM | 0x00); #else /* Set headphone over-current to 0, Min volume */ @@ -440,7 +440,7 @@ void audiohw_set_monitor(bool enable) 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_DAC, HPH_OUT_R_HP_OUT_MASK); + HPH_OUT_R_HP_OUT_SUM, HPH_OUT_R_HP_OUT_MASK); #else as3514_clear(AS3514_LINE_IN2_R, LINE_IN2_R_LI2R_MUTE_off); as3514_clear(AS3514_LINE_IN2_L, LINE_IN2_L_LI2L_MUTE_off); diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h index 40bf512..fac43c7 100644 --- a/firmware/export/as3514.h +++ b/firmware/export/as3514.h @@ -202,7 +202,11 @@ extern void audiohw_set_lineout_vol(int vol_l, int vol_r); /* Use AS3514_VOL_MASK */ /* DAC_L (0Fh) */ +#ifdef HAVE_AS3543 +#define DAC_L_DAC_MUTE_off (0x1 << 5) +#else #define DAC_L_DAC_MUTE_off (0x1 << 6) +#endif /* Use AS3514_VOL_MASK */ /* ADC_R (10h) */ |