summaryrefslogtreecommitdiffstats
path: root/sound/usb/mixer.h
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2011-05-25 09:09:01 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-25 09:36:20 +0200
commit9e38658f703732cb69936553cef4bdb4e5294f3f (patch)
tree8db752c56b8c5677c5ea215bf6b249f17844e4e6 /sound/usb/mixer.h
parentALSA: usb-audio: rework add_control_to_empty() (diff)
downloadlinux-9e38658f703732cb69936553cef4bdb4e5294f3f.tar.xz
linux-9e38658f703732cb69936553cef4bdb4e5294f3f.zip
ALSA: usb-audio: export snd_usb_feature_unit_ctl
In order to allow quirks functions to hook up to the standard feature unit op tables, this patch exports a pointer to the struct that is used internally. That way, all the code handling the control can be kept private, and external code can reference the symbol to re-use it. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer.h')
-rw-r--r--sound/usb/mixer.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index 459551ac53ae..ae1a14dcfe82 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -24,7 +24,16 @@ struct usb_mixer_interface {
u8 xonar_u1_status;
};
-#define MAX_CHANNELS 10 /* max logical channels */
+#define MAX_CHANNELS 16 /* max logical channels */
+
+enum {
+ USB_MIXER_BOOLEAN,
+ USB_MIXER_INV_BOOLEAN,
+ USB_MIXER_S8,
+ USB_MIXER_U8,
+ USB_MIXER_S16,
+ USB_MIXER_U16,
+};
struct usb_mixer_elem_info {
struct usb_mixer_interface *mixer;