aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-10-07 16:38:59 -0400
committerTakashi Iwai <tiwai@suse.de>2011-10-09 03:09:11 -0400
commit8d448162bda5ae3b5ecb26fe50c8fbbeae99faa4 (patch)
tree5a325ffbc56a6260d933c1997b5f36ba1f3ab165 /include/sound
parentf92766bc8948f978a838a5607bea95804c8dfdfe (diff)
ALSA: control: add support for ENUMERATED user space controls
Handling of user control elements was implemented for all types except ENUMERATED. This type will be needed for the device-specific mixers of upcoming FireWire drivers. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/asound.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 5d6074faa279..a2e4ff5ba9e9 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -706,7 +706,7 @@ struct snd_timer_tread {
706 * * 706 * *
707 ****************************************************************************/ 707 ****************************************************************************/
708 708
709#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 6) 709#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 7)
710 710
711struct snd_ctl_card_info { 711struct snd_ctl_card_info {
712 int card; /* card number */ 712 int card; /* card number */
@@ -803,6 +803,8 @@ struct snd_ctl_elem_info {
803 unsigned int items; /* R: number of items */ 803 unsigned int items; /* R: number of items */
804 unsigned int item; /* W: item number */ 804 unsigned int item; /* W: item number */
805 char name[64]; /* R: value name */ 805 char name[64]; /* R: value name */
806 __u64 names_ptr; /* W: names list (ELEM_ADD only) */
807 unsigned int names_length;
806 } enumerated; 808 } enumerated;
807 unsigned char reserved[128]; 809 unsigned char reserved[128];
808 } value; 810 } value;