diff options
| author | Daniel Mack <daniel@caiaq.de> | 2010-05-31 13:35:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-31 18:17:38 +0200 |
| commit | 2e0281d15c220d0a81c45c73872aa08d2f3ae3ef (patch) | |
| tree | 56a6eb16898338291db9b82c85244f55db188e87 /sound/usb | |
| parent | 65f25da44b51f55e3a74301c25f29263be2bf1ba (diff) | |
| download | kernel_samsung_tuna-2e0281d15c220d0a81c45c73872aa08d2f3ae3ef.zip kernel_samsung_tuna-2e0281d15c220d0a81c45c73872aa08d2f3ae3ef.tar.gz kernel_samsung_tuna-2e0281d15c220d0a81c45c73872aa08d2f3ae3ef.tar.bz2 | |
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>
Diffstat (limited to 'sound/usb')
| -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 2442819..8be6bf2 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -686,16 +686,20 @@ struct usb_feature_control_info { }; static struct usb_feature_control_info audio_feature_info[] = { - { "Mute", USB_MIXER_INV_BOOLEAN }, - { "Volume", USB_MIXER_S16 }, + { "Mute", USB_MIXER_INV_BOOLEAN }, + { "Volume", USB_MIXER_S16 }, { "Tone Control - Bass", USB_MIXER_S8 }, { "Tone Control - Mid", USB_MIXER_S8 }, { "Tone Control - Treble", USB_MIXER_S8 }, { "Graphic Equalizer", USB_MIXER_S8 }, /* FIXME: not implemeted yet */ - { "Auto Gain Control", USB_MIXER_BOOLEAN }, - { "Delay Control", USB_MIXER_U16 }, - { "Bass Boost", USB_MIXER_BOOLEAN }, - { "Loudness", USB_MIXER_BOOLEAN }, + { "Auto Gain Control", USB_MIXER_BOOLEAN }, + { "Delay Control", USB_MIXER_U16 }, + { "Bass Boost", USB_MIXER_BOOLEAN }, + { "Loudness", USB_MIXER_BOOLEAN }, + /* UAC2 specific */ + { "Input Gain Control", USB_MIXER_U16 }, + { "Input Gain Pad Control", USB_MIXER_BOOLEAN }, + { "Phase Inverter Control", USB_MIXER_BOOLEAN }, }; |