[alsa-devel] [PATCH 1/1] usb-audio: Set correct type for some UAC2 mixer controls.
Changed ctl type for Input Gain Control and Input Gain Pad Control to USB_MIXER_S16 as per section 5.2.5.7.11-12 in the USB Audio Class 2.0 definition.
Signed-off-by: Johan Rastén johan@oljud.se
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 8b7e391..6b3acba 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -809,12 +809,12 @@ static struct usb_feature_control_info audio_feature_info[] = { { "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 }, + { "Delay Control", USB_MIXER_U16 }, /* FIXME: U32 in UAC2 */ { "Bass Boost", USB_MIXER_BOOLEAN }, { "Loudness", USB_MIXER_BOOLEAN }, /* UAC2 specific */ - { "Input Gain Control", USB_MIXER_U16 }, - { "Input Gain Pad Control", USB_MIXER_BOOLEAN }, + { "Input Gain Control", USB_MIXER_S16 }, + { "Input Gain Pad Control", USB_MIXER_S16 }, { "Phase Inverter Control", USB_MIXER_BOOLEAN }, };
At Thu, 11 Jun 2015 10:04:51 +0200, Johan Rastén wrote:
Changed ctl type for Input Gain Control and Input Gain Pad Control to USB_MIXER_S16 as per section 5.2.5.7.11-12 in the USB Audio Class 2.0 definition.
Signed-off-by: Johan Rastén johan@oljud.se
Do you have a device that actually uses these stuff? I'm asking whether this fix any real device, or just hypothetical. In the former case, it should go to 4.1. For the latter, we can postpone to 4.2.
thanks,
Takashi
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 8b7e391..6b3acba 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -809,12 +809,12 @@ static struct usb_feature_control_info audio_feature_info[] = { { "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 },
- { "Delay Control", USB_MIXER_U16 }, /* FIXME: U32 in UAC2 */ { "Bass Boost", USB_MIXER_BOOLEAN }, { "Loudness", USB_MIXER_BOOLEAN }, /* UAC2 specific */
- { "Input Gain Control", USB_MIXER_U16 },
- { "Input Gain Pad Control", USB_MIXER_BOOLEAN },
- { "Input Gain Control", USB_MIXER_S16 },
- { "Input Gain Pad Control", USB_MIXER_S16 }, { "Phase Inverter Control", USB_MIXER_BOOLEAN },
};
-- 2.1.4
The Asus Xonar U7 has an input gain pad control, but audio capture is still broken with this patch so no hurry.
//Johan
On 11 June 2015 at 11:08, Takashi Iwai tiwai@suse.de wrote:
At Thu, 11 Jun 2015 10:04:51 +0200, Johan Rastén wrote:
Changed ctl type for Input Gain Control and Input Gain Pad Control to USB_MIXER_S16 as per section 5.2.5.7.11-12 in the USB Audio Class 2.0 definition.
Signed-off-by: Johan Rastén johan@oljud.se
Do you have a device that actually uses these stuff? I'm asking whether this fix any real device, or just hypothetical. In the former case, it should go to 4.1. For the latter, we can postpone to 4.2.
thanks,
Takashi
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 8b7e391..6b3acba 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -809,12 +809,12 @@ static struct usb_feature_control_info audio_feature_info[] = { { "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 },
{ "Delay Control", USB_MIXER_U16 }, /* FIXME: U32 in UAC2 */ { "Bass Boost", USB_MIXER_BOOLEAN }, { "Loudness", USB_MIXER_BOOLEAN }, /* UAC2 specific */
{ "Input Gain Control", USB_MIXER_U16 },{ "Input Gain Pad Control", USB_MIXER_BOOLEAN },
{ "Input Gain Control", USB_MIXER_S16 },{ "Input Gain Pad Control", USB_MIXER_S16 }, { "Phase Inverter Control", USB_MIXER_BOOLEAN },};
-- 2.1.4
At Thu, 11 Jun 2015 11:26:26 +0200, Johan Aires Rastén wrote:
The Asus Xonar U7 has an input gain pad control, but audio capture is still broken with this patch so no hurry.
OK, then I'm going to queue this to for-next branch.
thanks,
Takashi
//Johan
On 11 June 2015 at 11:08, Takashi Iwai tiwai@suse.de wrote:
At Thu, 11 Jun 2015 10:04:51 +0200, Johan Rastén wrote:
Changed ctl type for Input Gain Control and Input Gain Pad Control to USB_MIXER_S16 as per section 5.2.5.7.11-12 in the USB Audio Class 2.0 definition.
Signed-off-by: Johan Rastén johan@oljud.se
Do you have a device that actually uses these stuff? I'm asking whether this fix any real device, or just hypothetical. In the former case, it should go to 4.1. For the latter, we can postpone to 4.2.
thanks,
Takashi
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 8b7e391..6b3acba 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -809,12 +809,12 @@ static struct usb_feature_control_info audio_feature_info[] = { { "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 },
{ "Delay Control", USB_MIXER_U16 }, /* FIXME: U32 in UAC2 */ { "Bass Boost", USB_MIXER_BOOLEAN }, { "Loudness", USB_MIXER_BOOLEAN }, /* UAC2 specific */
{ "Input Gain Control", USB_MIXER_U16 },{ "Input Gain Pad Control", USB_MIXER_BOOLEAN },
{ "Input Gain Control", USB_MIXER_S16 },{ "Input Gain Pad Control", USB_MIXER_S16 }, { "Phase Inverter Control", USB_MIXER_BOOLEAN },};
-- 2.1.4
participants (3)
-
Johan Aires Rastén -
Johan Rastén
-
Takashi Iwai