aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/control.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/sound/control.h')
-rw-r--r--include/sound/control.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/include/sound/control.h b/include/sound/control.h
index a93a58d0e68..e3905c5a095 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -30,6 +30,11 @@ struct snd_kcontrol;
30typedef int (snd_kcontrol_info_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_info * uinfo); 30typedef int (snd_kcontrol_info_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_info * uinfo);
31typedef int (snd_kcontrol_get_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol); 31typedef int (snd_kcontrol_get_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
32typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol); 32typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
33typedef int (snd_kcontrol_tlv_rw_t)(struct snd_kcontrol *kcontrol,
34 int op_flag, /* 0=read,1=write,-1=command */
35 unsigned int size,
36 unsigned int __user *tlv);
37
33 38
34struct snd_kcontrol_new { 39struct snd_kcontrol_new {
35 snd_ctl_elem_iface_t iface; /* interface identifier */ 40 snd_ctl_elem_iface_t iface; /* interface identifier */
@@ -42,7 +47,10 @@ struct snd_kcontrol_new {
42 snd_kcontrol_info_t *info; 47 snd_kcontrol_info_t *info;
43 snd_kcontrol_get_t *get; 48 snd_kcontrol_get_t *get;
44 snd_kcontrol_put_t *put; 49 snd_kcontrol_put_t *put;
45 unsigned int *tlv; 50 union {
51 snd_kcontrol_tlv_rw_t *c;
52 unsigned int *p;
53 } tlv;
46 unsigned long private_value; 54 unsigned long private_value;
47}; 55};
48 56
@@ -59,7 +67,11 @@ struct snd_kcontrol {
59 snd_kcontrol_info_t *info; 67 snd_kcontrol_info_t *info;
60 snd_kcontrol_get_t *get; 68 snd_kcontrol_get_t *get;
61 snd_kcontrol_put_t *put; 69 snd_kcontrol_put_t *put;
62 unsigned int *tlv; 70 snd_kcontrol_tlv_rw_t *tlv_rw;
71 union {
72 snd_kcontrol_tlv_rw_t *c;
73 unsigned int *p;
74 } tlv;
63 unsigned long private_value; 75 unsigned long private_value;
64 void *private_data; 76 void *private_data;
65 void (*private_free)(struct snd_kcontrol *kcontrol); 77 void (*private_free)(struct snd_kcontrol *kcontrol);