ALSA: usb-mixer: factor out quirks

Move all non-standard mixer controls and vendor-specific extensions to a
separate file. Some structs need to be exported now.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 43 insertions, 2 deletions

diff --git a/sound/usb/usbmixer.h b/sound/usb/usbmixer.h
index e199e4bb02f2..63101ae201cc 100644
--- a/sound/usb/usbmixer.h
+++ b/sound/usb/usbmixer.h
@@ -1,11 +1,52 @@
 #ifndef __USBMIXER_H
 #define __USBMIXER_H
 
+struct usb_mixer_interface {
+        struct snd_usb_audio *chip;
+        unsigned int ctrlif;
+        struct list_head list;
+        unsigned int ignore_ctl_error;
+        struct urb *urb;
+        /* array[MAX_ID_ELEMS], indexed by unit id */
+        struct usb_mixer_elem_info **id_elems;
+
+        /* Sound Blaster remote control stuff */
+        const struct rc_config *rc_cfg;
+        u32 rc_code;
+        wait_queue_head_t rc_waitq;
+        struct urb *rc_urb;
+        struct usb_ctrlrequest *rc_setup_packet;
+        u8 rc_buffer[6];
+
+        u8 audigy2nx_leds[3];
+        u8 xonar_u1_status;
+};
+
+#define MAX_CHANNELS    10      /* max logical channels */
+
+struct usb_mixer_elem_info {
+        struct usb_mixer_interface *mixer;
+        struct usb_mixer_elem_info *next_id_elem; /* list of controls with same id */
+        struct snd_ctl_elem_id *elem_id;
+        unsigned int id;
+        unsigned int control;   /* CS or ICN (high byte) */
+        unsigned int cmask; /* channel mask bitmap: 0 = master */
+        int channels;
+        int val_type;
+        int min, max, res;
+        int dBmin, dBmax;
+        int cached;
+        int cache_val[MAX_CHANNELS];
+        u8 initialized;
+};
+
 int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
                          int ignore_error);
 void snd_usb_mixer_disconnect(struct list_head *p);
 
-void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
-                        unsigned char samplerate_id);
+void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid);
+
+int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
+                                int request, int validx, int value_set);
 
 #endif /* __USBMIXER_H */