| Message ID | 20200213112059.18745-2-tiwai@suse.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 10fa9512769fa3b15ea29f4f331f4604c17b4b2c |
| Headers | show |
| Series | ALSA: usb-audio: UAC2 effect unit parsing | expand |
On Thu, 13 Feb 2020 12:20:58 +0100, Takashi Iwai wrote: > > The UAC2 Effect Unit Descriptor has a slightly different definition > from other similar ones like Processing Unit or Extension Unit. > Define it here so that it can be used in USB-audio driver in a later > patch. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > --- > include/linux/usb/audio-v2.h | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h > index ba4b3e3327ff..cb9900b34b67 100644 > --- a/include/linux/usb/audio-v2.h > +++ b/include/linux/usb/audio-v2.h > @@ -156,6 +156,18 @@ struct uac2_feature_unit_descriptor { > __u8 bmaControls[0]; /* variable length */ > } __attribute__((packed)); > > +/* 4.7.2.10 Effect Unit Descriptor */ > + > +struct uac2_effect_unit_descriptor { > + __u8 bLength; > + __u8 bDescriptorType; > + __u8 bDescriptorSubtype; > + __u8 bUnitID; > + __le16 wEffectType; > + __u8 bSourceID; > + __u8 bmaControls[]; /* variable length */ > +} __attribute__((packed)); > + > /* 4.9.2 Class-Specific AS Interface Descriptor */ > > struct uac2_as_header_descriptor { Greg, I suppose you are OK with this addition? thanks, Takashi
On Mon, Feb 17, 2020 at 03:18:34PM +0100, Takashi Iwai wrote: > On Thu, 13 Feb 2020 12:20:58 +0100, > Takashi Iwai wrote: > > > > The UAC2 Effect Unit Descriptor has a slightly different definition > > from other similar ones like Processing Unit or Extension Unit. > > Define it here so that it can be used in USB-audio driver in a later > > patch. > > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > --- > > include/linux/usb/audio-v2.h | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h > > index ba4b3e3327ff..cb9900b34b67 100644 > > --- a/include/linux/usb/audio-v2.h > > +++ b/include/linux/usb/audio-v2.h > > @@ -156,6 +156,18 @@ struct uac2_feature_unit_descriptor { > > __u8 bmaControls[0]; /* variable length */ > > } __attribute__((packed)); > > > > +/* 4.7.2.10 Effect Unit Descriptor */ > > + > > +struct uac2_effect_unit_descriptor { > > + __u8 bLength; > > + __u8 bDescriptorType; > > + __u8 bDescriptorSubtype; > > + __u8 bUnitID; > > + __le16 wEffectType; > > + __u8 bSourceID; > > + __u8 bmaControls[]; /* variable length */ > > +} __attribute__((packed)); > > + > > /* 4.9.2 Class-Specific AS Interface Descriptor */ > > > > struct uac2_as_header_descriptor { > > Greg, I suppose you are OK with this addition? > > Yes, that's fine with me: Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On Mon, 17 Feb 2020 15:22:38 +0100, Greg Kroah-Hartman wrote: > > On Mon, Feb 17, 2020 at 03:18:34PM +0100, Takashi Iwai wrote: > > On Thu, 13 Feb 2020 12:20:58 +0100, > > Takashi Iwai wrote: > > > > > > The UAC2 Effect Unit Descriptor has a slightly different definition > > > from other similar ones like Processing Unit or Extension Unit. > > > Define it here so that it can be used in USB-audio driver in a later > > > patch. > > > > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > > --- > > > include/linux/usb/audio-v2.h | 12 ++++++++++++ > > > 1 file changed, 12 insertions(+) > > > > > > diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h > > > index ba4b3e3327ff..cb9900b34b67 100644 > > > --- a/include/linux/usb/audio-v2.h > > > +++ b/include/linux/usb/audio-v2.h > > > @@ -156,6 +156,18 @@ struct uac2_feature_unit_descriptor { > > > __u8 bmaControls[0]; /* variable length */ > > > } __attribute__((packed)); > > > > > > +/* 4.7.2.10 Effect Unit Descriptor */ > > > + > > > +struct uac2_effect_unit_descriptor { > > > + __u8 bLength; > > > + __u8 bDescriptorType; > > > + __u8 bDescriptorSubtype; > > > + __u8 bUnitID; > > > + __le16 wEffectType; > > > + __u8 bSourceID; > > > + __u8 bmaControls[]; /* variable length */ > > > +} __attribute__((packed)); > > > + > > > /* 4.9.2 Class-Specific AS Interface Descriptor */ > > > > > > struct uac2_as_header_descriptor { > > > > Greg, I suppose you are OK with this addition? > > > > > > Yes, that's fine with me: > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thanks, I'll queue the patches to sound git tree. Takashi
diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h index ba4b3e3327ff..cb9900b34b67 100644 --- a/include/linux/usb/audio-v2.h +++ b/include/linux/usb/audio-v2.h @@ -156,6 +156,18 @@ struct uac2_feature_unit_descriptor { __u8 bmaControls[0]; /* variable length */ } __attribute__((packed)); +/* 4.7.2.10 Effect Unit Descriptor */ + +struct uac2_effect_unit_descriptor { + __u8 bLength; + __u8 bDescriptorType; + __u8 bDescriptorSubtype; + __u8 bUnitID; + __le16 wEffectType; + __u8 bSourceID; + __u8 bmaControls[]; /* variable length */ +} __attribute__((packed)); + /* 4.9.2 Class-Specific AS Interface Descriptor */ struct uac2_as_header_descriptor {
The UAC2 Effect Unit Descriptor has a slightly different definition from other similar ones like Processing Unit or Extension Unit. Define it here so that it can be used in USB-audio driver in a later patch. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- include/linux/usb/audio-v2.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)