aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/mixer.h')
-rw-r--r--sound/usb/mixer.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index 26c636c5c93a..ae1a14dcfe82 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -24,7 +24,16 @@ struct usb_mixer_interface {
24 u8 xonar_u1_status; 24 u8 xonar_u1_status;
25}; 25};
26 26
27#define MAX_CHANNELS 10 /* max logical channels */ 27#define MAX_CHANNELS 16 /* max logical channels */
28
29enum {
30 USB_MIXER_BOOLEAN,
31 USB_MIXER_INV_BOOLEAN,
32 USB_MIXER_S8,
33 USB_MIXER_U8,
34 USB_MIXER_S16,
35 USB_MIXER_U16,
36};
28 37
29struct usb_mixer_elem_info { 38struct usb_mixer_elem_info {
30 struct usb_mixer_interface *mixer; 39 struct usb_mixer_interface *mixer;
@@ -52,5 +61,10 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid);
52 61
53int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, 62int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
54 int request, int validx, int value_set); 63 int request, int validx, int value_set);
64void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer);
65int snd_usb_mixer_activate(struct usb_mixer_interface *mixer);
66
67int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer,
68 struct snd_kcontrol *kctl);
55 69
56#endif /* __USBMIXER_H */ 70#endif /* __USBMIXER_H */