summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-15 07:43:14 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-15 07:43:14 -0400
commit4873a1ac6177cf7319160d4fa290fe2b17615763 (patch)
tree7115eb6d4f8ccf67f44b608d192fc8ad485bc304
parentca4d63d4d903e3de356afb8d129ae61c660ff9b4 (diff)
downloadrockbox-4873a1ac6177cf7319160d4fa290fe2b17615763.tar.gz
rockbox-4873a1ac6177cf7319160d4fa290fe2b17615763.zip
fiiom3k: Temporarily disable filter rolloff programming
(Hardware control isn't wired into ALSA properly) Change-Id: Iac537d2d90a6119b8c002cd38a558a4ebb3321eb
-rw-r--r--bootloader/rocker_linux.c1
-rw-r--r--firmware/drivers/audio/fiiolinux_codec.c12
2 files changed, 9 insertions, 4 deletions
diff --git a/bootloader/rocker_linux.c b/bootloader/rocker_linux.c
index 3d35f22ba6..fc633d504e 100644
--- a/bootloader/rocker_linux.c
+++ b/bootloader/rocker_linux.c
@@ -473,6 +473,7 @@ static void adb(int start)
473 lcd_set_foreground(LCD_RGBPACK(255, 0, 0)); 473 lcd_set_foreground(LCD_RGBPACK(255, 0, 0));
474 lcd_putsf(0, 1, "ADB not supported!"); 474 lcd_putsf(0, 1, "ADB not supported!");
475 sleep(2*HZ); 475 sleep(2*HZ);
476 (void)start;
476#else 477#else
477 pid_t pid = fork(); 478 pid_t pid = fork();
478 if(pid == 0) 479 if(pid == 0)
diff --git a/firmware/drivers/audio/fiiolinux_codec.c b/firmware/drivers/audio/fiiolinux_codec.c
index d8024e3c32..894d16dae1 100644
--- a/firmware/drivers/audio/fiiolinux_codec.c
+++ b/firmware/drivers/audio/fiiolinux_codec.c
@@ -69,6 +69,10 @@ void audiohw_preinit(void)
69{ 69{
70 alsa_controls_init(); 70 alsa_controls_init();
71 hw_open(); 71 hw_open();
72 // set 19/'ADC Mux' 0
73 // set 4/'Digital Capture Volume' 0
74 // set 6/'Mic Volume' 0
75 // set 11/'DACR Playback Volume' 0 (wtf?? vortex used 1, of used 0)
72} 76}
73 77
74void audiohw_postinit(void) 78void audiohw_postinit(void)
@@ -89,7 +93,7 @@ void audiohw_set_frequency(int fsel)
89void audiohw_set_volume(int vol_l, int vol_r) 93void audiohw_set_volume(int vol_l, int vol_r)
90{ 94{
91 int vol[2]; 95 int vol[2];
92 96
93 vol[0] = vol_l / 20; 97 vol[0] = vol_l / 20;
94 vol[1] = vol_r / 20; 98 vol[1] = vol_r / 20;
95 99
@@ -145,10 +149,10 @@ void audiohw_set_filter_roll_off(int value)
145 1 = Slow; 149 1 = Slow;
146 2 = Short Sharp 150 2 = Short Sharp
147 3 = Short Slow */ 151 3 = Short Slow */
148#if defined(FIIO_M3K) 152#if 0 // defined(FIIO_M3K)
153 // AK4376 supports this but the control isn't wired into ALSA!
149 long int value_hw = value; 154 long int value_hw = value;
150 alsa_controls_set_ints("AK4376 Digital Filter", 1, &value_hw); 155 alsa_controls_set_ints("AK4376 Digital Filter", 1, &value_hw);
151#else
152 (void)value;
153#endif 156#endif
157 (void)value;
154} 158}