aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-01-08 11:57:26 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:46 -0500
commit8ace4f3c9d83fd60e7539526a3a70bf5730db8c0 (patch)
treebb1c13dd88e0f263fbecbf5bb7fcdc270237a88d /include
parent38f8b397e15033b716f0b550f0ec780ad3d890e6 (diff)
[ALSA] Remove indirect control access
This patch removes the indirect control access to the control elements. The indirect access has never been used and is even broken on 32bit ioctl wrapper. Let's clean it up. The pointers still remain in snd_ctl_elem_* structs just to make sure that the struct size won't change. Once after checking the size consistency, we can get rid of them, too. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'include')
-rw-r--r--include/sound/asound.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h
index eda5c63ea547..ee753d782e2d 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -696,7 +696,7 @@ struct snd_timer_tread {
696 * * 696 * *
697 ****************************************************************************/ 697 ****************************************************************************/
698 698
699#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 4) 699#define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 5)
700 700
701struct snd_ctl_card_info { 701struct snd_ctl_card_info {
702 int card; /* card number */ 702 int card; /* card number */
@@ -745,8 +745,7 @@ typedef int __bitwise snd_ctl_elem_iface_t;
745#define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */ 745#define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */
746#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */ 746#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */
747#define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */ 747#define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */
748#define SNDRV_CTL_ELEM_ACCESS_DINDIRECT (1<<30) /* indirect access for matrix dimensions in the info structure */ 748/* bits 30 and 31 are obsoleted (for indirect access) */
749#define SNDRV_CTL_ELEM_ACCESS_INDIRECT (1<<31) /* indirect access for element value in the value structure */
750 749
751/* for further details see the ACPI and PCI power management specification */ 750/* for further details see the ACPI and PCI power management specification */
752#define SNDRV_CTL_POWER_D0 0x0000 /* full On */ 751#define SNDRV_CTL_POWER_D0 0x0000 /* full On */
@@ -800,30 +799,30 @@ struct snd_ctl_elem_info {
800 } value; 799 } value;
801 union { 800 union {
802 unsigned short d[4]; /* dimensions */ 801 unsigned short d[4]; /* dimensions */
803 unsigned short *d_ptr; /* indirect */ 802 unsigned short *d_ptr; /* indirect - obsoleted */
804 } dimen; 803 } dimen;
805 unsigned char reserved[64-4*sizeof(unsigned short)]; 804 unsigned char reserved[64-4*sizeof(unsigned short)];
806}; 805};
807 806
808struct snd_ctl_elem_value { 807struct snd_ctl_elem_value {
809 struct snd_ctl_elem_id id; /* W: element ID */ 808 struct snd_ctl_elem_id id; /* W: element ID */
810 unsigned int indirect: 1; /* W: use indirect pointer (xxx_ptr member) */ 809 unsigned int indirect: 1; /* W: indirect access - obsoleted */
811 union { 810 union {
812 union { 811 union {
813 long value[128]; 812 long value[128];
814 long *value_ptr; 813 long *value_ptr; /* obsoleted */
815 } integer; 814 } integer;
816 union { 815 union {
817 long long value[64]; 816 long long value[64];
818 long long *value_ptr; 817 long long *value_ptr; /* obsoleted */
819 } integer64; 818 } integer64;
820 union { 819 union {
821 unsigned int item[128]; 820 unsigned int item[128];
822 unsigned int *item_ptr; 821 unsigned int *item_ptr; /* obsoleted */
823 } enumerated; 822 } enumerated;
824 union { 823 union {
825 unsigned char data[512]; 824 unsigned char data[512];
826 unsigned char *data_ptr; 825 unsigned char *data_ptr; /* obsoleted */
827 } bytes; 826 } bytes;
828 struct snd_aes_iec958 iec958; 827 struct snd_aes_iec958 iec958;
829 } value; /* RO */ 828 } value; /* RO */