Commit a1faecfc authored by Geoffrey D. Bennett's avatar Geoffrey D. Bennett Committed by Takashi Iwai

ALSA: scarlett2: Add #define for SCARLETT2_MIX_MAX

Add a #define for SCARLETT2_MIX_MAX (max of mixer inputs * outputs) as
that will be used again soon.
Signed-off-by: default avatarGeoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/83cec5ccd75f0db2bd061a76d31a7023d26300c1.1703444932.git.g@b4.vuSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 56275126
...@@ -208,6 +208,9 @@ static const u16 scarlett2_mixer_values[SCARLETT2_MIXER_VALUE_COUNT] = { ...@@ -208,6 +208,9 @@ static const u16 scarlett2_mixer_values[SCARLETT2_MIXER_VALUE_COUNT] = {
/* Maximum number of outputs from the mixer */ /* Maximum number of outputs from the mixer */
#define SCARLETT2_OUTPUT_MIX_MAX 12 #define SCARLETT2_OUTPUT_MIX_MAX 12
/* Maximum number of mixer gain controls */
#define SCARLETT2_MIX_MAX (SCARLETT2_INPUT_MIX_MAX * SCARLETT2_OUTPUT_MIX_MAX)
/* Maximum size of the data in the USB mux assignment message: /* Maximum size of the data in the USB mux assignment message:
* 20 inputs, 20 outputs, 25 matrix inputs, 12 spare * 20 inputs, 20 outputs, 25 matrix inputs, 12 spare
*/ */
...@@ -719,7 +722,7 @@ struct scarlett2_data { ...@@ -719,7 +722,7 @@ struct scarlett2_data {
struct snd_kcontrol *speaker_switching_ctl; struct snd_kcontrol *speaker_switching_ctl;
struct snd_kcontrol *talkback_ctl; struct snd_kcontrol *talkback_ctl;
u8 mux[SCARLETT2_MUX_MAX]; u8 mux[SCARLETT2_MUX_MAX];
u8 mix[SCARLETT2_INPUT_MIX_MAX * SCARLETT2_OUTPUT_MIX_MAX]; u8 mix[SCARLETT2_MIX_MAX];
}; };
/*** Model-specific data ***/ /*** Model-specific data ***/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment