devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

xduoox3: Global volume_limit now applies to the line output as well

Browse source 
The X3's line out is a bit hot, at ~4.3Vpp, so allow it to be backed off.

(On my X3, backing it off to -6dB brings Vpp down to ~3.4V)

Change-Id: Iea38ef1c6a1b183d0f8fb4eaf2bf9ed6b350a532
This commit is contained in:
Solomon Peachy 2021-04-09 15:42:11 -04:00
parent 10facef17b
commit cd64aa2b10
2 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
firmware/target/mips/ingenic_jz47xx/codec-jz4760.c
View file

@ -27,6 +27,7 @@
#include "cs4398.h"
#include "kernel.h"
#include "button.h"
#include "settings.h"
#define PIN_CS_RST (32*1+10)
#define PIN_CODEC_PWRON (32*1+13)
@ -73,6 +74,7 @@ static void audiohw_mute(bool mute)
cs4398_write_reg(CS4398_REG_MUTE, cs4398_read_reg(CS4398_REG_MUTE) & ~(CS4398_MUTE_A | CS4398_MUTE_B));
}
/* TODO: Note this is X3-specific! */
void audiohw_preinit(void)
{
cs4398_write_reg(CS4398_REG_MISC, CS4398_CPEN | CS4398_PDN);
@ -155,6 +157,8 @@ static void jz4760_set_vol(int vol_l, int vol_r)
cs4398_write_reg(CS4398_REG_MISC, val);
}
/* The xDuoo X3's line out is a bit on the hot side, with about 4.3Vpp
so allow the level to be backed off by using the global volume_limit */
void audiohw_set_volume(int vol_l, int vol_r)
{
#ifdef HAVE_LINEOUT_DETECTION
@ -162,8 +166,7 @@ void audiohw_set_volume(int vol_l, int vol_r)
real_vol_r = vol_r;
if (lineout_inserted()) {
vol_l = 0;
vol_r = 0;
vol_l = vol_r = global_settings.volume_limit;
}
#endif
jz4760_set_vol(vol_l, vol_r);
@ -176,7 +179,7 @@ void audiohw_set_lineout_volume(int vol_l, int vol_r)
#ifdef HAVE_LINEOUT_DETECTION
if (lineout_inserted()) {
jz4760_set_vol(0, 0);
jz4760_set_vol(global_settings.volume_limit, global_settings.volume_limit);
} else {
jz4760_set_vol(real_vol_l, real_vol_r);
}

1
manual/configure_rockbox/sound_settings.tex
View file

@ -50,6 +50,7 @@ change to customise your listening experience.
default set to the maximum volume which equals to no limit. To set a volume
limit, select a volume from the list and the maximum volume will be limited to
the selected value all over the system.
\opt{xduoox3}{This setting also applies to the Line Out of the \dap{}, as at full scale the \dap{} overdrives the signal.}
\opt{ipodvideo}{
\section{Bass Cutoff}