diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-05-31 07:35:42 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-05-31 12:17:38 -0400 |
commit | 2e0281d15c220d0a81c45c73872aa08d2f3ae3ef (patch) | |
tree | 56a6eb16898338291db9b82c85244f55db188e87 | |
parent | 65f25da44b51f55e3a74301c25f29263be2bf1ba (diff) |
ALSA: usb-audio: add UAC2 sepecific Feature Unit controls
The bits to enable them are always 0 for UAC1 devices, so no additional
checks are required.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/usb/mixer.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 24428198ae1b..8be6bf2552b0 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c | |||
@@ -686,16 +686,20 @@ struct usb_feature_control_info { | |||
686 | }; | 686 | }; |
687 | 687 | ||
688 | static struct usb_feature_control_info audio_feature_info[] = { | 688 | static struct usb_feature_control_info audio_feature_info[] = { |
689 | { "Mute", USB_MIXER_INV_BOOLEAN }, | 689 | { "Mute", USB_MIXER_INV_BOOLEAN }, |
690 | { "Volume", USB_MIXER_S16 }, | 690 | { "Volume", USB_MIXER_S16 }, |
691 | { "Tone Control - Bass", USB_MIXER_S8 }, | 691 | { "Tone Control - Bass", USB_MIXER_S8 }, |
692 | { "Tone Control - Mid", USB_MIXER_S8 }, | 692 | { "Tone Control - Mid", USB_MIXER_S8 }, |
693 | { "Tone Control - Treble", USB_MIXER_S8 }, | 693 | { "Tone Control - Treble", USB_MIXER_S8 }, |
694 | { "Graphic Equalizer", USB_MIXER_S8 }, /* FIXME: not implemeted yet */ | 694 | { "Graphic Equalizer", USB_MIXER_S8 }, /* FIXME: not implemeted yet */ |
695 | { "Auto Gain Control", USB_MIXER_BOOLEAN }, | 695 | { "Auto Gain Control", USB_MIXER_BOOLEAN }, |
696 | { "Delay Control", USB_MIXER_U16 }, | 696 | { "Delay Control", USB_MIXER_U16 }, |
697 | { "Bass Boost", USB_MIXER_BOOLEAN }, | 697 | { "Bass Boost", USB_MIXER_BOOLEAN }, |
698 | { "Loudness", USB_MIXER_BOOLEAN }, | 698 | { "Loudness", USB_MIXER_BOOLEAN }, |
699 | /* UAC2 specific */ | ||
700 | { "Input Gain Control", USB_MIXER_U16 }, | ||
701 | { "Input Gain Pad Control", USB_MIXER_BOOLEAN }, | ||
702 | { "Phase Inverter Control", USB_MIXER_BOOLEAN }, | ||
699 | }; | 703 | }; |
700 | 704 | ||
701 | 705 | ||