diff options
| author |   Clemens Ladisch <clemens@ladisch.de> | 2011-10-07 22:38:59 +0200 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2011-10-09 09:09:11 +0200 |
| commit | 8d448162bda5ae3b5ecb26fe50c8fbbeae99faa4 (patch) | |
| tree | 5a325ffbc56a6260d933c1997b5f36ba1f3ab165 /include/sound | |
| parent | ALSA: oss-mixer - use strlcpy() instead strcpy() (diff) | |
| download | linux-dev-8d448162bda5ae3b5ecb26fe50c8fbbeae99faa4.tar.xz linux-dev-8d448162bda5ae3b5ecb26fe50c8fbbeae99faa4.zip | |
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.h | 4 |
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 { * * ****************************************************************************/ -#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 6) +#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 7) struct snd_ctl_card_info { int card; /* card number */ @@ -803,6 +803,8 @@ struct snd_ctl_elem_info { unsigned int items; /* R: number of items */ unsigned int item; /* W: item number */ char name[64]; /* R: value name */ + __u64 names_ptr; /* W: names list (ELEM_ADD only) */ + unsigned int names_length; } enumerated; unsigned char reserved[128]; } value; |