diff options
| author | Geoffrey D. Bennett <g@b4.vu> | 2023-12-25 06:00:29 +1030 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-12-29 15:41:23 +0100 |
| commit | a1faecfcfe35ae774e75145470998d4418a78f0a (patch) | |
| tree | e2193ce3e30428c2ccd1f021acb9c92994ac423e /sound/usb/mixer_scarlett2.c | |
| parent | 56275126aca20e0a0bfa51e3307576aee76b7264 (diff) | |
| download | linux-a1faecfcfe35ae774e75145470998d4418a78f0a.tar.gz linux-a1faecfcfe35ae774e75145470998d4418a78f0a.tar.bz2 linux-a1faecfcfe35ae774e75145470998d4418a78f0a.zip | |
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: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/83cec5ccd75f0db2bd061a76d31a7023d26300c1.1703444932.git.g@b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer_scarlett2.c')
| -rw-r--r-- | sound/usb/mixer_scarlett2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/usb/mixer_scarlett2.c b/sound/usb/mixer_scarlett2.c index 6b026648ac3c..71d09c03b1f4 100644 --- a/sound/usb/mixer_scarlett2.c +++ b/sound/usb/mixer_scarlett2.c @@ -208,6 +208,9 @@ static const u16 scarlett2_mixer_values[SCARLETT2_MIXER_VALUE_COUNT] = { /* Maximum number of outputs from the mixer */ #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: * 20 inputs, 20 outputs, 25 matrix inputs, 12 spare */ @@ -719,7 +722,7 @@ struct scarlett2_data { struct snd_kcontrol *speaker_switching_ctl; struct snd_kcontrol *talkback_ctl; u8 mux[SCARLETT2_MUX_MAX]; - u8 mix[SCARLETT2_INPUT_MIX_MAX * SCARLETT2_OUTPUT_MIX_MAX]; + u8 mix[SCARLETT2_MIX_MAX]; }; /*** Model-specific data ***/ |