kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: usb-audio: UAC2: clean up parsing of bmaControls

Browse source 
Introduce two new static inline functions for a more readable parsing
of UAC2 bmaControls.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Daniel Mack 2010-05-31 13:35:36 +02:00 committed by Takashi Iwai
parent 67a3e12b05
commit dcbe7bcfa3
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/linux/usb/audio-v2.h
View file

@ -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 {

8
sound/usb/mixer.c
View file

@ -1188,9 +1188,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
for (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));
}
}