Skip to content

L
linux
Commit b61f90ea authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: usb-audio: Add resume support for Scarlett mixers 

Scarlett driver uses almost compatible usb_mixer_elem_info struct, so
we just need to add a couple of simple resume callbacks to handle them
accordingly.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 288673be
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 14 deletions
sound/usb/mixer_scarlett.c
View file @ b61f90ea
...@@ -285,6 +285,19 @@ static int scarlett_ctl_switch_put(struct snd_kcontrol *kctl, ...@@ -285,6 +285,19 @@ static int scarlett_ctl_switch_put(struct snd_kcontrol *kctl,
return changed; return changed;
} }
static int scarlett_ctl_resume(struct usb_mixer_elem_list *list)
{
struct usb_mixer_elem_info *elem =
container_of(list, struct usb_mixer_elem_info, head);
int i;
for (i = 0; i < elem->channels; i++)
if (elem->cached & (1 << i))
snd_usb_set_cur_mix_value(elem, i, i,
elem->cache_val[i]);
return 0;
}
static int scarlett_ctl_info(struct snd_kcontrol *kctl, static int scarlett_ctl_info(struct snd_kcontrol *kctl,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
...@@ -432,6 +445,16 @@ static int scarlett_ctl_enum_put(struct snd_kcontrol *kctl, ...@@ -432,6 +445,16 @@ static int scarlett_ctl_enum_put(struct snd_kcontrol *kctl,
return 0; return 0;
} }
static int scarlett_ctl_enum_resume(struct usb_mixer_elem_list *list)
{
struct usb_mixer_elem_info *elem =
container_of(list, struct usb_mixer_elem_info, head);
if (elem->cached)
snd_usb_set_cur_mix_value(elem, 0, 0, *elem->cache_val);
return 0;
}
static int scarlett_ctl_meter_get(struct snd_kcontrol *kctl, static int scarlett_ctl_meter_get(struct snd_kcontrol *kctl,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
...@@ -514,6 +537,7 @@ static struct snd_kcontrol_new usb_scarlett_ctl_sync = { ...@@ -514,6 +537,7 @@ static struct snd_kcontrol_new usb_scarlett_ctl_sync = {
static int add_new_ctl(struct usb_mixer_interface *mixer, static int add_new_ctl(struct usb_mixer_interface *mixer,
const struct snd_kcontrol_new *ncontrol, const struct snd_kcontrol_new *ncontrol,
usb_mixer_elem_resume_func_t resume,
int index, int offset, int num, int index, int offset, int num,
int val_type, int channels, const char *name, int val_type, int channels, const char *name,
const struct scarlett_mixer_elem_enum_info *opt, const struct scarlett_mixer_elem_enum_info *opt,
...@@ -529,6 +553,7 @@ static int add_new_ctl(struct usb_mixer_interface *mixer, ...@@ -529,6 +553,7 @@ static int add_new_ctl(struct usb_mixer_interface *mixer,
return -ENOMEM; return -ENOMEM;
elem->head.mixer = mixer; elem->head.mixer = mixer;
elem->head.resume = resume;
elem->control = offset; elem->control = offset;
elem->idx_off = num; elem->idx_off = num;
elem->head.id = index; elem->head.id = index;
...@@ -548,7 +573,7 @@ static int add_new_ctl(struct usb_mixer_interface *mixer, ...@@ -548,7 +573,7 @@ static int add_new_ctl(struct usb_mixer_interface *mixer,
strlcpy(kctl->id.name, name, sizeof(kctl->id.name)); strlcpy(kctl->id.name, name, sizeof(kctl->id.name));
err = snd_ctl_add(mixer->chip->card, kctl); err = snd_usb_mixer_add_control(&elem->head, kctl);
if (err < 0) if (err < 0)
return err; return err;
...@@ -569,7 +594,8 @@ static int add_output_ctls(struct usb_mixer_interface *mixer, ...@@ -569,7 +594,8 @@ static int add_output_ctls(struct usb_mixer_interface *mixer,
/* Add mute switch */ /* Add mute switch */
snprintf(mx, sizeof(mx), "Master %d (%s) Playback Switch", snprintf(mx, sizeof(mx), "Master %d (%s) Playback Switch",
index + 1, name); index + 1, name);
err = add_new_ctl(mixer, &usb_scarlett_ctl_switch, 0x0a, 0x01, err = add_new_ctl(mixer, &usb_scarlett_ctl_switch,
scarlett_ctl_resume, 0x0a, 0x01,
2*index+1, USB_MIXER_S16, 2, mx, NULL, &elem); 2*index+1, USB_MIXER_S16, 2, mx, NULL, &elem);
if (err < 0) if (err < 0)
return err; return err;
...@@ -577,7 +603,8 @@ static int add_output_ctls(struct usb_mixer_interface *mixer, ...@@ -577,7 +603,8 @@ static int add_output_ctls(struct usb_mixer_interface *mixer,
/* Add volume control and initialize to 0 */ /* Add volume control and initialize to 0 */
snprintf(mx, sizeof(mx), "Master %d (%s) Playback Volume", snprintf(mx, sizeof(mx), "Master %d (%s) Playback Volume",
index + 1, name); index + 1, name);
err = add_new_ctl(mixer, &usb_scarlett_ctl_master, 0x0a, 0x02, err = add_new_ctl(mixer, &usb_scarlett_ctl_master,
scarlett_ctl_resume, 0x0a, 0x02,
2*index+1, USB_MIXER_S16, 2, mx, NULL, &elem); 2*index+1, USB_MIXER_S16, 2, mx, NULL, &elem);
if (err < 0) if (err < 0)
return err; return err;
...@@ -585,7 +612,8 @@ static int add_output_ctls(struct usb_mixer_interface *mixer, ...@@ -585,7 +612,8 @@ static int add_output_ctls(struct usb_mixer_interface *mixer,
/* Add L channel source playback enumeration */ /* Add L channel source playback enumeration */
snprintf(mx, sizeof(mx), "Master %dL (%s) Source Playback Enum", snprintf(mx, sizeof(mx), "Master %dL (%s) Source Playback Enum",
index + 1, name); index + 1, name);
err = add_new_ctl(mixer, &usb_scarlett_ctl_dynamic_enum, 0x33, 0x00, err = add_new_ctl(mixer, &usb_scarlett_ctl_dynamic_enum,
scarlett_ctl_enum_resume, 0x33, 0x00,
2*index, USB_MIXER_S16, 1, mx, &info->opt_master, 2*index, USB_MIXER_S16, 1, mx, &info->opt_master,
&elem); &elem);
if (err < 0) if (err < 0)
...@@ -594,7 +622,8 @@ static int add_output_ctls(struct usb_mixer_interface *mixer, ...@@ -594,7 +622,8 @@ static int add_output_ctls(struct usb_mixer_interface *mixer,
/* Add R channel source playback enumeration */ /* Add R channel source playback enumeration */
snprintf(mx, sizeof(mx), "Master %dR (%s) Source Playback Enum", snprintf(mx, sizeof(mx), "Master %dR (%s) Source Playback Enum",
index + 1, name); index + 1, name);
err = add_new_ctl(mixer, &usb_scarlett_ctl_dynamic_enum, 0x33, 0x00, err = add_new_ctl(mixer, &usb_scarlett_ctl_dynamic_enum,
scarlett_ctl_enum_resume, 0x33, 0x00,
2*index+1, USB_MIXER_S16, 1, mx, &info->opt_master, 2*index+1, USB_MIXER_S16, 1, mx, &info->opt_master,
&elem); &elem);
if (err < 0) if (err < 0)
...@@ -824,13 +853,15 @@ static int scarlett_controls_create_generic(struct usb_mixer_interface *mixer, ...@@ -824,13 +853,15 @@ static int scarlett_controls_create_generic(struct usb_mixer_interface *mixer,
struct usb_mixer_elem_info *elem; struct usb_mixer_elem_info *elem;
/* create master switch and playback volume */ /* create master switch and playback volume */
err = add_new_ctl(mixer, &usb_scarlett_ctl_switch, 0x0a, 0x01, 0, err = add_new_ctl(mixer, &usb_scarlett_ctl_switch,
scarlett_ctl_resume, 0x0a, 0x01, 0,
USB_MIXER_S16, 1, "Master Playback Switch", NULL, USB_MIXER_S16, 1, "Master Playback Switch", NULL,
&elem); &elem);
if (err < 0) if (err < 0)
return err; return err;
err = add_new_ctl(mixer, &usb_scarlett_ctl_master, 0x0a, 0x02, 0, err = add_new_ctl(mixer, &usb_scarlett_ctl_master,
scarlett_ctl_resume, 0x0a, 0x02, 0,
USB_MIXER_S16, 1, "Master Playback Volume", NULL, USB_MIXER_S16, 1, "Master Playback Volume", NULL,
&elem); &elem);
if (err < 0) if (err < 0)
...@@ -848,7 +879,8 @@ static int scarlett_controls_create_generic(struct usb_mixer_interface *mixer, ...@@ -848,7 +879,8 @@ static int scarlett_controls_create_generic(struct usb_mixer_interface *mixer,
break; break;
case SCARLETT_SWITCH_IMPEDANCE: case SCARLETT_SWITCH_IMPEDANCE:
sprintf(mx, "Input %d Impedance Switch", ctl->num); sprintf(mx, "Input %d Impedance Switch", ctl->num);
err = add_new_ctl(mixer, &usb_scarlett_ctl_enum, 0x01, err = add_new_ctl(mixer, &usb_scarlett_ctl_enum,
scarlett_ctl_enum_resume, 0x01,
0x09, ctl->num, USB_MIXER_S16, 1, mx, 0x09, ctl->num, USB_MIXER_S16, 1, mx,
&opt_impedance, &elem); &opt_impedance, &elem);
if (err < 0) if (err < 0)
...@@ -856,7 +888,8 @@ static int scarlett_controls_create_generic(struct usb_mixer_interface *mixer, ...@@ -856,7 +888,8 @@ static int scarlett_controls_create_generic(struct usb_mixer_interface *mixer,
break; break;
case SCARLETT_SWITCH_PAD: case SCARLETT_SWITCH_PAD:
sprintf(mx, "Input %d Pad Switch", ctl->num); sprintf(mx, "Input %d Pad Switch", ctl->num);
err = add_new_ctl(mixer, &usb_scarlett_ctl_enum, 0x01, err = add_new_ctl(mixer, &usb_scarlett_ctl_enum,
scarlett_ctl_enum_resume, 0x01,
0x0b, ctl->num, USB_MIXER_S16, 1, mx, 0x0b, ctl->num, USB_MIXER_S16, 1, mx,
&opt_pad, &elem); &opt_pad, &elem);
if (err < 0) if (err < 0)
...@@ -912,7 +945,8 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer) ...@@ -912,7 +945,8 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer)
for (i = 0; i < info->matrix_in; i++) { for (i = 0; i < info->matrix_in; i++) {
snprintf(mx, sizeof(mx), "Matrix %02d Input Playback Route", snprintf(mx, sizeof(mx), "Matrix %02d Input Playback Route",
i+1); i+1);
err = add_new_ctl(mixer, &usb_scarlett_ctl_dynamic_enum, 0x32, err = add_new_ctl(mixer, &usb_scarlett_ctl_dynamic_enum,
scarlett_ctl_enum_resume, 0x32,
0x06, i, USB_MIXER_S16, 1, mx, 0x06, i, USB_MIXER_S16, 1, mx,
&info->opt_matrix, &elem); &info->opt_matrix, &elem);
if (err < 0) if (err < 0)
...@@ -921,7 +955,8 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer) ...@@ -921,7 +955,8 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer)
for (o = 0; o < info->matrix_out; o++) { for (o = 0; o < info->matrix_out; o++) {
sprintf(mx, "Matrix %02d Mix %c Playback Volume", i+1, sprintf(mx, "Matrix %02d Mix %c Playback Volume", i+1,
o+'A'); o+'A');
err = add_new_ctl(mixer, &usb_scarlett_ctl, 0x3c, 0x00, err = add_new_ctl(mixer, &usb_scarlett_ctl,
scarlett_ctl_resume, 0x3c, 0x00,
(i << 3) + (o & 0x07), USB_MIXER_S16, (i << 3) + (o & 0x07), USB_MIXER_S16,
1, mx, NULL, &elem); 1, mx, NULL, &elem);
if (err < 0) if (err < 0)
...@@ -933,7 +968,8 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer) ...@@ -933,7 +968,8 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer)
for (i = 0; i < info->input_len; i++) { for (i = 0; i < info->input_len; i++) {
snprintf(mx, sizeof(mx), "Input Source %02d Capture Route", snprintf(mx, sizeof(mx), "Input Source %02d Capture Route",
i+1); i+1);
err = add_new_ctl(mixer, &usb_scarlett_ctl_dynamic_enum, 0x34, err = add_new_ctl(mixer, &usb_scarlett_ctl_dynamic_enum,
scarlett_ctl_enum_resume, 0x34,
0x00, i, USB_MIXER_S16, 1, mx, 0x00, i, USB_MIXER_S16, 1, mx,
&info->opt_master, &elem); &info->opt_master, &elem);
if (err < 0) if (err < 0)
...@@ -941,14 +977,15 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer) ...@@ -941,14 +977,15 @@ int snd_scarlett_controls_create(struct usb_mixer_interface *mixer)
} }
/* val_len == 1 needed here */ /* val_len == 1 needed here */
err = add_new_ctl(mixer, &usb_scarlett_ctl_enum, 0x28, 0x01, 0, err = add_new_ctl(mixer, &usb_scarlett_ctl_enum,
scarlett_ctl_enum_resume, 0x28, 0x01, 0,
USB_MIXER_U8, 1, "Sample Clock Source", USB_MIXER_U8, 1, "Sample Clock Source",
&opt_clock, &elem); &opt_clock, &elem);
if (err < 0) if (err < 0)
return err; return err;
/* val_len == 1 and UAC2_CS_MEM */ /* val_len == 1 and UAC2_CS_MEM */
err = add_new_ctl(mixer, &usb_scarlett_ctl_sync, 0x3c, 0x00, 2, err = add_new_ctl(mixer, &usb_scarlett_ctl_sync, NULL, 0x3c, 0x00, 2,
USB_MIXER_U8, 1, "Sample Clock Sync Status", USB_MIXER_U8, 1, "Sample Clock Sync Status",
&opt_sync, &elem); &opt_sync, &elem);
if (err < 0) if (err < 0)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7