ALSA: usb-audio: UAC2: clean up parsing of bmaControls
PATCH 1/9 ALSA: usb-audio: UAC2: clean up parsing of bmaControls
Introduce two new static inline functions for a more readable parsing of UAC2 bmaControls.
--- include/linux/usb/audio-v2.h | 10 ++++++++++ sound/usb/mixer.c | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-)
include/linux/usb/audio-v2.h +10 -0
@@ -18,6 +18,16 @@/* v1.0 and v2.0 of this standard have many things in common. For the rest * of the definitions, please refer to audio.h */ +static inline bool uac2_control_is_readable (u32 bmControls,u8 control) +{ +return (bmControls >> (control *2 )) &0x1 ; +} + +static inline bool uac2_control_is_writeable (u32 bmControls,u8 control) +{ +return (bmControls >> (control *2 )) &0x2 ; +} +/* 4.7.2.1 Clock Source Descriptor */ struct uac_clock_source_descriptor {
sound/usb/mixer.c +4 -4
@@ -1188,9 +1188,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, voidfor (j =0 ; j < channels; j++) {unsigned int mask =snd_usb_combine_bytes (bmaControls + csize * (j+1 ), csize); -if (mask & (1 << (i *2 ))) { +if (uac2_control_is_readable (mask, i)) { ch_bits |= (1 << j); -if (~mask & (1 << ((i *2 ) +1 ))) +if (!uac2_control_is_writeable (mask, i)) ch_read_only |= (1 << j); } }
@@ -1198,9 +1198,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void/* FIXME: the whole unit is read-only if any of the channels is marked read-only */ if (ch_bits &1 )/* the first channel must be set (for ease of programming) */ build_feature_ctl (state, _ftr, ch_bits, i, &iterm, unitid, !!ch_read_only); -if (master_bits & (1 << i *2 )) +if (uac2_control_is_readable (master_bits, i))build_feature_ctl (state, _ftr,0 , i, &iterm, unitid, - ~master_bits & (1 << ((i *2 ) +1 ))); + !uac2_control_is_writeable (master_bits, i)); } }
Signature · 1 line
1.7.1
PATCH 2/9 ALSA: usb-audio: support partially write-protected UAC2 controls
So far, UAC2 controls are marked read-only if any of the channels are marked read-only in the descriptors. Change this behaviour and
- mark them writeable unless all channels are read-only
- store the read-only mask in usb_mixer_elem_info and
- check the mask again in set_cur_mix_value(), and bail out for write-protected channels.
--- sound/usb/mixer.c | 30 ++++++++++++++++++++++++------ sound/usb/mixer.h | 2 ++ 2 files changed, 26 insertions(+), 6 deletions(-)
sound/usb/mixer.c +24 -6
@@ -462,6 +462,16 @@ static int set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel, int index, int value) { int err; +unsigned int read_only = (channel ==0 ) ? + cval->master_readonly : + cval->ch_readonly & (1 << (channel -1 )); + +if (read_only) { +snd_printdd (KERN_INFO "%s(): channel %d of control %d is read_only\n" , + __func__, channel, cval->control); +return 0 ; + } + err =snd_usb_mixer_set_ctl_value (cval,UAC_SET_CUR , (cval->control <<8 ) | channel, value);if (err <0 )
@@ -958,7 +968,7 @@ static size_t append_ctl_name(struct snd_kcontrol *kctl, const char *str)static void build_feature_ctl (struct mixer_build *state,void *raw_desc,unsigned int ctl_mask,int control,struct usb_audio_term *iterm,int unitid, -int read_only) +int readonly_mask) {struct uac_feature_unit_descriptor *desc = raw_desc;unsigned int len =0 ;
@@ -989,20 +999,25 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, cval->control = control; cval->cmask = ctl_mask; cval->val_type = audio_feature_info[control-1 ].type; -if (ctl_mask ==0 ) +if (ctl_mask ==0 ) { cval->channels =1 ;/* master channel */ -else { + cval->master_readonly = readonly_mask; + }else {int i, c =0 ;for (i =0 ; i <16 ; i++)if (ctl_mask & (1 << i)) c++; cval->channels = c; + cval->ch_readonly = readonly_mask; }/* get min/max values */ get_min_max (cval,0 ); -if (read_only) +/* if all channels in the mask are marked read-only, make the control +* read-only. set_cur_mix_value() will check the mask again and won't +* issue write commands to read-only channels. */ +if (cval->channels == readonly_mask) kctl =snd_ctl_new1 (&usb_feature_unit_ctl_ro, cval);else kctl =snd_ctl_new1 (&usb_feature_unit_ctl, cval);
@@ -1195,9 +1210,12 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void } } -/* FIXME: the whole unit is read-only if any of the channels is marked read-only */ +/* NOTE: build_feature_ctl() will mark the control read-only if all channels +* are marked read-only in the descriptors. Otherwise, the control will be +* reported as writeable, but the driver will not actually issue a write +* command for read-only channels */ if (ch_bits &1 )/* the first channel must be set (for ease of programming) */ -build_feature_ctl (state, _ftr, ch_bits, i, &iterm, unitid, !!ch_read_only); +build_feature_ctl (state, _ftr, ch_bits, i, &iterm, unitid, ch_read_only);if (uac2_control_is_readable (master_bits, i))build_feature_ctl (state, _ftr,0 , i, &iterm, unitid, !uac2_control_is_writeable (master_bits, i));
sound/usb/mixer.h +2 -0
@@ -34,6 +34,8 @@ struct usb_mixer_elem_info {unsigned int id;unsigned int control;/* CS or ICN (high byte) */ unsigned int cmask;/* channel mask bitmap: 0 = master */ +unsigned int ch_readonly; +unsigned int master_readonly;int channels;int val_type;int min, max, res;
Signature · 1 line
1.7.1
PATCH 3/9 include/linux/usb/audio-v2.h: add more UAC2 details
In reply to Daniel MackAlso, remove the 'bmControl' field from uac_clock_selector_descriptor, which was at the wrong offset. This struct is currently unused.
--- include/linux/usb/audio-v2.h | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-)
include/linux/usb/audio-v2.h +20 -1
@@ -41,6 +41,13 @@ struct uac_clock_source_descriptor {__u8 iClockSource; } __attribute__((packed)); +/* bmAttribute fields */ +#define UAC_CLOCK_SOURCE_TYPE_EXT 0x0 +#define UAC_CLOCK_SOURCE_TYPE_INT_FIXED 0x1 +#define UAC_CLOCK_SOURCE_TYPE_INT_VAR 0x2 +#define UAC_CLOCK_SOURCE_TYPE_INT_PROG 0x3 +#define UAC_CLOCK_SOURCE_SYNCED_TO_SOF (1 << 2) +/* 4.7.2.2 Clock Source Descriptor */ struct uac_clock_selector_descriptor {
@@ -49,8 +56,20 @@ struct uac_clock_selector_descriptor {__u8 bDescriptorSubtype;__u8 bClockID;__u8 bNrInPins; -__u8 bmControls;__u8 baCSourceID[]; +/* bmControls, bAssocTerminal and iClockSource omitted */ +} __attribute__((packed)); + +/* 4.7.2.3 Clock Multiplier Descriptor */ + +struct uac_clock_multiplier_descriptor { +__u8 bLength; +__u8 bDescriptorType; +__u8 bDescriptorSubtype; +__u8 bClockID; +__u8 bCSourceID; +__u8 bmControls; +__u8 iClockMultiplier; } __attribute__((packed));/* 4.7.2.4 Input terminal descriptor */
Signature · 1 line
1.7.1
PATCH 4/9 ALSA: usb-audio: fix selector unit string index accessor
In reply to Daniel MackThis is another regression from the UAC2 code refactoring.
--- include/linux/usb/audio.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
include/linux/usb/audio.h +1 -1
@@ -244,7 +244,7 @@ struct uac_selector_unit_descriptor {static inline __u8 uac_selector_unit_iSelector (struct uac_selector_unit_descriptor *desc) {__u8 *raw = (__u8 *) desc; -return raw[9 + desc->bLength -1 ]; +return raw[desc->bLength -1 ]; }/* 4.3.2.5 Feature Unit Descriptor */
Signature · 1 line
1.7.1
PATCH 5/9 ALSA: usb-audio: parse clock topology of UAC2 devices
In reply to Daniel MackAudio devices which comply to the UAC2 standard can export complex clock topologies in its descriptors and set up links between them.
The entities that are defined are
- clock sources, which define the end-leafs.
- clock selectors, which act as switch to select one out of many possible clocks sources.
- clock multipliers, which have an input clock source, and act as clock source again. They can be used to derive one clock from another.
All sample rate changes, clock validity queries and the like must go to clock source elements, while clock selectors and multipliers can be used as terminal clock source.
The following patch adds a parser for these elements and functions to iterate over the tree and find the leaf nodes (clock sources).
The samplerate set functions were moved to the new clock.c file.
--- sound/usb/Makefile | 3 +- sound/usb/card.c | 18 +--- sound/usb/card.h | 1 + sound/usb/clock.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/clock.h | 12 ++ sound/usb/endpoint.c | 57 +++++++++- sound/usb/format.c | 16 ++- sound/usb/pcm.c | 98 +---------------- sound/usb/usbaudio.h | 5 +- 9 files changed, 395 insertions(+), 125 deletions(-) create mode 100644 sound/usb/clock.c create mode 100644 sound/usb/clock.h
sound/usb/Makefile +2 -1
@@ -11,7 +11,8 @@ snd-usb-audio-objs := card.o \ endpoint.o \ urb.o \ pcm.o \ - helper.o + helper.o \ + clock.o snd-usbmidi-lib-objs := midi.o
sound/usb/card.c +2 -16
@@ -236,7 +236,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) }case UAC_VERSION_2 : { -struct uac_clock_source_descriptor *cs;struct usb_interface_assoc_descriptor *assoc =usb_ifnum_to_if (dev, ctrlif)->intf_assoc;
@@ -245,21 +244,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)return -EINVAL ; } -/* FIXME: for now, we expect there is at least one clock source -* descriptor and we always take the first one. -* We should properly support devices with multiple clock sources, -* clock selectors and sample rate conversion units. */ - - cs =snd_usb_find_csint_desc (host_iface->extra, host_iface->extralen, -NULL ,UAC2_CLOCK_SOURCE ); - -if (!cs) { -snd_printk (KERN_ERR "CLOCK_SOURCE descriptor not found\n" ); -return -EINVAL ; - } - - chip->clock_id = cs->bClockID; -for (i =0 ; i < assoc->bInterfaceCount; i++) {int intf = assoc->bFirstInterface + i;
@@ -481,6 +465,8 @@ static void *snd_usb_audio_probe(struct usb_device *dev, goto __error; } + chip->ctrl_intf = alts; +if (err >0 ) {/* create normal USB audio interfaces */ if (snd_usb_create_streams(chip, ifnum) < 0 ||
sound/usb/card.h +1 -0
@@ -25,6 +25,7 @@ struct audioformat {unsigned int rate_min, rate_max;/* min/max rates */ unsigned int nr_rates;/* number of rate table entries */ unsigned int *rate_table;/* rate table */ +unsigned char clock;/* associated clock */ };struct snd_usb_substream ;
sound/usb/clock.c new file +310 -0
310 lines not on this page · raw message
sound/usb/clock.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef __USBAUDIO_CLOCK_H +#define __USBAUDIO_CLOCK_H + +int snd_usb_init_sample_rate (struct snd_usb_audio *chip,int iface, +struct usb_host_interface *alts, +struct audioformat *fmt,int rate); + +int snd_usb_clock_find_source (struct snd_usb_audio *chip, +struct usb_host_interface *host_iface, +int entity_id); + +#endif /* __USBAUDIO_CLOCK_H */
sound/usb/endpoint.c +55 -2
87 lines not on this page · raw message
sound/usb/format.c +10 -6
@@ -29,6 +29,7 @@#include "quirks.h" #include "helper.h" #include "debug.h" +#include "clock.h" /* * parse the audio format type I descriptor
@@ -215,15 +216,17 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,struct usb_device *dev = chip->dev;unsigned char tmp[2 ], *data;int i, nr_rates, data_size, ret =0 ; +int clock =snd_usb_clock_find_source (chip, chip->ctrl_intf, fp->clock);/* get the number of sample rates first by only fetching 2 bytes */ ret =snd_usb_ctl_msg (dev,usb_rcvctrlpipe (dev,0 ),UAC2_CS_RANGE ,USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_IN , -UAC2_CS_CONTROL_SAM_FREQ <<8 , chip->clock_id <<8 , +UAC2_CS_CONTROL_SAM_FREQ <<8 , clock <<8 , tmp,sizeof (tmp),1000 );if (ret <0 ) { -snd_printk (KERN_ERR "unable to retrieve number of sample rates\n" ); +snd_printk (KERN_ERR "%s(): unable to retrieve number of sample rates (clock %d)\n" , + __func__, clock); goto err; }
@@ -237,12 +240,13 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,/* now get the full information */ ret =snd_usb_ctl_msg (dev,usb_rcvctrlpipe (dev,0 ),UAC2_CS_RANGE , -USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_IN , -UAC2_CS_CONTROL_SAM_FREQ <<8 , chip->clock_id <<8 , - data, data_size,1000 ); +USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_IN , +UAC2_CS_CONTROL_SAM_FREQ <<8 , clock <<8 , + data, data_size,1000 );if (ret <0 ) { -snd_printk (KERN_ERR "unable to retrieve sample rate range\n" ); +snd_printk (KERN_ERR "%s(): unable to retrieve sample rate range (clock %d)\n" , + __func__, clock); ret = -EINVAL ; goto err_free; }
sound/usb/pcm.c +1 -97
110 lines not on this page · raw message
sound/usb/usbaudio.h +2 -3
@@ -40,9 +40,6 @@ struct snd_usb_audio {int num_interfaces;int num_suspended_intf; -/* for audio class v2 */ -int clock_id; -struct list_head pcm_list;/* list of pcm streams */ int pcm_devs;
@@ -53,6 +50,8 @@ struct snd_usb_audio {int setup;/* from the 'device_setup' module param */ int nrpacks;/* from the 'nrpacks' module param */ int async_unlink;/* from the 'async_unlink' module param */ + +struct usb_host_interface *ctrl_intf;/* the audio control interface */ };/*
Signature · 1 line
1.7.1
Re: [PATCH 5/9] ALSA: usb-audio: parse clock topology of UAC2 devices
Quoted 15 lines · Daniel Mack
Audio devices which comply to the UAC2 standard can export complex clock topologies in its descriptors and set up links between them.
The entities that are defined are
- clock sources, which define the end-leafs.
- clock selectors, which act as switch to select one out of many possible clocks sources.
- clock multipliers, which have an input clock source, and act as clock source again. They can be used to derive one clock from another.All sample rate changes, clock validity queries and the like must go to clock source elements, while clock selectors and multipliers can be used as terminal clock source.
Quoted 6 lines
The following patch adds a parser for these elements and functions to iterate over the tree and find the leaf nodes (clock sources).
The samplerate set functions were moved to the new
clock.cfile.Signed-off-by Daniel Mack <[email protected]>
Sorry, forgot to squash one hunk into this one.
New version of the patch is below.
Thanks,
Daniel
Quoted 1 line
From
39575e78644a2083682371b578f438d59ae612f5Mon Sep 17 00:00:00 2001
From: Daniel Mack <[email protected]>
Date: Thu, 27 May 2010 17:07:21 +0200
Subject: [PATCH] ALSA: usb-audio: parse clock topology of UAC2 devices
Audio devices which comply to the UAC2 standard can export complex clock topologies in its descriptors and set up links between them.
The entities that are defined are
- clock sources, which define the end-leafs.
- clock selectors, which act as switch to select one out of many possible clocks sources.
- clock multipliers, which have an input clock source, and act as clock source again. They can be used to derive one clock from another.
All sample rate changes, clock validity queries and the like must go to clock source elements, while clock selectors and multipliers can be used as terminal clock source.
The following patch adds a parser for these elements and functions to iterate over the tree and find the leaf nodes (clock sources).
The samplerate set functions were moved to the new clock.c file.
--- sound/usb/Makefile | 3 +- sound/usb/card.c | 18 +--- sound/usb/card.h | 1 + sound/usb/clock.c | 311 ++++++++++++++++++++++++++++++++++++++++++++++++++ sound/usb/clock.h | 12 ++ sound/usb/endpoint.c | 57 +++++++++- sound/usb/format.c | 16 ++- sound/usb/pcm.c | 98 +---------------- sound/usb/usbaudio.h | 5 +- 9 files changed, 396 insertions(+), 125 deletions(-) create mode 100644 sound/usb/clock.c create mode 100644 sound/usb/clock.h
sound/usb/Makefile +2 -1
@@ -11,7 +11,8 @@ snd-usb-audio-objs := card.o \ endpoint.o \ urb.o \ pcm.o \ - helper.o + helper.o \ + clock.o snd-usbmidi-lib-objs := midi.o
sound/usb/card.c +2 -16
@@ -236,7 +236,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) }case UAC_VERSION_2 : { -struct uac_clock_source_descriptor *cs;struct usb_interface_assoc_descriptor *assoc =usb_ifnum_to_if (dev, ctrlif)->intf_assoc;
@@ -245,21 +244,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)return -EINVAL ; } -/* FIXME: for now, we expect there is at least one clock source -* descriptor and we always take the first one. -* We should properly support devices with multiple clock sources, -* clock selectors and sample rate conversion units. */ - - cs =snd_usb_find_csint_desc (host_iface->extra, host_iface->extralen, -NULL ,UAC2_CLOCK_SOURCE ); - -if (!cs) { -snd_printk (KERN_ERR "CLOCK_SOURCE descriptor not found\n" ); -return -EINVAL ; - } - - chip->clock_id = cs->bClockID; -for (i =0 ; i < assoc->bInterfaceCount; i++) {int intf = assoc->bFirstInterface + i;
@@ -481,6 +465,8 @@ static void *snd_usb_audio_probe(struct usb_device *dev, goto __error; } + chip->ctrl_intf = alts; +if (err >0 ) {/* create normal USB audio interfaces */ if (snd_usb_create_streams(chip, ifnum) < 0 ||
sound/usb/card.h +1 -0
@@ -25,6 +25,7 @@ struct audioformat {unsigned int rate_min, rate_max;/* min/max rates */ unsigned int nr_rates;/* number of rate table entries */ unsigned int *rate_table;/* rate table */ +unsigned char clock;/* associated clock */ };struct snd_usb_substream ;
sound/usb/clock.c new file +311 -0
311 lines not on this page · raw message
sound/usb/clock.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef __USBAUDIO_CLOCK_H +#define __USBAUDIO_CLOCK_H + +int snd_usb_init_sample_rate (struct snd_usb_audio *chip,int iface, +struct usb_host_interface *alts, +struct audioformat *fmt,int rate); + +int snd_usb_clock_find_source (struct snd_usb_audio *chip, +struct usb_host_interface *host_iface, +int entity_id); + +#endif /* __USBAUDIO_CLOCK_H */
sound/usb/endpoint.c +55 -2
87 lines not on this page · raw message
sound/usb/format.c +10 -6
@@ -29,6 +29,7 @@#include "quirks.h" #include "helper.h" #include "debug.h" +#include "clock.h" /* * parse the audio format type I descriptor
@@ -215,15 +216,17 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,struct usb_device *dev = chip->dev;unsigned char tmp[2 ], *data;int i, nr_rates, data_size, ret =0 ; +int clock =snd_usb_clock_find_source (chip, chip->ctrl_intf, fp->clock);/* get the number of sample rates first by only fetching 2 bytes */ ret =snd_usb_ctl_msg (dev,usb_rcvctrlpipe (dev,0 ),UAC2_CS_RANGE ,USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_IN , -UAC2_CS_CONTROL_SAM_FREQ <<8 , chip->clock_id <<8 , +UAC2_CS_CONTROL_SAM_FREQ <<8 , clock <<8 , tmp,sizeof (tmp),1000 );if (ret <0 ) { -snd_printk (KERN_ERR "unable to retrieve number of sample rates\n" ); +snd_printk (KERN_ERR "%s(): unable to retrieve number of sample rates (clock %d)\n" , + __func__, clock); goto err; }
@@ -237,12 +240,13 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,/* now get the full information */ ret =snd_usb_ctl_msg (dev,usb_rcvctrlpipe (dev,0 ),UAC2_CS_RANGE , -USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_IN , -UAC2_CS_CONTROL_SAM_FREQ <<8 , chip->clock_id <<8 , - data, data_size,1000 ); +USB_TYPE_CLASS |USB_RECIP_INTERFACE |USB_DIR_IN , +UAC2_CS_CONTROL_SAM_FREQ <<8 , clock <<8 , + data, data_size,1000 );if (ret <0 ) { -snd_printk (KERN_ERR "unable to retrieve sample rate range\n" ); +snd_printk (KERN_ERR "%s(): unable to retrieve sample rate range (clock %d)\n" , + __func__, clock); ret = -EINVAL ; goto err_free; }
sound/usb/pcm.c +1 -97
110 lines not on this page · raw message
sound/usb/usbaudio.h +2 -3
@@ -40,9 +40,6 @@ struct snd_usb_audio {int num_interfaces;int num_suspended_intf; -/* for audio class v2 */ -int clock_id; -struct list_head pcm_list;/* list of pcm streams */ int pcm_devs;
@@ -53,6 +50,8 @@ struct snd_usb_audio {int setup;/* from the 'device_setup' module param */ int nrpacks;/* from the 'nrpacks' module param */ int async_unlink;/* from the 'async_unlink' module param */ + +struct usb_host_interface *ctrl_intf;/* the audio control interface */ };/*
Signature · 1 line
1.7.1
PATCH 6/9 ALSA: usb-audio: unify constants from specification
In reply to Daniel MackMove more definitions from private enums to appropriate header files.
--- include/linux/usb/audio.h | 88 ++++++++++++++++++++++++++++----------- sound/usb/mixer.c | 99 +++++++++++++++------------------------------ sound/usb/mixer_maps.c | 4 +- 3 files changed, 98 insertions(+), 93 deletions(-)
include/linux/usb/audio.h +63 -25
@@ -47,6 +47,15 @@#define UAC_FORMAT_TYPE 0x02#define UAC_FORMAT_SPECIFIC 0x03 +/* A.7 Processing Unit Process Types */ +#define UAC_PROCESS_UNDEFINED 0x00 +#define UAC_PROCESS_UP_DOWNMIX 0x01 +#define UAC_PROCESS_DOLBY_PROLOGIC 0x02 +#define UAC_PROCESS_STEREO_EXTENDER 0x03 +#define UAC_PROCESS_REVERB 0x04 +#define UAC_PROCESS_CHORUS 0x05 +#define UAC_PROCESS_DYN_RANGE_COMP 0x06 +/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */ #define UAC_EP_GENERAL 0x01
@@ -73,6 +82,60 @@#define UAC_GET_STAT 0xff +/* A.10 Control Selector Codes */ + +/* A.10.1 Terminal Control Selectors */ +#define UAC_TERM_COPY_PROTECT 0x01 + +/* A.10.2 Feature Unit Control Selectors */ +#define UAC_FU_MUTE 0x01 +#define UAC_FU_VOLUME 0x02 +#define UAC_FU_BASS 0x03 +#define UAC_FU_MID 0x04 +#define UAC_FU_TREBLE 0x05 +#define UAC_FU_GRAPHIC_EQUALIZER 0x06 +#define UAC_FU_AUTOMATIC_GAIN 0x07 +#define UAC_FU_DELAY 0x08 +#define UAC_FU_BASS_BOOST 0x09 +#define UAC_FU_LOUDNESS 0x0a + +#define UAC_CONTROL_BIT (CS ) (1 << ((CS) - 1)) + +/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */ +#define UAC_UD_ENABLE 0x01 +#define UAC_UD_MODE_SELECT 0x02 + +/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */ +#define UAC_DP_ENABLE 0x01 +#define UAC_DP_MODE_SELECT 0x02 + +/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */ +#define UAC_3D_ENABLE 0x01 +#define UAC_3D_SPACE 0x02 + +/* A.10.3.4 Reverberation Processing Unit Control Selectors */ +#define UAC_REVERB_ENABLE 0x01 +#define UAC_REVERB_LEVEL 0x02 +#define UAC_REVERB_TIME 0x03 +#define UAC_REVERB_FEEDBACK 0x04 + +/* A.10.3.5 Chorus Processing Unit Control Selectors */ +#define UAC_CHORUS_ENABLE 0x01 +#define UAC_CHORUS_LEVEL 0x02 +#define UAC_CHORUS_RATE 0x03 +#define UAC_CHORUS_DEPTH 0x04 + +/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */ +#define UAC_DCR_ENABLE 0x01 +#define UAC_DCR_RATE 0x02 +#define UAC_DCR_MAXAMPL 0x03 +#define UAC_DCR_THRESHOLD 0x04 +#define UAC_DCR_ATTACK_TIME 0x05 +#define UAC_DCR_RELEASE_TIME 0x06 + +/* A.10.4 Extension Unit Control Selectors */ +#define UAC_XU_ENABLE 0x01 +/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */ #define UAC_MS_HEADER 0x01#define UAC_MIDI_IN_JACK 0x02
@@ -463,31 +526,6 @@ struct uac_iso_endpoint_descriptor {#define UAC_EP_CS_ATTR_PITCH_CONTROL 0x02#define UAC_EP_CS_ATTR_FILL_MAX 0x80 -/* A.10.2 Feature Unit Control Selectors */ - -#define UAC_FU_CONTROL_UNDEFINED 0x00 -#define UAC_MUTE_CONTROL 0x01 -#define UAC_VOLUME_CONTROL 0x02 -#define UAC_BASS_CONTROL 0x03 -#define UAC_MID_CONTROL 0x04 -#define UAC_TREBLE_CONTROL 0x05 -#define UAC_GRAPHIC_EQUALIZER_CONTROL 0x06 -#define UAC_AUTOMATIC_GAIN_CONTROL 0x07 -#define UAC_DELAY_CONTROL 0x08 -#define UAC_BASS_BOOST_CONTROL 0x09 -#define UAC_LOUDNESS_CONTROL 0x0a - -#define UAC_FU_MUTE (1 << (UAC_MUTE_CONTROL - 1)) -#define UAC_FU_VOLUME (1 << (UAC_VOLUME_CONTROL - 1)) -#define UAC_FU_BASS (1 << (UAC_BASS_CONTROL - 1)) -#define UAC_FU_MID (1 << (UAC_MID_CONTROL - 1)) -#define UAC_FU_TREBLE (1 << (UAC_TREBLE_CONTROL - 1)) -#define UAC_FU_GRAPHIC_EQ (1 << (UAC_GRAPHIC_EQUALIZER_CONTROL - 1)) -#define UAC_FU_AUTO_GAIN (1 << (UAC_AUTOMATIC_GAIN_CONTROL - 1)) -#define UAC_FU_DELAY (1 << (UAC_DELAY_CONTROL - 1)) -#define UAC_FU_BASS_BOOST (1 << (UAC_BASS_BOOST_CONTROL - 1)) -#define UAC_FU_LOUDNESS (1 << (UAC_LOUDNESS_CONTROL - 1)) -/* status word format (3.7.1.1) */ #define UAC1_STATUS_TYPE_ORIG_MASK 0x0f
sound/usb/mixer.c +33 -66
161 lines not on this page · raw message
sound/usb/mixer_maps.c +2 -2
@@ -85,8 +85,8 @@ static struct usbmix_name_map extigy_map[] = {/* 16: MU (w/o controls) */ { 17, NULL, 1 }, /* DISABLED: PU-switch (any effect?) */ { 17, "Channel Routing", 2 }, /* PU: mode select */ - { 18, "Tone Control - Bass", UAC_BASS_CONTROL }, /* FU */ - { 18, "Tone Control - Treble", UAC_TREBLE_CONTROL }, /* FU */ + { 18, "Tone Control - Bass", UAC_FU_BASS }, /* FU */ + { 18, "Tone Control - Treble", UAC_FU_TREBLE }, /* FU */ { 18, "Master Playback" }, /* FU; others *//* 19: OT speaker */ /* 20: OT headphone */
Signature · 1 line
1.7.1
PATCH 7/9 ALSA: usb-audio: add UAC2 sepecific Feature Unit controls
In reply to Daniel MackThe bits to enable them are always 0 for UAC1 devices, so no additional checks are required.
--- sound/usb/mixer.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
sound/usb/mixer.c +10 -6
@@ -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 }, };
Signature · 1 line
1.7.1
PATCH 8/9 ALSA: usb-audio: clean up find_audio_control_unit()
In reply to Daniel MackUse a struct to parse the audio units, and return usable descriptors for all types. There's no need to limit the result set, except for some kind of sanity check.
--- sound/usb/mixer.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-)
sound/usb/mixer.c +10 -8
@@ -165,22 +165,24 @@ static int check_mapped_selector_name(struct mixer_build *state, int unitid,/* * find an audio control unit with the given unit id -* this doesn't return any clock related units, so they need to be handled elsewhere */ static void *find_audio_control_unit (struct mixer_build *state,unsigned char unit) { -unsigned char *p; +/* we just parse the header */ +struct uac_feature_unit_descriptor *hdr =NULL ; - p =NULL ; -while ((p =snd_usb_find_desc (state->buffer, state->buflen, p, -USB_DT_CS_INTERFACE )) !=NULL ) { -if (p[0 ] >=4 && p[2 ] >=UAC_INPUT_TERMINAL && p[2 ] <=UAC2_EXTENSION_UNIT_V2 && p[3 ] == unit) -return p; +while ((hdr =snd_usb_find_desc (state->buffer, state->buflen, hdr, +USB_DT_CS_INTERFACE )) !=NULL ) { +if (hdr->bLength >=4 && + hdr->bDescriptorSubtype >=UAC_INPUT_TERMINAL && + hdr->bDescriptorSubtype <=UAC2_SAMPLE_RATE_CONVERTER && + hdr->bUnitID == unit) +return hdr; } +return NULL ; } -/* * copy a string with the given id */
Signature · 1 line
1.7.1
PATCH 9/9 ALSA: usb-audio: export UAC2 clock selectors as mixer controls
In reply to Daniel MackThe UAC2 clock selectors are fortunately compatible with UAC1 audio selector units, so we can simply reuse the same approach to get all the linked units.
Requests to this control need a different CS value though.
--- sound/usb/mixer.c | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-)
sound/usb/mixer.c +35 -7
@@ -313,8 +313,8 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v buf, sizeof(buf), 1000);if (ret <0 ) { -snd_printdd (KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n" , - request, validx, cval->mixer->ctrlif | (cval->id <<8 ), cval->val_type); +snd_printk (KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n" , + request, validx, cval->mixer->ctrlif | (cval->id <<8 ), cval->val_type);return ret; }
@@ -610,6 +610,7 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm*/ static int check_input_term (struct mixer_build *state,int id,struct usb_audio_term *term) { +int err;void *p1;memset (term,0 ,sizeof (*term));
@@ -630,6 +631,11 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_ term->channels = d->bNrChannels; term->chconfig =le32_to_cpu (d->bmChannelConfig); term->name = d->iTerminal; + +/* call recursively to get the clock selectors */ + err =check_input_term (state, d->bCSourceID, term); +if (err <0 ) +return err; }return 0 ;case UAC_FEATURE_UNIT : {
@@ -646,7 +652,8 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_ term->name =uac_mixer_unit_iMixer (d);return 0 ; } -case UAC_SELECTOR_UNIT : { +case UAC_SELECTOR_UNIT : +case UAC2_CLOCK_SELECTOR : {struct uac_selector_unit_descriptor *d = p1;/* call recursively to retrieve the channel info */ if (check_input_term (state, d->baSourceID[0 ], term) <0 )
@@ -669,6 +676,13 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_ term->name =uac_processing_unit_iProcessing (d, state->mixer->protocol);return 0 ; } +case UAC2_CLOCK_SOURCE : { +struct uac_clock_source_descriptor *d = p1; + term->type = d->bDescriptorSubtype <<16 ;/* virtual type */ + term->id = id; + term->name = d->iClockSource; +return 0 ; + }default :return -ENODEV ; }
@@ -1610,7 +1624,7 @@ static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_struct usb_mixer_elem_info *cval = kcontrol->private_data;int val, err; - err =get_cur_ctl_value (cval,0 , &val); + err =get_cur_ctl_value (cval, cval->control <<8 , &val);if (err <0 ) {if (cval->mixer->ignore_ctl_error) { ucontrol->value.enumerated.item[0 ] =0 ;
@@ -1629,7 +1643,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_struct usb_mixer_elem_info *cval = kcontrol->private_data;int val, oval, err; - err =get_cur_ctl_value (cval,0 , &oval); + err =get_cur_ctl_value (cval, cval->control <<8 , &oval);if (err <0 ) {if (cval->mixer->ignore_ctl_error)return 0 ;
@@ -1638,7 +1652,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ val = ucontrol->value.enumerated.item[0 ]; val =get_abs_value (cval, val);if (val != oval) { -set_cur_ctl_value (cval,0 , val); +set_cur_ctl_value (cval, cval->control <<8 , val);return 1 ; }return 0 ;
@@ -1720,6 +1734,11 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, void cval->res =1 ; cval->initialized =1 ; +if (desc->bDescriptorSubtype ==UAC2_CLOCK_SELECTOR ) + cval->control =UAC2_CX_CLOCK_SELECTOR ; +else + cval->control =0 ; + namelist =kmalloc (sizeof (char *) * desc->bNrInPins,GFP_KERNEL );if (! namelist) {snd_printk (KERN_ERR "cannot malloc\n" );
@@ -1769,7 +1788,9 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, voidif (! len)strlcpy (kctl->id.name,"USB" ,sizeof (kctl->id.name)); -if ((state->oterm.type &0xff00 ) ==0x0100 ) +if (desc->bDescriptorSubtype ==UAC2_CLOCK_SELECTOR ) +append_ctl_name (kctl," Clock Source" ); +else if ((state->oterm.type &0xff00 ) ==0x0100 )append_ctl_name (kctl," Capture Source" );else append_ctl_name (kctl," Playback Source" );
@@ -1803,10 +1824,12 @@ static int parse_audio_unit(struct mixer_build *state, int unitid)switch (p1[2 ]) {case UAC_INPUT_TERMINAL : +case UAC2_CLOCK_SOURCE :return 0 ;/* NOP */ case UAC_MIXER_UNIT :return parse_audio_mixer_unit (state, unitid, p1);case UAC_SELECTOR_UNIT : +case UAC2_CLOCK_SELECTOR :return parse_audio_selector_unit (state, unitid, p1);case UAC_FEATURE_UNIT :return parse_audio_feature_unit (state, unitid, p1);
@@ -1903,6 +1926,11 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer) err =parse_audio_unit (&state, desc->bSourceID);if (err <0 )return err; + +/* for UAC2, use the same approach to also add the clock selectors */ + err =parse_audio_unit (&state, desc->bCSourceID); +if (err <0 ) +return err; } }
Signature · 1 line
1.7.1
At Mon, 31 May 2010 13:35:36 +0200,
Quoted 5 lines · Daniel Mack
Introduce two new static inline functions for a more readable parsing of UAC2 bmaControls.
Signed-off-by Daniel Mack <[email protected]>
Thanks! Now I applied all patches for 2.6.35-rc2.
But, basically I don't want to touch too much after this. So, please avoid refactoring patches for 2.6.35. If any, prepare a separate one for 2.6.36, and let's concentrate on fixes during 2.6.35-rc.
Takashi
Quoted 57 lines
--- include/linux/usb/audio-v2.h | 10 ++++++++++ sound/usb/mixer.c | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-)include/linux/usb/audio-v2.h +10
-0@@ -18,6 +18,16 @@/* v1.0 and v2.0 of this standard have many things in common. For the rest * of the definitions, please refer to audio.h */ +static inline bool uac2_control_is_readable (u32 bmControls,u8 control) +{ +return (bmControls >> (control *2 )) &0x1 ; +} + +static inline bool uac2_control_is_writeable (u32 bmControls,u8 control) +{ +return (bmControls >> (control *2 )) &0x2 ; +} +/* 4.7.2.1 Clock Source Descriptor */ struct uac_clock_source_descriptor {sound/usb/mixer.c +4
-4@@ -1188,9 +1188,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, voidfor (j =0 ; j < channels; j++) {unsigned int mask =snd_usb_combine_bytes (bmaControls + csize * (j+1 ), csize); -if (mask & (1 << (i *2 ))) { +if (uac2_control_is_readable (mask, i)) { ch_bits |= (1 << j); -if (~mask & (1 << ((i *2 ) +1 ))) +if (!uac2_control_is_writeable (mask, i)) ch_read_only |= (1 << j); } }@@ -1198,9 +1198,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void/* FIXME: the whole unit is read-only if any of the channels is marked read-only */ if (ch_bits &1 )/* the first channel must be set (for ease of programming) */ build_feature_ctl (state, _ftr, ch_bits, i, &iterm, unitid, !!ch_read_only); -if (master_bits & (1 << i *2 )) +if (uac2_control_is_readable (master_bits, i))build_feature_ctl (state, _ftr,0 , i, &iterm, unitid, - ~master_bits & (1 << ((i *2 ) +1 ))); + !uac2_control_is_writeable (master_bits, i)); } }Signature · 1 line
1.7.1
Quoted 6 lines · Takashi Iwai
At Mon, 31 May 2010 13:35:36 +0200,
Quoted 4 lines · Daniel Mack
Introduce two new static inline functions for a more readable parsing of UAC2 bmaControls.
Quoted 8 lines
Quoted 1 line
Signed-off-by Daniel Mack <[email protected]>Thanks! Now I applied all patches for 2.6.35-rc2.
But, basically I don't want to touch too much after this. So, please avoid refactoring patches for 2.6.35. If any, prepare a separate one for 2.6.36, and let's concentrate on fixes during 2.6.35-rc.
Yes, I'm aware of this, and I'm not planning to move this code around much in the next weeks, except for bug fixing.
In general, UAC2 devices are now almost fully supported. There are some special controllers missing like graphical equalizers, but that can be done when devices appear which really implement such things.
Happy testing :)
Thanks,
Daniel
At Mon, 31 May 2010 18:47:16 +0200,
Quoted 12 lines · Daniel Mack
Quoted 10 lines · Takashi Iwai
At Mon, 31 May 2010 13:35:36 +0200,
Quoted 5 lines · Daniel Mack
Introduce two new static inline functions for a more readable parsing of UAC2 bmaControls.
Signed-off-by Daniel Mack <[email protected]>Thanks! Now I applied all patches for 2.6.35-rc2.
Quoted 7 lines
Quoted 4 lines
But, basically I don't want to touch too much after this. So, please avoid refactoring patches for 2.6.35. If any, prepare a separate one for 2.6.36, and let's concentrate on fixes during 2.6.35-rc.
Yes, I'm aware of this, and I'm not planning to move this code around much in the next weeks, except for bug fixing.
That's helpful.
Quoted 5 lines
In general, UAC2 devices are now almost fully supported. There are some special controllers missing like graphical equalizers, but that can be done when devices appear which really implement such things.
Happy testing :)
Great, thanks for the info update.
Takashi