iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: scarlett2: Add support for DSP mux channels

Browse Source 
The DSP mux channels in the Scarlett 4th Gen appear as
SCARLETT2_PORT_TYPE_MIX ports but do not have corresponding mixer
controls. Add a dsp_count option to the device info struct to exclude
those DSP channels from the num_mix_in/num_mix_out counts.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/b78bdb1a7624d55783f5bf0e1ffbfa47a9e9a800.1703612638.git.g@b4.vu
This commit is contained in:
Geoffrey D. Bennett 2023-12-27 04:38:34 +10:30 committed by Takashi Iwai
parent c6c9f0cf9d
commit 166e1dfb75
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/usb/mixer_scarlett2.c
View File

@ -706,6 +706,9 @@ struct scarlett2_device_info {
*/
u8 direct_monitor;
/* the number of DSP channels */
u8 dsp_count;
/* remap analogue outputs; 18i8 Gen 3 has "line 3/4" connected
* internally to the analogue 7/8 outputs
*/
@ -5827,12 +5830,17 @@ static void scarlett2_count_io(struct scarlett2_data *private)
private->num_mux_srcs = srcs;
private->num_mux_dsts = dsts;
/* Mixer inputs are mux outputs and vice versa */
/* Mixer inputs are mux outputs and vice versa.
* Scarlett Gen 4 DSP I/O uses SCARLETT2_PORT_TYPE_MIX but
* doesn't have mixer controls.
*/
private->num_mix_in =
port_count[SCARLETT2_PORT_TYPE_MIX][SCARLETT2_PORT_OUT];
port_count[SCARLETT2_PORT_TYPE_MIX][SCARLETT2_PORT_OUT] -
info->dsp_count;
private->num_mix_out =
port_count[SCARLETT2_PORT_TYPE_MIX][SCARLETT2_PORT_IN];
port_count[SCARLETT2_PORT_TYPE_MIX][SCARLETT2_PORT_IN] -
info->dsp_count;
/* Number of analogue line outputs */
private->num_line_out =