From: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk> To: tiwai@suse.com Cc: alsa-devel@alsa-project.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Jorge Sanjuan <jorge.sanjuan@codethink.co.uk> Subject: [PATCH 3/4] ALSA: usb-audio: Use Class Specific EP for UAC3 devices. Date: Fri, 20 Apr 2018 18:03:26 +0100 [thread overview] Message-ID: <20180420170327.31569-4-jorge.sanjuan@codethink.co.uk> (raw) In-Reply-To: <20180420170327.31569-1-jorge.sanjuan@codethink.co.uk> bmAtributes offset doesn't exist in the UAC3 CS_EP descriptor. Hence, checking for pitch control as if it was UAC2 doesn't make any sense. Use the defined UAC3 offsets instead. Signed-off-by: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk> --- sound/usb/stream.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 956be9f7c72a..344e0ecf6d59 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -574,9 +574,11 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, return 0; } - if (protocol == UAC_VERSION_1) { + switch (protocol) { + case UAC_VERSION_1: attributes = csep->bmAttributes; - } else { + break; + case UAC_VERSION_2: { struct uac2_iso_endpoint_descriptor *csep2 = (struct uac2_iso_endpoint_descriptor *) csep; @@ -585,6 +587,17 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, /* emulate the endpoint attributes of a v1 device */ if (csep2->bmControls & UAC2_CONTROL_PITCH) attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL; + break; + } + case UAC_VERSION_3: { + struct uac3_iso_endpoint_descriptor *csep3 = + (struct uac3_iso_endpoint_descriptor *) csep; + + /* emulate the endpoint attributes of a v1 device */ + if (csep3->bmControls & UAC2_CONTROL_PITCH) + attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL; + break; + } } return attributes; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk> To: tiwai@suse.com Cc: gregkh@linuxfoundation.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Jorge Sanjuan <jorge.sanjuan@codethink.co.uk> Subject: [PATCH 3/4] ALSA: usb-audio: Use Class Specific EP for UAC3 devices. Date: Fri, 20 Apr 2018 18:03:26 +0100 [thread overview] Message-ID: <20180420170327.31569-4-jorge.sanjuan@codethink.co.uk> (raw) In-Reply-To: <20180420170327.31569-1-jorge.sanjuan@codethink.co.uk> bmAtributes offset doesn't exist in the UAC3 CS_EP descriptor. Hence, checking for pitch control as if it was UAC2 doesn't make any sense. Use the defined UAC3 offsets instead. Signed-off-by: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk> --- sound/usb/stream.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 956be9f7c72a..344e0ecf6d59 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -574,9 +574,11 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, return 0; } - if (protocol == UAC_VERSION_1) { + switch (protocol) { + case UAC_VERSION_1: attributes = csep->bmAttributes; - } else { + break; + case UAC_VERSION_2: { struct uac2_iso_endpoint_descriptor *csep2 = (struct uac2_iso_endpoint_descriptor *) csep; @@ -585,6 +587,17 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, /* emulate the endpoint attributes of a v1 device */ if (csep2->bmControls & UAC2_CONTROL_PITCH) attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL; + break; + } + case UAC_VERSION_3: { + struct uac3_iso_endpoint_descriptor *csep3 = + (struct uac3_iso_endpoint_descriptor *) csep; + + /* emulate the endpoint attributes of a v1 device */ + if (csep3->bmControls & UAC2_CONTROL_PITCH) + attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL; + break; + } } return attributes; -- 2.11.0
next prev parent reply other threads:[~2018-04-20 17:03 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-20 17:03 [PATCH 0/4] ALSA: usb: UAC3 new features Jorge Sanjuan 2018-04-20 17:03 ` [PATCH 1/4] ALSA: usb-audio: UAC3. Add support for mixer unit Jorge Sanjuan 2018-04-20 17:03 ` Jorge Sanjuan 2018-04-23 11:03 ` Takashi Iwai 2018-04-23 11:03 ` Takashi Iwai 2018-04-20 17:03 ` [PATCH 2/4] ALSA: usb-audio: ADC3: Fix channel mapping conversion for ADC3 Jorge Sanjuan 2018-04-20 17:03 ` Jorge Sanjuan 2018-04-23 12:11 ` Takashi Iwai 2018-04-23 12:11 ` Takashi Iwai 2018-04-24 8:03 ` [alsa-devel] " Ruslan Bilovol 2018-04-24 8:03 ` Ruslan Bilovol 2018-04-20 17:03 ` Jorge Sanjuan [this message] 2018-04-20 17:03 ` [PATCH 3/4] ALSA: usb-audio: Use Class Specific EP for UAC3 devices Jorge Sanjuan 2018-04-22 20:30 ` [alsa-devel] " kbuild test robot 2018-04-22 20:30 ` kbuild test robot 2018-04-20 17:03 ` [PATCH 4/4] ALSA: usb-audio: UAC3 Add support for connector insertion Jorge Sanjuan 2018-04-22 20:55 ` kbuild test robot 2018-04-22 20:55 ` kbuild test robot 2018-04-23 12:19 ` Takashi Iwai 2018-04-23 12:19 ` Takashi Iwai 2018-04-23 16:06 ` Jorge 2018-04-24 17:24 ` [PATCH v2 0/4] ALSA: usb: UAC3 new features Jorge Sanjuan 2018-04-24 17:24 ` Jorge Sanjuan 2018-04-24 17:24 ` [PATCH v2 1/4] ALSA: usb-audio: UAC3. Add support for mixer unit Jorge Sanjuan 2018-04-25 22:35 ` [alsa-devel] " Ruslan Bilovol 2018-04-26 16:56 ` Jorge 2018-04-26 16:56 ` Jorge 2018-04-27 17:06 ` [PATCH v3 " Jorge Sanjuan 2018-04-27 17:06 ` Jorge Sanjuan 2018-05-04 0:57 ` Ruslan Bilovol 2018-05-08 9:43 ` Jorge 2018-05-09 22:11 ` Ruslan Bilovol 2018-04-24 17:24 ` [PATCH v2 2/4] ALSA: usb-audio: ADC3: Fix channel mapping conversion for ADC3 Jorge Sanjuan 2018-04-24 17:55 ` Takashi Iwai 2018-04-24 17:55 ` Takashi Iwai 2018-04-24 17:24 ` [PATCH v2 3/4] ALSA: usb-audio: Use Class Specific EP for UAC3 devices Jorge Sanjuan 2018-04-24 17:24 ` Jorge Sanjuan 2018-04-25 22:53 ` [alsa-devel] " Ruslan Bilovol 2018-04-24 17:24 ` [PATCH v2 4/4] ALSA: usb-audio: UAC3 Add support for connector insertion Jorge Sanjuan 2018-04-24 17:24 ` Jorge Sanjuan 2018-04-24 18:02 ` [PATCH v2 0/4] ALSA: usb: UAC3 new features Takashi Iwai 2018-04-24 18:02 ` Takashi Iwai 2018-04-26 9:26 ` [alsa-devel] " Ruslan Bilovol 2018-04-26 9:26 ` Ruslan Bilovol 2018-04-26 17:13 ` [alsa-devel] " Jorge 2018-05-11 15:25 ` [PATCH v4 " Jorge Sanjuan 2018-05-11 15:25 ` Jorge Sanjuan 2018-05-11 15:25 ` [PATCH v4 1/4] ALSA: usb-audio: UAC3. Add support for mixer unit Jorge Sanjuan 2018-05-11 15:25 ` Jorge Sanjuan 2018-05-14 20:54 ` Ruslan Bilovol 2018-05-11 15:25 ` [PATCH v4 2/4] ALSA: usb-audio: Use Class Specific EP for UAC3 devices Jorge Sanjuan 2018-05-14 21:00 ` Ruslan Bilovol 2018-05-11 15:25 ` [PATCH v4 3/4] ALSA: usb-audio: UAC3 Add support for connector insertion Jorge Sanjuan 2018-05-11 15:25 ` [PATCH v4 4/4] ALSA: usb-audio: UAC3: Parse Input Terminal number of channels Jorge Sanjuan 2018-05-11 15:25 ` Jorge Sanjuan 2018-05-14 8:54 ` Jorge 2018-05-14 9:36 ` Ruslan Bilovol 2018-05-14 11:03 ` [RESEND PATCH " Jorge Sanjuan 2018-05-14 11:03 ` Jorge Sanjuan 2018-05-14 21:05 ` Ruslan Bilovol 2018-05-14 21:05 ` Ruslan Bilovol 2018-05-15 5:38 ` [PATCH v4 0/4] ALSA: usb: UAC3 new features Takashi Iwai 2018-05-15 5:38 ` Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180420170327.31569-4-jorge.sanjuan@codethink.co.uk \ --to=jorge.sanjuan@codethink.co.uk \ --cc=alsa-devel@alsa-project.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.