diff options
author | Jaroslav Kysela <perex@suse.cz> | 2006-07-05 11:34:51 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-09-23 04:37:26 -0400 |
commit | 8aa9b586e42099817163aba01d925c2660c4dbbe (patch) | |
tree | b70172eafcb672074fda1858c7a9c5779a1132f8 /include/sound/control.h | |
parent | 6bbe13ecbbce4415a5a7959b3bc35b18313025e0 (diff) |
[ALSA] Control API - more robust TLV implementation
- added callback option
- added READ/WRITE/COMMAND flags to access member
- added WRITE/COMMAND ioctls
- added SNDRV_CTL_EVENT_MASK_TLV for TLV change notifications
- added TLV support to ELEM_ADD ioctl
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'include/sound/control.h')
-rw-r--r-- | include/sound/control.h | 16 |
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; | |||
30 | typedef int (snd_kcontrol_info_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_info * uinfo); | 30 | typedef int (snd_kcontrol_info_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_info * uinfo); |
31 | typedef int (snd_kcontrol_get_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol); | 31 | typedef int (snd_kcontrol_get_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol); |
32 | typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol); | 32 | typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol); |
33 | typedef 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 | ||
34 | struct snd_kcontrol_new { | 39 | struct 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); |