ALSA: usb-audio: parse more format descriptors with structs
PATCH 1/4 ALSA: usb-audio: parse more format descriptors with structs
--- sound/usb/endpoint.c | 11 +++++++---- sound/usb/format.c | 20 ++++++++++---------- sound/usb/format.h | 7 ++++--- 3 files changed, 21 insertions(+), 17 deletions(-)
sound/usb/endpoint.c +7 -4
@@ -158,8 +158,9 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)int i, altno, err, stream;int format =0 , num_channels =0 ;struct audioformat *fp =NULL ; -unsigned char *fmt, *csep; +unsigned char *csep;int num, protocol; +struct uac_format_type_i_continuous_descriptor *fmt; dev = chip->dev;
@@ -256,8 +257,8 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) dev->devnum, iface_no, altno);continue ; } -if (((protocol ==UAC_VERSION_1 ) && (fmt[0 ] <8 )) || - ((protocol ==UAC_VERSION_2 ) && (fmt[0 ] !=6 ))) { +if (((protocol ==UAC_VERSION_1 ) && (fmt->bLength <8 )) || + ((protocol ==UAC_VERSION_2 ) && (fmt->bLength !=6 ))) {snd_printk (KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n" , dev->devnum, iface_no, altno);continue ;
@@ -268,7 +269,9 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)* with the previous one, except for a larger packet size, but * is actually a mislabeled two-channel setting; ignore it. */ - if (fmt[4] == 1 && fmt[5] == 2 && altno == 2 && num == 3 && + if (fmt->bNrChannels == 1 && + fmt->bSubframeSize == 2 && + altno == 2 && num == 3 && fp && fp->altsetting == 1 && fp->channels == 1 && fp->formats == SNDRV_PCM_FMTBIT_S16_LE && protocol == UAC_VERSION_1 &&
sound/usb/format.c +10 -10
@@ -278,12 +278,11 @@ err:* parse the format type I and III descriptors */ static int parse_audio_format_i (struct snd_usb_audio *chip, -struct audioformat *fp, -int format,void *_fmt, +struct audioformat *fp,int format, +struct uac_format_type_i_continuous_descriptor *fmt,struct usb_host_interface *iface) {struct usb_interface_descriptor *altsd =get_iface_desc (iface); -struct uac_format_type_i_discrete_descriptor *fmt = _fmt;int protocol = altsd->bInterfaceProtocol;int pcm_format, ret;
@@ -320,7 +319,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,switch (protocol) {case UAC_VERSION_1 : fp->channels = fmt->bNrChannels; - ret =parse_audio_format_rates_v1 (chip, fp, _fmt,7 ); + ret =parse_audio_format_rates_v1 (chip, fp, (unsigned char *) fmt,7 );break ;case UAC_VERSION_2 :/* fp->channels is already set in this case */
@@ -392,12 +391,12 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, }int snd_usb_parse_audio_format (struct snd_usb_audio *chip,struct audioformat *fp, -int format,unsigned char *fmt,int stream, -struct usb_host_interface *iface) +int format,struct uac_format_type_i_continuous_descriptor *fmt, +int stream,struct usb_host_interface *iface) {int err; -switch (fmt[3 ]) { +switch (fmt->bFormatType) {case UAC_FORMAT_TYPE_I :case UAC_FORMAT_TYPE_III : err =parse_audio_format_i (chip, fp, format, fmt, iface);
@@ -407,10 +406,11 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fbreak ;default :snd_printd (KERN_INFO "%d:%u:%d : format type %d is not supported yet\n" , - chip->dev->devnum, fp->iface, fp->altsetting, fmt[3 ]); + chip->dev->devnum, fp->iface, fp->altsetting, + fmt->bFormatType);return -1 ; } - fp->fmt_type = fmt[3 ]; + fp->fmt_type = fmt->bFormatType;if (err <0 )return err;#if 1
@@ -421,7 +421,7 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fif (chip->usb_id ==USB_ID (0x041e ,0x3000 ) || chip->usb_id ==USB_ID (0x041e ,0x3020 ) || chip->usb_id ==USB_ID (0x041e ,0x3061 )) { -if (fmt[3 ] ==UAC_FORMAT_TYPE_I && +if (fmt->bFormatType ==UAC_FORMAT_TYPE_I && fp->rates !=SNDRV_PCM_RATE_48000 && fp->rates !=SNDRV_PCM_RATE_96000 )return -1 ;
sound/usb/format.h +4 -3
@@ -1,8 +1,9 @@#ifndef __USBAUDIO_FORMAT_H#define __USBAUDIO_FORMAT_H -int snd_usb_parse_audio_format (struct snd_usb_audio *chip,struct audioformat *fp, -int format,unsigned char *fmt,int stream, -struct usb_host_interface *iface); +int snd_usb_parse_audio_format (struct snd_usb_audio *chip, +struct audioformat *fp,int format, +struct uac_format_type_i_continuous_descriptor *fmt, +int stream,struct usb_host_interface *iface);#endif /* __USBAUDIO_FORMAT_H */
Signature · 1 line
1.7.1
PATCH 2/4 ALSA: usb-audio: fix return values
-1 is not a good return value as it means -EPERM, "not permitted". Choose -ENOTSUPP instead, which is what the code really wants to tell its callers.
--- sound/usb/format.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/usb/format.c +2 -2
@@ -408,7 +408,7 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fsnd_printd (KERN_INFO "%d:%u:%d : format type %d is not supported yet\n" , chip->dev->devnum, fp->iface, fp->altsetting, fmt->bFormatType); -return -1 ; +return -ENOTSUPP ; } fp->fmt_type = fmt->bFormatType;if (err <0 )
@@ -424,7 +424,7 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fif (fmt->bFormatType ==UAC_FORMAT_TYPE_I && fp->rates !=SNDRV_PCM_RATE_48000 && fp->rates !=SNDRV_PCM_RATE_96000 ) - return -1; + return -ENOTSUPP; }#endif return 0 ;
Signature · 1 line
1.7.1
PATCH 3/4 ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
In reply to Daniel MackUAC2 devices have their information about pitch control stored in a different field. Parse it, and emulate the bits for a v1 device.
A new struct uac2_iso_endpoint_descriptor is added.
--- include/linux/usb/audio-v2.h | 16 ++++++++++++ sound/usb/endpoint.c | 55 ++++++++++++++++++++++++++++++++---------- 2 files changed, 58 insertions(+), 13 deletions(-)
include/linux/usb/audio-v2.h +16 -0
@@ -105,6 +105,22 @@ struct uac_as_header_descriptor_v2 {__u8 iChannelNames; } __attribute__((packed)); +/* 4.10.1.2 Class-Specific AS Isochronous Audio Data Endpoint Descriptor */ + +struct uac2_iso_endpoint_descriptor { +__u8 bLength;/* in bytes: 8 */ +__u8 bDescriptorType;/* USB_DT_CS_ENDPOINT */ +__u8 bDescriptorSubtype;/* EP_GENERAL */ +__u8 bmAttributes; +__u8 bmControls; +__u8 bLockDelayUnits; +__le16 wLockDelay; +} __attribute__((packed)); + +#define UAC2_CONTROL_PITCH (3 << 0) +#define UAC2_CONTROL_DATA_OVERRUN (3 << 2) +#define UAC2_CONTROL_DATA_UNDERRUN (3 << 4) +/* 6.1 Interrupt Data Message */ #define UAC2_INTERRUPT_DATA_MSG_VENDOR (1 << 0)
sound/usb/endpoint.c +42 -13
79 lines not on this page · raw message
Signature · 1 line
1.7.1
Re: [PATCH 3/4] ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
Quoted 9 lines · Daniel Mack
UAC2 devices have their information about pitch control stored in a different field. Parse it, and emulate the bits for a v1 device.
A new struct
uac2_iso_endpoint_descriptoris added.Signed-off-by Daniel Mack <[email protected]>--- include/linux/usb/audio-v2.h | 16 ++++++++++++
Greg, I copied you because of this patch, just to let you know we're having fun in your area of responsibility again :)
Daniel
Quoted 120 lines
sound/usb/endpoint.c | 55 ++++++++++++++++++++++++++++++++---------- 2 files changed, 58 insertions(+), 13 deletions(-)include/linux/usb/audio-v2.h +16
-0@@ -105,6 +105,22 @@ struct uac_as_header_descriptor_v2 {__u8 iChannelNames; } __attribute__((packed)); +/* 4.10.1.2 Class-Specific AS Isochronous Audio Data Endpoint Descriptor */ + +struct uac2_iso_endpoint_descriptor { +__u8 bLength;/* in bytes: 8 */ +__u8 bDescriptorType;/* USB_DT_CS_ENDPOINT */ +__u8 bDescriptorSubtype;/* EP_GENERAL */ +__u8 bmAttributes; +__u8 bmControls; +__u8 bLockDelayUnits; +__le16 wLockDelay; +} __attribute__((packed)); + +#define UAC2_CONTROL_PITCH (3 << 0) +#define UAC2_CONTROL_DATA_OVERRUN (3 << 2) +#define UAC2_CONTROL_DATA_UNDERRUN (3 << 4) +/* 6.1 Interrupt Data Message */ #define UAC2_INTERRUPT_DATA_MSG_VENDOR (1 << 0)sound/usb/endpoint.c +42
-13@@ -149,6 +149,47 @@ int snd_usb_add_audio_endpoint(struct snd_usb_audio *chip, int stream, struct aureturn 0 ; } +static int parse_uac_endpoint_attributes (struct snd_usb_audio *chip, +struct usb_host_interface *alts, +int protocol,int iface_no) +{ +/* parsed with a v1 header here. that's ok as we only look at the +* header first which is the same for both versions */ +struct uac_iso_endpoint_descriptor *csep; +struct usb_interface_descriptor *altsd =get_iface_desc (alts); +int attributes =0 ; + + csep =snd_usb_find_desc (alts->endpoint[0 ].extra, alts->endpoint[0 ].extralen,NULL ,USB_DT_CS_ENDPOINT ); + +/* Creamware Noah has this descriptor after the 2nd endpoint */ +if (!csep && altsd->bNumEndpoints >=2 ) + csep =snd_usb_find_desc (alts->endpoint[1 ].extra, alts->endpoint[1 ].extralen,NULL ,USB_DT_CS_ENDPOINT ); + +if (!csep || csep->bLength <7 || + csep->bDescriptorSubtype !=UAC_EP_GENERAL ) { +snd_printk (KERN_WARNING "%d:%u:%d : no or invalid" +" class specific endpoint descriptor\n" , + chip->dev->devnum, iface_no, + altsd->bAlternateSetting); +return 0 ; + } + +if (protocol ==UAC_VERSION_1 ) { + attributes = csep->bmAttributes; + }else { +struct uac2_iso_endpoint_descriptor *csep2 = + (struct uac2_iso_endpoint_descriptor *) csep; + + attributes = csep->bmAttributes &UAC_EP_CS_ATTR_FILL_MAX ; + +/* emulate the endpoint attributes of a v1 device */ +if (csep2->bmControls &UAC2_CONTROL_PITCH ) + attributes |=UAC_EP_CS_ATTR_PITCH_CONTROL ; + } + +return attributes; +} +int snd_usb_parse_audio_endpoints (struct snd_usb_audio *chip,int iface_no) {struct usb_device *dev;@@ -158,7 +199,6 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)int i, altno, err, stream;int format =0 , num_channels =0 ;struct audioformat *fp =NULL ; -unsigned char *csep;int num, protocol;struct uac_format_type_i_continuous_descriptor *fmt;@@ -279,17 +319,6 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) fp->maxpacksize * 2)continue ; - csep =snd_usb_find_desc (alts->endpoint[0 ].extra, alts->endpoint[0 ].extralen,NULL ,USB_DT_CS_ENDPOINT ); -/* Creamware Noah has this descriptor after the 2nd endpoint */ -if (!csep && altsd->bNumEndpoints >=2 ) - csep =snd_usb_find_desc (alts->endpoint[1 ].extra, alts->endpoint[1 ].extralen,NULL ,USB_DT_CS_ENDPOINT ); -if (!csep || csep[0 ] <7 || csep[2 ] !=UAC_EP_GENERAL ) { -snd_printk (KERN_WARNING "%d:%u:%d : no or invalid" -" class specific endpoint descriptor\n" , - dev->devnum, iface_no, altno); - csep =NULL ; - } - fp =kzalloc (sizeof (*fp),GFP_KERNEL );if (! fp) {snd_printk (KERN_ERR "cannot malloc\n" );@@ -308,7 +337,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)if (snd_usb_get_speed (dev) ==USB_SPEED_HIGH ) fp->maxpacksize = (((fp->maxpacksize >>11 ) &3 ) +1 ) * (fp->maxpacksize &0x7ff ); - fp->attributes = csep ? csep[3 ] :0 ; + fp->attributes =parse_uac_endpoint_attributes (chip, alts, protocol, iface_no);/* some quirks for attributes here */ Signature · 1 line
1.7.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 3/4] ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
At Wed, 26 May 2010 13:46:57 -0700,
Quoted 13 lines · Greg KH
Quoted 11 lines · Daniel Mack
Quoted 9 lines · Daniel Mack
UAC2 devices have their information about pitch control stored in a different field. Parse it, and emulate the bits for a v1 device.
A new struct
uac2_iso_endpoint_descriptoris added.Signed-off-by Daniel Mack <[email protected]>--- include/linux/usb/audio-v2.h | 16 ++++++++++++
Quoted 8 lines
Quoted 2 lines
Greg, I copied you because of this patch, just to let you know we're having fun in your area of responsibility again :)
Heh, no problem at all.
Takashi, feel free to add an:
to this patch when you take it.
OK, I put this to my tree. Will be included in the next pull request in this week.
thanks,
Takashi
Re: [PATCH 3/4] ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
Quoted 18 lines · Takashi Iwai
At Wed, 26 May 2010 13:46:57 -0700,
Quoted 16 lines · Greg KH
Quoted 13 lines · Daniel Mack
Quoted 9 lines · Daniel Mack
UAC2 devices have their information about pitch control stored in a different field. Parse it, and emulate the bits for a v1 device.
A new struct
uac2_iso_endpoint_descriptoris added.Signed-off-by Daniel Mack <[email protected]>--- include/linux/usb/audio-v2.h | 16 ++++++++++++Greg, I copied you because of this patch, just to let you know we're having fun in your area of responsibility again :)
Quoted 8 lines
Quoted 5 lines
Heh, no problem at all.
Takashi, feel free to add an:
to this patch when you take it.
OK, I put this to my tree. Will be included in the next pull request in this week.
Thanks Takashi!
Here's another small one that needs attention.
Daniel
Quoted 1 line
From
3beee40982b98314f8d58c775cc8b40a8e25ce18Mon Sep 17 00:00:00 2001
From: Daniel Mack <[email protected]>
Date: Thu, 27 May 2010 18:28:25 +0200
Subject: [PATCH] ALSA: usb-audio: fix feature unit parser for UAC2
Fix a small off-by-one bug which causes the feature unit to announce a wrong number of channels. This leads to illegal requests sent to the firmware eventually.
--- sound/usb/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/usb/mixer.c +1 -1
@@ -1126,7 +1126,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void }else {struct uac2_feature_unit_descriptor *ftr = _ftr; csize =4 ; - channels = (hdr->bLength -6 ) /4 ; + channels = (hdr->bLength -6 ) /4 -1 ; bmaControls = ftr->bmaControls; }
Signature · 1 line
1.7.1
Re: [PATCH 3/4] ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
At Thu, 27 May 2010 20:15:14 +0200,
Quoted 40 lines · Daniel Mack
Quoted 18 lines · Takashi Iwai
At Wed, 26 May 2010 13:46:57 -0700,
Quoted 16 lines · Greg KH
Quoted 13 lines · Daniel Mack
Quoted 9 lines · Daniel Mack
UAC2 devices have their information about pitch control stored in a different field. Parse it, and emulate the bits for a v1 device.
A new struct
uac2_iso_endpoint_descriptoris added.Signed-off-by Daniel Mack <[email protected]>--- include/linux/usb/audio-v2.h | 16 ++++++++++++Greg, I copied you because of this patch, just to let you know we're having fun in your area of responsibility again :)
Quoted 8 lines
Quoted 5 lines
Heh, no problem at all.
Takashi, feel free to add an:
to this patch when you take it.
OK, I put this to my tree. Will be included in the next pull request in this week.
Thanks Takashi!
Here's another small one that needs attention.
Daniel
Quoted 1 line
From
3beee40982b98314f8d58c775cc8b40a8e25ce18Mon Sep 17 00:00:00 2001From: Daniel Mack <[email protected]>
Date: Thu, 27 May 2010 18:28:25 +0200
Subject: [PATCH] ALSA: usb-audio: fix feature unit parser for UAC2
Quoted 5 lines
Fix a small off-by-one bug which causes the feature unit to announce a wrong number of channels. This leads to illegal requests sent to the firmware eventually.
Signed-off-by Daniel Mack <[email protected]>
OK, applied now. Thanks.
Takashi
Quoted 20 lines
--- sound/usb/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)sound/usb/mixer.c +1
-1@@ -1126,7 +1126,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void }else {struct uac2_feature_unit_descriptor *ftr = _ftr; csize =4 ; - channels = (hdr->bLength -6 ) /4 ; + channels = (hdr->bLength -6 ) /4 -1 ; bmaControls = ftr->bmaControls; }Signature · 1 line
1.7.1
PATCH 4/4 ALSA: usb-audio: add support for UAC2 pitch control
In reply to Daniel MackThis request is again handled differently in comparison to UAC1.
--- sound/usb/pcm.c | 37 ++++++++++++++++++++++++++++++------- 1 files changed, 30 insertions(+), 7 deletions(-)
sound/usb/pcm.c +30 -7
@@ -120,10 +120,6 @@ static int init_pitch_v1(struct snd_usb_audio *chip, int iface, ep =get_endpoint (alts,0 )->bEndpointAddress; -/* if endpoint doesn't have pitch control, bail out */ -if (!(fmt->attributes &UAC_EP_CS_ATTR_PITCH_CONTROL )) -return 0 ; - data[0 ] =1 ; if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR, USB_TYPE_CLASS|USB_RECIP_ENDPOINT|USB_DIR_OUT,
@@ -137,8 +133,32 @@ static int init_pitch_v1(struct snd_usb_audio *chip, int iface,return 0 ; } +static int init_pitch_v2 (struct snd_usb_audio *chip,int iface, +struct usb_host_interface *alts, +struct audioformat *fmt) +{ +struct usb_device *dev = chip->dev; +unsigned char data[1 ]; +unsigned int ep; +int err; + + ep =get_endpoint (alts,0 )->bEndpointAddress; + + data[0 ] =1 ; +if ((err =snd_usb_ctl_msg (dev,usb_sndctrlpipe (dev,0 ),UAC2_CS_CUR , +USB_TYPE_CLASS |USB_RECIP_ENDPOINT |USB_DIR_OUT , +UAC2_EP_CS_PITCH <<8 ,0 , + data,sizeof (data),1000 )) <0 ) { +snd_printk (KERN_ERR "%d:%d:%d: cannot set enable PITCH (v2)\n" , + dev->devnum, iface, fmt->altsetting); +return err; + } + +return 0 ; +} +/* -* initialize the picth control and sample rate +* initialize the pitch control and sample rate */ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface, struct usb_host_interface *alts,
@@ -146,13 +166,16 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface, {struct usb_interface_descriptor *altsd =get_iface_desc (alts); +/* if endpoint doesn't have pitch control, bail out */ +if (!(fmt->attributes &UAC_EP_CS_ATTR_PITCH_CONTROL )) +return 0 ; +switch (altsd->bInterfaceProtocol) {case UAC_VERSION_1 :return init_pitch_v1 (chip, iface, alts, fmt);case UAC_VERSION_2 : -/* not implemented yet */ -return 0 ; +return init_pitch_v2 (chip, iface, alts, fmt); }return -EINVAL ;
Signature · 1 line
1.7.1
Takashi Iwai
AppliedAt Wed, 26 May 2010 18:11:36 +0200,
Quoted 2 lines · Daniel Mack
Signed-off-by Daniel Mack <[email protected]>
Applied all patches now. Thanks.
Takashi
Quoted 130 lines
--- sound/usb/endpoint.c | 11 +++++++---- sound/usb/format.c | 20 ++++++++++---------- sound/usb/format.h | 7 ++++--- 3 files changed, 21 insertions(+), 17 deletions(-)sound/usb/endpoint.c +7
-4@@ -158,8 +158,9 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)int i, altno, err, stream;int format =0 , num_channels =0 ;struct audioformat *fp =NULL ; -unsigned char *fmt, *csep; +unsigned char *csep;int num, protocol; +struct uac_format_type_i_continuous_descriptor *fmt; dev = chip->dev;@@ -256,8 +257,8 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) dev->devnum, iface_no, altno);continue ; } -if (((protocol ==UAC_VERSION_1 ) && (fmt[0 ] <8 )) || - ((protocol ==UAC_VERSION_2 ) && (fmt[0 ] !=6 ))) { +if (((protocol ==UAC_VERSION_1 ) && (fmt->bLength <8 )) || + ((protocol ==UAC_VERSION_2 ) && (fmt->bLength !=6 ))) {snd_printk (KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n" , dev->devnum, iface_no, altno);continue ;@@ -268,7 +269,9 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)* with the previous one, except for a larger packet size, but * is actually a mislabeled two-channel setting; ignore it. */ - if (fmt[4] == 1 && fmt[5] == 2 && altno == 2 && num == 3 && + if (fmt->bNrChannels == 1 && + fmt->bSubframeSize == 2 && + altno == 2 && num == 3 && fp && fp->altsetting == 1 && fp->channels == 1 && fp->formats == SNDRV_PCM_FMTBIT_S16_LE && protocol == UAC_VERSION_1 &&sound/usb/format.c +10
-10@@ -278,12 +278,11 @@ err:* parse the format type I and III descriptors */ static int parse_audio_format_i (struct snd_usb_audio *chip, -struct audioformat *fp, -int format,void *_fmt, +struct audioformat *fp,int format, +struct uac_format_type_i_continuous_descriptor *fmt,struct usb_host_interface *iface) {struct usb_interface_descriptor *altsd =get_iface_desc (iface); -struct uac_format_type_i_discrete_descriptor *fmt = _fmt;int protocol = altsd->bInterfaceProtocol;int pcm_format, ret;@@ -320,7 +319,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,switch (protocol) {case UAC_VERSION_1 : fp->channels = fmt->bNrChannels; - ret =parse_audio_format_rates_v1 (chip, fp, _fmt,7 ); + ret =parse_audio_format_rates_v1 (chip, fp, (unsigned char *) fmt,7 );break ;case UAC_VERSION_2 :/* fp->channels is already set in this case */ @@ -392,12 +391,12 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip, }int snd_usb_parse_audio_format (struct snd_usb_audio *chip,struct audioformat *fp, -int format,unsigned char *fmt,int stream, -struct usb_host_interface *iface) +int format,struct uac_format_type_i_continuous_descriptor *fmt, +int stream,struct usb_host_interface *iface) {int err; -switch (fmt[3 ]) { +switch (fmt->bFormatType) {case UAC_FORMAT_TYPE_I :case UAC_FORMAT_TYPE_III : err =parse_audio_format_i (chip, fp, format, fmt, iface);@@ -407,10 +406,11 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fbreak ;default :snd_printd (KERN_INFO "%d:%u:%d : format type %d is not supported yet\n" , - chip->dev->devnum, fp->iface, fp->altsetting, fmt[3 ]); + chip->dev->devnum, fp->iface, fp->altsetting, + fmt->bFormatType);return -1 ; } - fp->fmt_type = fmt[3 ]; + fp->fmt_type = fmt->bFormatType;if (err <0 )return err;#if 1 @@ -421,7 +421,7 @@ int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fif (chip->usb_id ==USB_ID (0x041e ,0x3000 ) || chip->usb_id ==USB_ID (0x041e ,0x3020 ) || chip->usb_id ==USB_ID (0x041e ,0x3061 )) { -if (fmt[3 ] ==UAC_FORMAT_TYPE_I && +if (fmt->bFormatType ==UAC_FORMAT_TYPE_I && fp->rates !=SNDRV_PCM_RATE_48000 && fp->rates !=SNDRV_PCM_RATE_96000 )return -1 ;sound/usb/format.h +4
-3@@ -1,8 +1,9 @@#ifndef __USBAUDIO_FORMAT_H#define __USBAUDIO_FORMAT_H -int snd_usb_parse_audio_format (struct snd_usb_audio *chip,struct audioformat *fp, -int format,unsigned char *fmt,int stream, -struct usb_host_interface *iface); +int snd_usb_parse_audio_format (struct snd_usb_audio *chip, +struct audioformat *fp,int format, +struct uac_format_type_i_continuous_descriptor *fmt, +int stream,struct usb_host_interface *iface);#endif /* __USBAUDIO_FORMAT_H */ Signature · 1 line
1.7.1