fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / sound / usb / usbmixer.c
index a17d3f8..7b3bf35 100644 (file)
@@ -5,7 +5,7 @@
  *
  *   Copyright (c) 2002 by Takashi Iwai <tiwai@suse.de>
  *
- *   Many codes borrowed from audio.c by 
+ *   Many codes borrowed from audio.c by
  *         Alan Cox (alan@lxorguk.ukuu.org.uk)
  *         Thomas Sailer (sailer@ife.ee.ethz.ch)
  *
 #include <linux/usb.h>
 #include <sound/core.h>
 #include <sound/control.h>
+#include <sound/hwdep.h>
+#include <sound/info.h>
+#include <sound/tlv.h>
 
 #include "usbaudio.h"
 
-
 /*
  */
 
 /* ignore error from controls - for debugging */
 /* #define IGNORE_CTL_ERROR */
 
-typedef struct usb_mixer_build mixer_build_t;
-typedef struct usb_audio_term usb_audio_term_t;
-typedef struct usb_mixer_elem_info usb_mixer_elem_info_t;
+/*
+ * Sound Blaster remote control configuration
+ *
+ * format of remote control data:
+ * Extigy:       xx 00
+ * Audigy 2 NX:  06 80 xx 00 00 00
+ * Live! 24-bit: 06 80 xx yy 22 83
+ */
+static const struct rc_config {
+       u32 usb_id;
+       u8  offset;
+       u8  length;
+       u8  packet_length;
+       u8  mute_mixer_id;
+       u32 mute_code;
+} rc_configs[] = {
+       { USB_ID(0x041e, 0x3000), 0, 1, 2,  18, 0x0013 }, /* Extigy       */
+       { USB_ID(0x041e, 0x3020), 2, 1, 6,  18, 0x0013 }, /* Audigy 2 NX  */
+       { USB_ID(0x041e, 0x3040), 2, 2, 6,  2,  0x6e91 }, /* Live! 24-bit */
+};
+
+struct usb_mixer_interface {
+       struct snd_usb_audio *chip;
+       unsigned int ctrlif;
+       struct list_head list;
+       unsigned int ignore_ctl_error;
+       struct urb *urb;
+       struct usb_mixer_elem_info **id_elems; /* array[256], indexed by unit id */
+
+       /* Sound Blaster remote control stuff */
+       const struct rc_config *rc_cfg;
+       unsigned long rc_hwdep_open;
+       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];
+};
 
 
 struct usb_audio_term {
@@ -60,28 +99,28 @@ struct usb_audio_term {
 
 struct usbmix_name_map;
 
-struct usb_mixer_build {
-       snd_usb_audio_t *chip;
+struct mixer_build {
+       struct snd_usb_audio *chip;
+       struct usb_mixer_interface *mixer;
        unsigned char *buffer;
        unsigned int buflen;
-       unsigned int ctrlif;
-       unsigned short vendor;
-       unsigned short product;
-       DECLARE_BITMAP(unitbitmap, 32*32);
-       usb_audio_term_t oterm;
+       DECLARE_BITMAP(unitbitmap, 256);
+       struct usb_audio_term oterm;
        const struct usbmix_name_map *map;
+       const struct usbmix_selector_map *selector_map;
 };
 
 struct usb_mixer_elem_info {
-       snd_usb_audio_t *chip;
-       unsigned int ctrlif;
+       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 */ 
+       unsigned int cmask; /* channel mask bitmap: 0 = master */
        int channels;
        int val_type;
        int min, max, res;
-       unsigned int initialized: 1;
+       u8 initialized;
 };
 
 
@@ -153,7 +192,7 @@ enum {
 #include "usbmixer_maps.c"
 
 /* get the mapped name if the unit matches */
-static int check_mapped_name(mixer_build_t *state, int unitid, int control, char *buf, int buflen)
+static int check_mapped_name(struct mixer_build *state, int unitid, int control, char *buf, int buflen)
 {
        const struct usbmix_name_map *p;
 
@@ -171,7 +210,7 @@ static int check_mapped_name(mixer_build_t *state, int unitid, int control, char
 }
 
 /* check whether the control should be ignored */
-static int check_ignored_ctl(mixer_build_t *state, int unitid, int control)
+static int check_ignored_ctl(struct mixer_build *state, int unitid, int control)
 {
        const struct usbmix_name_map *p;
 
@@ -187,10 +226,25 @@ static int check_ignored_ctl(mixer_build_t *state, int unitid, int control)
        return 0;
 }
 
+/* get the mapped selector source name */
+static int check_mapped_selector_name(struct mixer_build *state, int unitid,
+                                     int index, char *buf, int buflen)
+{
+       const struct usbmix_selector_map *p;
+
+       if (! state->selector_map)
+               return 0;
+       for (p = state->selector_map; p->id; p++) {
+               if (p->id == unitid && index < p->count)
+                       return strlcpy(buf, p->names[index], buflen);
+       }
+       return 0;
+}
+
 /*
  * find an audio control unit with the given unit id
  */
-static void *find_audio_control_unit(mixer_build_t *state, unsigned char unit)
+static void *find_audio_control_unit(struct mixer_build *state, unsigned char unit)
 {
        unsigned char *p;
 
@@ -207,7 +261,7 @@ static void *find_audio_control_unit(mixer_build_t *state, unsigned char unit)
 /*
  * copy a string with the given id
  */
-static int snd_usb_copy_string_desc(mixer_build_t *state, int index, char *buf, int maxlen)
+static int snd_usb_copy_string_desc(struct mixer_build *state, int index, char *buf, int maxlen)
 {
        int len = usb_string(state->chip->dev, index, buf, maxlen - 1);
        buf[len] = 0;
@@ -217,7 +271,7 @@ static int snd_usb_copy_string_desc(mixer_build_t *state, int index, char *buf,
 /*
  * convert from the byte/word on usb descriptor to the zero-based integer
  */
-static int convert_signed_value(usb_mixer_elem_info_t *cval, int val)
+static int convert_signed_value(struct usb_mixer_elem_info *cval, int val)
 {
        switch (cval->val_type) {
        case USB_MIXER_BOOLEAN:
@@ -247,7 +301,7 @@ static int convert_signed_value(usb_mixer_elem_info_t *cval, int val)
 /*
  * convert from the zero-based int to the byte/word for usb descriptor
  */
-static int convert_bytes_value(usb_mixer_elem_info_t *cval, int val)
+static int convert_bytes_value(struct usb_mixer_elem_info *cval, int val)
 {
        switch (cval->val_type) {
        case USB_MIXER_BOOLEAN:
@@ -264,19 +318,19 @@ static int convert_bytes_value(usb_mixer_elem_info_t *cval, int val)
        return 0; /* not reached */
 }
 
-static int get_relative_value(usb_mixer_elem_info_t *cval, int val)
+static int get_relative_value(struct usb_mixer_elem_info *cval, int val)
 {
        if (! cval->res)
                cval->res = 1;
        if (val < cval->min)
                return 0;
-       else if (val > cval->max)
-               return (cval->max - cval->min) / cval->res;
+       else if (val >= cval->max)
+               return (cval->max - cval->min + cval->res - 1) / cval->res;
        else
                return (val - cval->min) / cval->res;
 }
 
-static int get_abs_value(usb_mixer_elem_info_t *cval, int val)
+static int get_abs_value(struct usb_mixer_elem_info *cval, int val)
 {
        if (val < 0)
                return cval->min;
@@ -294,33 +348,35 @@ static int get_abs_value(usb_mixer_elem_info_t *cval, int val)
  * retrieve a mixer value
  */
 
-static int get_ctl_value(usb_mixer_elem_info_t *cval, int request, int validx, int *value_ret)
+static int get_ctl_value(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret)
 {
        unsigned char buf[2];
        int val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1;
        int timeout = 10;
+
        while (timeout-- > 0) {
-               if (snd_usb_ctl_msg(cval->chip->dev, usb_rcvctrlpipe(cval->chip->dev, 0),
+               if (snd_usb_ctl_msg(cval->mixer->chip->dev,
+                                   usb_rcvctrlpipe(cval->mixer->chip->dev, 0),
                                    request,
                                    USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
-                                   validx, cval->ctrlif | (cval->id << 8),
-                                   buf, val_len, HZ / 10) >= 0) {
+                                   validx, cval->mixer->ctrlif | (cval->id << 8),
+                                   buf, val_len, 100) >= 0) {
                        *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len));
                        return 0;
                }
        }
-       snd_printdd(KERN_ERR "cannot get ctl value: req = 0x%x, wValue = 0x%x, wIndex = 0x%x, type = %d\n", request, validx, cval->ctrlif | (cval->id << 8), cval->val_type);
+       snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
+                   request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type);
        return -EINVAL;
 }
 
-static int get_cur_ctl_value(usb_mixer_elem_info_t *cval, int validx, int *value)
+static int get_cur_ctl_value(struct usb_mixer_elem_info *cval, int validx, int *value)
 {
        return get_ctl_value(cval, GET_CUR, validx, value);
 }
 
 /* channel = 0: master, 1 = first channel */
-inline static int get_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int *value)
+static inline int get_cur_mix_value(struct usb_mixer_elem_info *cval, int channel, int *value)
 {
        return get_ctl_value(cval, GET_CUR, (cval->control << 8) | channel, value);
 }
@@ -329,42 +385,64 @@ inline static int get_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, in
  * set a mixer value
  */
 
-static int set_ctl_value(usb_mixer_elem_info_t *cval, int request, int validx, int value_set)
+static int set_ctl_value(struct usb_mixer_elem_info *cval, int request, int validx, int value_set)
 {
        unsigned char buf[2];
        int val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1;
        int timeout = 10;
+
        value_set = convert_bytes_value(cval, value_set);
        buf[0] = value_set & 0xff;
        buf[1] = (value_set >> 8) & 0xff;
        while (timeout -- > 0)
-               if (snd_usb_ctl_msg(cval->chip->dev, usb_sndctrlpipe(cval->chip->dev, 0),
+               if (snd_usb_ctl_msg(cval->mixer->chip->dev,
+                                   usb_sndctrlpipe(cval->mixer->chip->dev, 0),
                                    request,
                                    USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
-                                   validx, cval->ctrlif | (cval->id << 8),
-                                   buf, val_len, HZ / 10) >= 0)
+                                   validx, cval->mixer->ctrlif | (cval->id << 8),
+                                   buf, val_len, 100) >= 0)
                        return 0;
-       snd_printdd(KERN_ERR "cannot set ctl value: req = 0x%x, wValue = 0x%x, wIndex = 0x%x, type = %d, data = 0x%x/0x%x\n", request, validx, cval->ctrlif | (cval->id << 8), cval->val_type, buf[0], buf[1]);
+       snd_printdd(KERN_ERR "cannot set ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, data = %#x/%#x\n",
+                   request, validx, cval->mixer->ctrlif | (cval->id << 8), cval->val_type, buf[0], buf[1]);
        return -EINVAL;
 }
 
-static int set_cur_ctl_value(usb_mixer_elem_info_t *cval, int validx, int value)
+static int set_cur_ctl_value(struct usb_mixer_elem_info *cval, int validx, int value)
 {
        return set_ctl_value(cval, SET_CUR, validx, value);
 }
 
-inline static int set_cur_mix_value(usb_mixer_elem_info_t *cval, int channel, int value)
+static inline int set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel, int value)
 {
        return set_ctl_value(cval, SET_CUR, (cval->control << 8) | channel, value);
 }
 
+/*
+ * TLV callback for mixer volume controls
+ */
+static int mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
+                        unsigned int size, unsigned int __user *_tlv)
+{
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
+       DECLARE_TLV_DB_SCALE(scale, 0, 0, 0);
+
+       if (size < sizeof(scale))
+               return -ENOMEM;
+       /* USB descriptions contain the dB scale in 1/256 dB unit
+        * while ALSA TLV contains in 1/100 dB unit
+        */
+       scale[2] = (convert_signed_value(cval, cval->min) * 100) / 256;
+       scale[3] = (convert_signed_value(cval, cval->res) * 100) / 256;
+       if (copy_to_user(_tlv, scale, sizeof(scale)))
+               return -EFAULT;
+       return 0;
+}
 
 /*
- * parser routines begin here... 
+ * parser routines begin here...
  */
 
-static int parse_audio_unit(mixer_build_t *state, int unitid);
+static int parse_audio_unit(struct mixer_build *state, int unitid);
 
 
 /*
@@ -374,7 +452,7 @@ static int parse_audio_unit(mixer_build_t *state, int unitid);
 static int check_matrix_bitmap(unsigned char *bmap, int ich, int och, int num_outs)
 {
        int idx = ich * num_outs + och;
-       return bmap[-(idx >> 3)] & (0x80 >> (idx & 7));
+       return bmap[idx >> 3] & (0x80 >> (idx & 7));
 }
 
 
@@ -385,16 +463,21 @@ static int check_matrix_bitmap(unsigned char *bmap, int ich, int och, int num_ou
  * if failed, give up and free the control instance.
  */
 
-static int add_control_to_empty(snd_card_t *card, snd_kcontrol_t *kctl)
+static int add_control_to_empty(struct mixer_build *state, struct snd_kcontrol *kctl)
 {
+       struct usb_mixer_elem_info *cval = kctl->private_data;
        int err;
-       while (snd_ctl_find_id(card, &kctl->id))
+
+       while (snd_ctl_find_id(state->chip->card, &kctl->id))
                kctl->id.index++;
-       if ((err = snd_ctl_add(card, kctl)) < 0) {
+       if ((err = snd_ctl_add(state->chip->card, kctl)) < 0) {
                snd_printd(KERN_ERR "cannot add control (err = %d)\n", err);
-               snd_ctl_free_one(kctl);
+               return err;
        }
-       return err;
+       cval->elem_id = &kctl->id;
+       cval->next_id_elem = state->mixer->id_elems[cval->id];
+       state->mixer->id_elems[cval->id] = cval;
+       return 0;
 }
 
 
@@ -443,9 +526,9 @@ static struct iterm_name_combo {
        { 0x0712, "Multi-Track Recorder" },
        { 0x0713, "Synthesizer" },
        { 0 },
-};     
+};
 
-static int get_term_name(mixer_build_t *state, usb_audio_term_t *iterm,
+static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm,
                         unsigned char *name, int maxlen, int term_only)
 {
        struct iterm_name_combo *names;
@@ -495,7 +578,7 @@ static int get_term_name(mixer_build_t *state, usb_audio_term_t *iterm,
  * parse the source unit recursively until it reaches to a terminal
  * or a branched unit.
  */
-static int check_input_term(mixer_build_t *state, int id, usb_audio_term_t *term)
+static int check_input_term(struct mixer_build *state, int id, struct usb_audio_term *term)
 {
        unsigned char *p1;
 
@@ -570,12 +653,10 @@ static struct usb_feature_control_info audio_feature_info[] = {
 
 
 /* private_free callback */
-static void usb_mixer_elem_free(snd_kcontrol_t *kctl)
+static void usb_mixer_elem_free(struct snd_kcontrol *kctl)
 {
-       if (kctl->private_data) {
-               snd_magic_kfree((void *)kctl->private_data);
-               kctl->private_data = 0;
-       }
+       kfree(kctl->private_data);
+       kctl->private_data = NULL;
 }
 
 
@@ -586,7 +667,7 @@ static void usb_mixer_elem_free(snd_kcontrol_t *kctl)
 /*
  * retrieve the minimum and maximum values for the specified control
  */
-static int get_min_max(usb_mixer_elem_info_t *cval, int default_min)
+static int get_min_max(struct usb_mixer_elem_info *cval, int default_min)
 {
        /* for failsafe */
        cval->min = default_min;
@@ -608,14 +689,15 @@ static int get_min_max(usb_mixer_elem_info_t *cval, int default_min)
                }
                if (get_ctl_value(cval, GET_MAX, (cval->control << 8) | minchn, &cval->max) < 0 ||
                    get_ctl_value(cval, GET_MIN, (cval->control << 8) | minchn, &cval->min) < 0) {
-                       snd_printd(KERN_ERR "%d:%d: cannot get min/max values for control %d (id %d)\n", cval->id, cval->ctrlif, cval->control, cval->id);
+                       snd_printd(KERN_ERR "%d:%d: cannot get min/max values for control %d (id %d)\n",
+                                  cval->id, cval->mixer->ctrlif, cval->control, cval->id);
                        return -EINVAL;
                }
                if (get_ctl_value(cval, GET_RES, (cval->control << 8) | minchn, &cval->res) < 0) {
                        cval->res = 1;
                } else {
                        int last_valid_res = cval->res;
-               
+
                        while (cval->res > 1) {
                                if (set_ctl_value(cval, SET_RES, (cval->control << 8) | minchn, cval->res / 2) < 0)
                                        break;
@@ -626,6 +708,36 @@ static int get_min_max(usb_mixer_elem_info_t *cval, int default_min)
                }
                if (cval->res == 0)
                        cval->res = 1;
+
+               /* Additional checks for the proper resolution
+                *
+                * Some devices report smaller resolutions than actually
+                * reacting.  They don't return errors but simply clip
+                * to the lower aligned value.
+                */
+               if (cval->min + cval->res < cval->max) {
+                       int last_valid_res = cval->res;
+                       int saved, test, check;
+                       get_cur_mix_value(cval, minchn, &saved);
+                       for (;;) {
+                               test = saved;
+                               if (test < cval->max)
+                                       test += cval->res;
+                               else
+                                       test -= cval->res;
+                               if (test < cval->min || test > cval->max ||
+                                   set_cur_mix_value(cval, minchn, test) ||
+                                   get_cur_mix_value(cval, minchn, &check)) {
+                                       cval->res = last_valid_res;
+                                       break;
+                               }
+                               if (test == check)
+                                       break;
+                               cval->res *= 2;
+                       }
+                       set_cur_mix_value(cval, minchn, saved);
+               }
+
                cval->initialized = 1;
        }
        return 0;
@@ -633,9 +745,9 @@ static int get_min_max(usb_mixer_elem_info_t *cval, int default_min)
 
 
 /* get a feature/mixer unit info */
-static int mixer_ctl_feature_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{      
-       usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kcontrol->private_data, return -EINVAL);
+static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
 
        if (cval->val_type == USB_MIXER_BOOLEAN ||
            cval->val_type == USB_MIXER_INV_BOOLEAN)
@@ -651,15 +763,16 @@ static int mixer_ctl_feature_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
                if (! cval->initialized)
                        get_min_max(cval,  0);
                uinfo->value.integer.min = 0;
-               uinfo->value.integer.max = (cval->max - cval->min) / cval->res;
+               uinfo->value.integer.max =
+                       (cval->max - cval->min + cval->res - 1) / cval->res;
        }
        return 0;
 }
 
 /* get the current value from feature/mixer unit */
-static int mixer_ctl_feature_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kcontrol->private_data, return -EINVAL);
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
        int c, cnt, val, err;
 
        if (cval->cmask) {
@@ -668,7 +781,7 @@ static int mixer_ctl_feature_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
                        if (cval->cmask & (1 << c)) {
                                err = get_cur_mix_value(cval, c + 1, &val);
                                if (err < 0) {
-                                       if (cval->chip->ignore_ctl_error) {
+                                       if (cval->mixer->ignore_ctl_error) {
                                                ucontrol->value.integer.value[0] = cval->min;
                                                return 0;
                                        }
@@ -684,7 +797,7 @@ static int mixer_ctl_feature_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
                /* master channel */
                err = get_cur_mix_value(cval, 0, &val);
                if (err < 0) {
-                       if (cval->chip->ignore_ctl_error) {
+                       if (cval->mixer->ignore_ctl_error) {
                                ucontrol->value.integer.value[0] = cval->min;
                                return 0;
                        }
@@ -698,9 +811,9 @@ static int mixer_ctl_feature_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 }
 
 /* put the current value to feature/mixer unit */
-static int mixer_ctl_feature_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kcontrol->private_data, return -EINVAL);
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
        int c, cnt, val, oval, err;
        int changed = 0;
 
@@ -710,7 +823,7 @@ static int mixer_ctl_feature_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
                        if (cval->cmask & (1 << c)) {
                                err = get_cur_mix_value(cval, c + 1, &oval);
                                if (err < 0) {
-                                       if (cval->chip->ignore_ctl_error)
+                                       if (cval->mixer->ignore_ctl_error)
                                                return 0;
                                        return err;
                                }
@@ -727,7 +840,7 @@ static int mixer_ctl_feature_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
        } else {
                /* master channel */
                err = get_cur_mix_value(cval, 0, &oval);
-               if (err < 0 && cval->chip->ignore_ctl_error)
+               if (err < 0 && cval->mixer->ignore_ctl_error)
                        return 0;
                if (err < 0)
                        return err;
@@ -741,7 +854,7 @@ static int mixer_ctl_feature_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
        return changed;
 }
 
-static snd_kcontrol_new_t usb_feature_unit_ctl = {
+static struct snd_kcontrol_new usb_feature_unit_ctl = {
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        .name = "", /* will be filled later manually */
        .info = mixer_ctl_feature_info,
@@ -754,15 +867,15 @@ static snd_kcontrol_new_t usb_feature_unit_ctl = {
  * build a feature control
  */
 
-static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
+static void build_feature_ctl(struct mixer_build *state, unsigned char *desc,
                              unsigned int ctl_mask, int control,
-                             usb_audio_term_t *iterm, int unitid)
+                             struct usb_audio_term *iterm, int unitid)
 {
        unsigned int len = 0;
        int mapped_name = 0;
        int nameid = desc[desc[0] - 1];
-       snd_kcontrol_t *kctl;
-       usb_mixer_elem_info_t *cval;
+       struct snd_kcontrol *kctl;
+       struct usb_mixer_elem_info *cval;
 
        control++; /* change from zero-based to 1-based value */
 
@@ -774,13 +887,12 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
        if (check_ignored_ctl(state, unitid, control))
                return;
 
-       cval = snd_magic_kcalloc(usb_mixer_elem_info_t, 0, GFP_KERNEL);
+       cval = kzalloc(sizeof(*cval), GFP_KERNEL);
        if (! cval) {
                snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                return;
        }
-       cval->chip = state->chip;
-       cval->ctrlif = state->ctrlif;
+       cval->mixer = state->mixer;
        cval->id = unitid;
        cval->control = control;
        cval->cmask = ctl_mask;
@@ -801,7 +913,7 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
        kctl = snd_ctl_new1(&usb_feature_unit_ctl, cval);
        if (! kctl) {
                snd_printk(KERN_ERR "cannot malloc kcontrol\n");
-               snd_magic_kfree(cval);
+               kfree(cval);
                return;
        }
        kctl->private_free = usb_mixer_elem_free;
@@ -842,6 +954,12 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
                }
                strlcat(kctl->id.name + len, control == USB_FEATURE_MUTE ? " Switch" : " Volume",
                        sizeof(kctl->id.name));
+               if (control == USB_FEATURE_VOLUME) {
+                       kctl->tlv.c = mixer_vol_tlv;
+                       kctl->vd[0].access |= 
+                               SNDRV_CTL_ELEM_ACCESS_TLV_READ |
+                               SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK;
+               }
                break;
 
        default:
@@ -855,16 +973,21 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
        /* note that detection between firmware 2.1.1.7 (N101) and later 2.1.1.21 */
        /* is not very clear from datasheets */
        /* I hope that the min value is -15360 for newer firmware --jk */
-       if (((state->vendor == 0x471 && (state->product == 0x104 || state->product == 0x105 || state->product == 0x101)) ||
-            (state->vendor == 0x672 && state->product == 0x1041)) && !strcmp(kctl->id.name, "PCM Playback Volume") &&
-            cval->min == -15616) {
-               snd_printk("USB Audio: using volume control quirk for the UDA1321/N101 chip\n");
-               cval->max = -256;
+       switch (state->chip->usb_id) {
+       case USB_ID(0x0471, 0x0101):
+       case USB_ID(0x0471, 0x0104):
+       case USB_ID(0x0471, 0x0105):
+       case USB_ID(0x0672, 0x1041):
+               if (!strcmp(kctl->id.name, "PCM Playback Volume") &&
+                   cval->min == -15616) {
+                       snd_printk(KERN_INFO "using volume control quirk for the UDA1321/N101 chip\n");
+                       cval->max = -256;
+               }
        }
 
        snd_printdd(KERN_INFO "[%d] FU [%s] ch = %d, val = %d/%d/%d\n",
                    cval->id, kctl->id.name, cval->channels, cval->min, cval->max, cval->res);
-       add_control_to_empty(state->chip->card, kctl);
+       add_control_to_empty(state, kctl);
 }
 
 
@@ -874,10 +997,10 @@ static void build_feature_ctl(mixer_build_t *state, unsigned char *desc,
  *
  * most of controlls are defined here.
  */
-static int parse_audio_feature_unit(mixer_build_t *state, int unitid, unsigned char *ftr)
+static int parse_audio_feature_unit(struct mixer_build *state, int unitid, unsigned char *ftr)
 {
        int channels, i, j;
-       usb_audio_term_t iterm;
+       struct usb_audio_term iterm;
        unsigned int master_bits, first_ch_bits;
        int err, csize;
 
@@ -914,7 +1037,7 @@ static int parse_audio_feature_unit(mixer_build_t *state, int unitid, unsigned c
                if (master_bits & (1 << i))
                        build_feature_ctl(state, ftr, 0, i, &iterm, unitid);
        }
-       
+
        return 0;
 }
 
@@ -930,33 +1053,29 @@ static int parse_audio_feature_unit(mixer_build_t *state, int unitid, unsigned c
  * input channel number (zero based) is given in control field instead.
  */
 
-static void build_mixer_unit_ctl(mixer_build_t *state, unsigned char *desc,
-                                int in_ch, int unitid)
+static void build_mixer_unit_ctl(struct mixer_build *state, unsigned char *desc,
+                                int in_pin, int in_ch, int unitid,
+                                struct usb_audio_term *iterm)
 {
-       usb_mixer_elem_info_t *cval;
-       unsigned int num_ins = desc[4];
-       unsigned int num_outs = desc[5 + num_ins];
+       struct usb_mixer_elem_info *cval;
+       unsigned int input_pins = desc[4];
+       unsigned int num_outs = desc[5 + input_pins];
        unsigned int i, len;
-       snd_kcontrol_t *kctl;
-       usb_audio_term_t iterm;
+       struct snd_kcontrol *kctl;
 
        if (check_ignored_ctl(state, unitid, 0))
                return;
 
-       cval = snd_magic_kcalloc(usb_mixer_elem_info_t, 0, GFP_KERNEL);
+       cval = kzalloc(sizeof(*cval), GFP_KERNEL);
        if (! cval)
                return;
 
-       if (check_input_term(state, desc[5 + in_ch], &iterm) < 0)
-               return;
-
-       cval->chip = state->chip;
-       cval->ctrlif = state->ctrlif;
+       cval->mixer = state->mixer;
        cval->id = unitid;
        cval->control = in_ch + 1; /* based on 1 */
        cval->val_type = USB_MIXER_S16;
        for (i = 0; i < num_outs; i++) {
-               if (check_matrix_bitmap(desc + 9 + num_ins, in_ch, i, num_outs)) {
+               if (check_matrix_bitmap(desc + 9 + input_pins, in_ch, i, num_outs)) {
                        cval->cmask |= (1 << i);
                        cval->channels++;
                }
@@ -968,40 +1087,67 @@ static void build_mixer_unit_ctl(mixer_build_t *state, unsigned char *desc,
        kctl = snd_ctl_new1(&usb_feature_unit_ctl, cval);
        if (! kctl) {
                snd_printk(KERN_ERR "cannot malloc kcontrol\n");
-               snd_magic_kfree(cval);
+               kfree(cval);
                return;
        }
        kctl->private_free = usb_mixer_elem_free;
 
        len = check_mapped_name(state, unitid, 0, kctl->id.name, sizeof(kctl->id.name));
        if (! len)
-               len = get_term_name(state, &iterm, kctl->id.name, sizeof(kctl->id.name), 0);
+               len = get_term_name(state, iterm, kctl->id.name, sizeof(kctl->id.name), 0);
        if (! len)
-               len = sprintf(kctl->id.name, "Mixer Source %d", in_ch);
+               len = sprintf(kctl->id.name, "Mixer Source %d", in_ch + 1);
        strlcat(kctl->id.name + len, " Volume", sizeof(kctl->id.name));
 
        snd_printdd(KERN_INFO "[%d] MU [%s] ch = %d, val = %d/%d\n",
                    cval->id, kctl->id.name, cval->channels, cval->min, cval->max);
-       add_control_to_empty(state->chip->card, kctl);
+       add_control_to_empty(state, kctl);
 }
 
 
 /*
  * parse a mixer unit
  */
-static int parse_audio_mixer_unit(mixer_build_t *state, int unitid, unsigned char *desc)
+static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, unsigned char *desc)
 {
-       int num_ins, num_outs;
-       int i, err;
-       if (desc[0] < 12 || ! (num_ins = desc[4]) || ! (num_outs = desc[5 + num_ins]))
+       struct usb_audio_term iterm;
+       int input_pins, num_ins, num_outs;
+       int pin, ich, err;
+
+       if (desc[0] < 11 || ! (input_pins = desc[4]) || ! (num_outs = desc[5 + input_pins])) {
+               snd_printk(KERN_ERR "invalid MIXER UNIT descriptor %d\n", unitid);
                return -EINVAL;
+       }
+       /* no bmControls field (e.g. Maya44) -> ignore */
+       if (desc[0] <= 10 + input_pins) {
+               snd_printdd(KERN_INFO "MU %d has no bmControls field\n", unitid);
+               return 0;
+       }
 
-       for (i = 0; i < num_ins; i++) {
-               err = parse_audio_unit(state, desc[5 + i]);
+       num_ins = 0;
+       ich = 0;
+       for (pin = 0; pin < input_pins; pin++) {
+               err = parse_audio_unit(state, desc[5 + pin]);
                if (err < 0)
                        return err;
-               if (check_matrix_bitmap(desc + 9 + num_ins, i, 0, num_outs))
-                       build_mixer_unit_ctl(state, desc, i, unitid);
+               err = check_input_term(state, desc[5 + pin], &iterm);
+               if (err < 0)
+                       return err;
+               num_ins += iterm.channels;
+               for (; ich < num_ins; ++ich) {
+                       int och, ich_has_controls = 0;
+
+                       for (och = 0; och < num_outs; ++och) {
+                               if (check_matrix_bitmap(desc + 9 + input_pins,
+                                                       ich, och, num_outs)) {
+                                       ich_has_controls = 1;
+                                       break;
+                               }
+                       }
+                       if (ich_has_controls)
+                               build_mixer_unit_ctl(state, desc, pin, ich,
+                                                    unitid, &iterm);
+               }
        }
        return 0;
 }
@@ -1012,13 +1158,13 @@ static int parse_audio_mixer_unit(mixer_build_t *state, int unitid, unsigned cha
  */
 
 /* get callback for processing/extension unit */
-static int mixer_ctl_procunit_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kcontrol->private_data, return -EINVAL);
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
        int err, val;
 
        err = get_cur_ctl_value(cval, cval->control << 8, &val);
-       if (err < 0 && cval->chip->ignore_ctl_error) {
+       if (err < 0 && cval->mixer->ignore_ctl_error) {
                ucontrol->value.integer.value[0] = cval->min;
                return 0;
        }
@@ -1030,14 +1176,14 @@ static int mixer_ctl_procunit_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 }
 
 /* put callback for processing/extension unit */
-static int mixer_ctl_procunit_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kcontrol->private_data, return -EINVAL);
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
        int val, oval, err;
 
        err = get_cur_ctl_value(cval, cval->control << 8, &oval);
        if (err < 0) {
-               if (cval->chip->ignore_ctl_error)
+               if (cval->mixer->ignore_ctl_error)
                        return 0;
                return err;
        }
@@ -1051,7 +1197,7 @@ static int mixer_ctl_procunit_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 }
 
 /* alsa control interface for processing/extension unit */
-static snd_kcontrol_new_t mixer_procunit_ctl = {
+static struct snd_kcontrol_new mixer_procunit_ctl = {
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        .name = "", /* will be filled later */
        .info = mixer_ctl_feature_info,
@@ -1128,11 +1274,11 @@ static struct procunit_info procunits[] = {
 /*
  * build a processing/extension unit
  */
-static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char *dsc, struct procunit_info *list, char *name)
+static int build_audio_procunit(struct mixer_build *state, int unitid, unsigned char *dsc, struct procunit_info *list, char *name)
 {
        int num_ins = dsc[6];
-       usb_mixer_elem_info_t *cval;
-       snd_kcontrol_t *kctl;
+       struct usb_mixer_elem_info *cval;
+       struct snd_kcontrol *kctl;
        int i, err, nameid, type, len;
        struct procunit_info *info;
        struct procunit_value_info *valinfo;
@@ -1155,9 +1301,6 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
        }
 
        type = combine_word(&dsc[4]);
-       if (! type)
-               return 0; /* undefined? */
-
        for (info = list; info && info->type; info++)
                if (info->type == type)
                        break;
@@ -1170,13 +1313,12 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
                        continue;
                if (check_ignored_ctl(state, unitid, valinfo->control))
                        continue;
-               cval = snd_magic_kcalloc(usb_mixer_elem_info_t, 0, GFP_KERNEL);
+               cval = kzalloc(sizeof(*cval), GFP_KERNEL);
                if (! cval) {
                        snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                        return -ENOMEM;
                }
-               cval->chip = state->chip;
-               cval->ctrlif = state->ctrlif;
+               cval->mixer = state->mixer;
                cval->id = unitid;
                cval->control = valinfo->control;
                cval->val_type = valinfo->val_type;
@@ -1195,7 +1337,7 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
                kctl = snd_ctl_new1(&mixer_procunit_ctl, cval);
                if (! kctl) {
                        snd_printk(KERN_ERR "cannot malloc kcontrol\n");
-                       snd_magic_kfree(cval);
+                       kfree(cval);
                        return -ENOMEM;
                }
                kctl->private_free = usb_mixer_elem_free;
@@ -1217,19 +1359,19 @@ static int build_audio_procunit(mixer_build_t *state, int unitid, unsigned char
 
                snd_printdd(KERN_INFO "[%d] PU [%s] ch = %d, val = %d/%d\n",
                            cval->id, kctl->id.name, cval->channels, cval->min, cval->max);
-               if ((err = add_control_to_empty(state->chip->card, kctl)) < 0)
+               if ((err = add_control_to_empty(state, kctl)) < 0)
                        return err;
        }
        return 0;
 }
 
 
-static int parse_audio_processing_unit(mixer_build_t *state, int unitid, unsigned char *desc)
+static int parse_audio_processing_unit(struct mixer_build *state, int unitid, unsigned char *desc)
 {
        return build_audio_procunit(state, unitid, desc, procunits, "Processing Unit");
 }
 
-static int parse_audio_extension_unit(mixer_build_t *state, int unitid, unsigned char *desc)
+static int parse_audio_extension_unit(struct mixer_build *state, int unitid, unsigned char *desc)
 {
        return build_audio_procunit(state, unitid, desc, NULL, "Extension Unit");
 }
@@ -1242,9 +1384,9 @@ static int parse_audio_extension_unit(mixer_build_t *state, int unitid, unsigned
 /* info callback for selector unit
  * use an enumerator type for routing
  */
-static int mixer_ctl_selector_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
-{      
-       usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kcontrol->private_data, return -EINVAL);
+static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
        char **itemlist = (char **)kcontrol->private_value;
 
        snd_assert(itemlist, return -EINVAL);
@@ -1258,14 +1400,14 @@ static int mixer_ctl_selector_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
 }
 
 /* get callback for selector unit */
-static int mixer_ctl_selector_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kcontrol->private_data, return -EINVAL);
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
        int val, err;
 
        err = get_cur_ctl_value(cval, 0, &val);
        if (err < 0) {
-               if (cval->chip->ignore_ctl_error) {
+               if (cval->mixer->ignore_ctl_error) {
                        ucontrol->value.enumerated.item[0] = 0;
                        return 0;
                }
@@ -1277,14 +1419,14 @@ static int mixer_ctl_selector_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 }
 
 /* put callback for selector unit */
-static int mixer_ctl_selector_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-       usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kcontrol->private_data, return -EINVAL);
+       struct usb_mixer_elem_info *cval = kcontrol->private_data;
        int val, oval, err;
 
        err = get_cur_ctl_value(cval, 0, &oval);
        if (err < 0) {
-               if (cval->chip->ignore_ctl_error)
+               if (cval->mixer->ignore_ctl_error)
                        return 0;
                return err;
        }
@@ -1298,7 +1440,7 @@ static int mixer_ctl_selector_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
 }
 
 /* alsa control interface for selector unit */
-static snd_kcontrol_new_t mixer_selectunit_ctl = {
+static struct snd_kcontrol_new mixer_selectunit_ctl = {
        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        .name = "", /* will be filled later */
        .info = mixer_ctl_selector_info,
@@ -1310,15 +1452,15 @@ static snd_kcontrol_new_t mixer_selectunit_ctl = {
 /* private free callback.
  * free both private_data and private_value
  */
-static void usb_mixer_selector_elem_free(snd_kcontrol_t *kctl)
+static void usb_mixer_selector_elem_free(struct snd_kcontrol *kctl)
 {
        int i, num_ins = 0;
 
        if (kctl->private_data) {
-               usb_mixer_elem_info_t *cval = snd_magic_cast(usb_mixer_elem_info_t, kctl->private_data,);
+               struct usb_mixer_elem_info *cval = kctl->private_data;
                num_ins = cval->max;
-               snd_magic_kfree(cval);
-               kctl->private_data = 0;
+               kfree(cval);
+               kctl->private_data = NULL;
        }
        if (kctl->private_value) {
                char **itemlist = (char **)kctl->private_value;
@@ -1332,13 +1474,13 @@ static void usb_mixer_selector_elem_free(snd_kcontrol_t *kctl)
 /*
  * parse a selector unit
  */
-static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned char *desc)
+static int parse_audio_selector_unit(struct mixer_build *state, int unitid, unsigned char *desc)
 {
        unsigned int num_ins = desc[4];
        unsigned int i, nameid, len;
        int err;
-       usb_mixer_elem_info_t *cval;
-       snd_kcontrol_t *kctl;
+       struct usb_mixer_elem_info *cval;
+       struct snd_kcontrol *kctl;
        char **namelist;
 
        if (! num_ins || desc[0] < 6 + num_ins) {
@@ -1357,13 +1499,12 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
        if (check_ignored_ctl(state, unitid, 0))
                return 0;
 
-       cval = snd_magic_kcalloc(usb_mixer_elem_info_t, 0, GFP_KERNEL);
+       cval = kzalloc(sizeof(*cval), GFP_KERNEL);
        if (! cval) {
                snd_printk(KERN_ERR "cannot malloc kcontrol\n");
                return -ENOMEM;
        }
-       cval->chip = state->chip;
-       cval->ctrlif = state->ctrlif;
+       cval->mixer = state->mixer;
        cval->id = unitid;
        cval->val_type = USB_MIXER_U8;
        cval->channels = 1;
@@ -1375,23 +1516,25 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
        namelist = kmalloc(sizeof(char *) * num_ins, GFP_KERNEL);
        if (! namelist) {
                snd_printk(KERN_ERR "cannot malloc\n");
-               snd_magic_kfree(cval);
+               kfree(cval);
                return -ENOMEM;
        }
 #define MAX_ITEM_NAME_LEN      64
        for (i = 0; i < num_ins; i++) {
-               usb_audio_term_t iterm;
+               struct usb_audio_term iterm;
                len = 0;
                namelist[i] = kmalloc(MAX_ITEM_NAME_LEN, GFP_KERNEL);
                if (! namelist[i]) {
                        snd_printk(KERN_ERR "cannot malloc\n");
-                       while (--i > 0)
+                       while (i--)
                                kfree(namelist[i]);
                        kfree(namelist);
-                       snd_magic_kfree(cval);
+                       kfree(cval);
                        return -ENOMEM;
                }
-               if (check_input_term(state, desc[5 + i], &iterm) >= 0)
+               len = check_mapped_selector_name(state, unitid, i, namelist[i],
+                                                MAX_ITEM_NAME_LEN);
+               if (! len && check_input_term(state, desc[5 + i], &iterm) >= 0)
                        len = get_term_name(state, &iterm, namelist[i], MAX_ITEM_NAME_LEN, 0);
                if (! len)
                        sprintf(namelist[i], "Input %d", i);
@@ -1400,7 +1543,8 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
        kctl = snd_ctl_new1(&mixer_selectunit_ctl, cval);
        if (! kctl) {
                snd_printk(KERN_ERR "cannot malloc kcontrol\n");
-               snd_magic_kfree(cval);
+               kfree(namelist);
+               kfree(cval);
                return -ENOMEM;
        }
        kctl->private_value = (unsigned long)namelist;
@@ -1426,7 +1570,7 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
 
        snd_printdd(KERN_INFO "[%d] SU [%s] items = %d\n",
                    cval->id, kctl->id.name, num_ins);
-       if ((err = add_control_to_empty(state->chip->card, kctl)) < 0)
+       if ((err = add_control_to_empty(state, kctl)) < 0)
                return err;
 
        return 0;
@@ -1437,7 +1581,7 @@ static int parse_audio_selector_unit(mixer_build_t *state, int unitid, unsigned
  * parse an audio unit recursively
  */
 
-static int parse_audio_unit(mixer_build_t *state, int unitid)
+static int parse_audio_unit(struct mixer_build *state, int unitid)
 {
        unsigned char *p1;
 
@@ -1469,41 +1613,54 @@ static int parse_audio_unit(mixer_build_t *state, int unitid)
        }
 }
 
+static void snd_usb_mixer_free(struct usb_mixer_interface *mixer)
+{
+       kfree(mixer->id_elems);
+       if (mixer->urb) {
+               kfree(mixer->urb->transfer_buffer);
+               usb_free_urb(mixer->urb);
+       }
+       usb_free_urb(mixer->rc_urb);
+       kfree(mixer->rc_setup_packet);
+       kfree(mixer);
+}
+
+static int snd_usb_mixer_dev_free(struct snd_device *device)
+{
+       struct usb_mixer_interface *mixer = device->device_data;
+       snd_usb_mixer_free(mixer);
+       return 0;
+}
+
 /*
  * create mixer controls
  *
  * walk through all OUTPUT_TERMINAL descriptors to search for mixers
  */
-int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif)
+static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
 {
        unsigned char *desc;
-       mixer_build_t state;
+       struct mixer_build state;
        int err;
        const struct usbmix_ctl_map *map;
-       struct usb_device_descriptor *dev = &chip->dev->descriptor;
-       struct usb_host_interface *hostif = &usb_ifnum_to_if(chip->dev, ctrlif)->altsetting[0];
-
-       strcpy(chip->card->mixername, "USB Mixer");
+       struct usb_host_interface *hostif;
 
+       hostif = &usb_ifnum_to_if(mixer->chip->dev, mixer->ctrlif)->altsetting[0];
        memset(&state, 0, sizeof(state));
-       state.chip = chip;
+       state.chip = mixer->chip;
+       state.mixer = mixer;
        state.buffer = hostif->extra;
        state.buflen = hostif->extralen;
-       state.ctrlif = ctrlif;
-       state.vendor = dev->idVendor;
-       state.product = dev->idProduct;
 
        /* check the mapping table */
-       for (map = usbmix_ctl_maps; map->vendor; map++) {
-               if (map->vendor == dev->idVendor && map->product == dev->idProduct) {
+       for (map = usbmix_ctl_maps; map->id; map++) {
+               if (map->id == state.chip->usb_id) {
                        state.map = map->map;
-                       chip->ignore_ctl_error = map->ignore_ctl_error;
+                       state.selector_map = map->selector_map;
+                       mixer->ignore_ctl_error = map->ignore_ctl_error;
                        break;
                }
        }
-#ifdef IGNORE_CTL_ERROR
-       chip->ignore_ctl_error = 1;
-#endif
 
        desc = NULL;
        while ((desc = snd_usb_find_csint_desc(hostif->extra, hostif->extralen, desc, OUTPUT_TERMINAL)) != NULL) {
@@ -1519,3 +1676,385 @@ int snd_usb_create_mixer(snd_usb_audio_t *chip, int ctrlif)
        }
        return 0;
 }
+
+static void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer,
+                                   int unitid)
+{
+       struct usb_mixer_elem_info *info;
+
+       for (info = mixer->id_elems[unitid]; info; info = info->next_id_elem)
+               snd_ctl_notify(mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                              info->elem_id);
+}
+
+static void snd_usb_mixer_memory_change(struct usb_mixer_interface *mixer,
+                                       int unitid)
+{
+       if (!mixer->rc_cfg)
+               return;
+       /* unit ids specific to Extigy/Audigy 2 NX: */
+       switch (unitid) {
+       case 0: /* remote control */
+               mixer->rc_urb->dev = mixer->chip->dev;
+               usb_submit_urb(mixer->rc_urb, GFP_ATOMIC);
+               break;
+       case 4: /* digital in jack */
+       case 7: /* line in jacks */
+       case 19: /* speaker out jacks */
+       case 20: /* headphones out jack */
+               break;
+       default:
+               snd_printd(KERN_DEBUG "memory change in unknown unit %d\n", unitid);
+               break;
+       }
+}
+
+static void snd_usb_mixer_status_complete(struct urb *urb)
+{
+       struct usb_mixer_interface *mixer = urb->context;
+
+       if (urb->status == 0) {
+               u8 *buf = urb->transfer_buffer;
+               int i;
+
+               for (i = urb->actual_length; i >= 2; buf += 2, i -= 2) {
+                       snd_printd(KERN_DEBUG "status interrupt: %02x %02x\n",
+                                  buf[0], buf[1]);
+                       /* ignore any notifications not from the control interface */
+                       if ((buf[0] & 0x0f) != 0)
+                               continue;
+                       if (!(buf[0] & 0x40))
+                               snd_usb_mixer_notify_id(mixer, buf[1]);
+                       else
+                               snd_usb_mixer_memory_change(mixer, buf[1]);
+               }
+       }
+       if (urb->status != -ENOENT && urb->status != -ECONNRESET) {
+               urb->dev = mixer->chip->dev;
+               usb_submit_urb(urb, GFP_ATOMIC);
+       }
+}
+
+/* create the handler for the optional status interrupt endpoint */
+static int snd_usb_mixer_status_create(struct usb_mixer_interface *mixer)
+{
+       struct usb_host_interface *hostif;
+       struct usb_endpoint_descriptor *ep;
+       void *transfer_buffer;
+       int buffer_length;
+       unsigned int epnum;
+
+       hostif = &usb_ifnum_to_if(mixer->chip->dev, mixer->ctrlif)->altsetting[0];
+       /* we need one interrupt input endpoint */
+       if (get_iface_desc(hostif)->bNumEndpoints < 1)
+               return 0;
+       ep = get_endpoint(hostif, 0);
+       if ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) != USB_DIR_IN ||
+           (ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT)
+               return 0;
+
+       epnum = ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
+       buffer_length = le16_to_cpu(ep->wMaxPacketSize);
+       transfer_buffer = kmalloc(buffer_length, GFP_KERNEL);
+       if (!transfer_buffer)
+               return -ENOMEM;
+       mixer->urb = usb_alloc_urb(0, GFP_KERNEL);
+       if (!mixer->urb) {
+               kfree(transfer_buffer);
+               return -ENOMEM;
+       }
+       usb_fill_int_urb(mixer->urb, mixer->chip->dev,
+                        usb_rcvintpipe(mixer->chip->dev, epnum),
+                        transfer_buffer, buffer_length,
+                        snd_usb_mixer_status_complete, mixer, ep->bInterval);
+       usb_submit_urb(mixer->urb, GFP_KERNEL);
+       return 0;
+}
+
+static void snd_usb_soundblaster_remote_complete(struct urb *urb)
+{
+       struct usb_mixer_interface *mixer = urb->context;
+       const struct rc_config *rc = mixer->rc_cfg;
+       u32 code;
+
+       if (urb->status < 0 || urb->actual_length < rc->packet_length)
+               return;
+
+       code = mixer->rc_buffer[rc->offset];
+       if (rc->length == 2)
+               code |= mixer->rc_buffer[rc->offset + 1] << 8;
+
+       /* the Mute button actually changes the mixer control */
+       if (code == rc->mute_code)
+               snd_usb_mixer_notify_id(mixer, rc->mute_mixer_id);
+       mixer->rc_code = code;
+       wmb();
+       wake_up(&mixer->rc_waitq);
+}
+
+static int snd_usb_sbrc_hwdep_open(struct snd_hwdep *hw, struct file *file)
+{
+       struct usb_mixer_interface *mixer = hw->private_data;
+
+       if (test_and_set_bit(0, &mixer->rc_hwdep_open))
+               return -EBUSY;
+       return 0;
+}
+
+static int snd_usb_sbrc_hwdep_release(struct snd_hwdep *hw, struct file *file)
+{
+       struct usb_mixer_interface *mixer = hw->private_data;
+
+       clear_bit(0, &mixer->rc_hwdep_open);
+       smp_mb__after_clear_bit();
+       return 0;
+}
+
+static long snd_usb_sbrc_hwdep_read(struct snd_hwdep *hw, char __user *buf,
+                                    long count, loff_t *offset)
+{
+       struct usb_mixer_interface *mixer = hw->private_data;
+       int err;
+       u32 rc_code;
+
+       if (count != 1 && count != 4)
+               return -EINVAL;
+       err = wait_event_interruptible(mixer->rc_waitq,
+                                      (rc_code = xchg(&mixer->rc_code, 0)) != 0);
+       if (err == 0) {
+               if (count == 1)
+                       err = put_user(rc_code, buf);
+               else
+                       err = put_user(rc_code, (u32 __user *)buf);
+       }
+       return err < 0 ? err : count;
+}
+
+static unsigned int snd_usb_sbrc_hwdep_poll(struct snd_hwdep *hw, struct file *file,
+                                           poll_table *wait)
+{
+       struct usb_mixer_interface *mixer = hw->private_data;
+
+       poll_wait(file, &mixer->rc_waitq, wait);
+       return mixer->rc_code ? POLLIN | POLLRDNORM : 0;
+}
+
+static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
+{
+       struct snd_hwdep *hwdep;
+       int err, len, i;
+
+       for (i = 0; i < ARRAY_SIZE(rc_configs); ++i)
+               if (rc_configs[i].usb_id == mixer->chip->usb_id)
+                       break;
+       if (i >= ARRAY_SIZE(rc_configs))
+               return 0;
+       mixer->rc_cfg = &rc_configs[i];
+
+       len = mixer->rc_cfg->packet_length;
+       
+       init_waitqueue_head(&mixer->rc_waitq);
+       err = snd_hwdep_new(mixer->chip->card, "SB remote control", 0, &hwdep);
+       if (err < 0)
+               return err;
+       snprintf(hwdep->name, sizeof(hwdep->name),
+                "%s remote control", mixer->chip->card->shortname);
+       hwdep->iface = SNDRV_HWDEP_IFACE_SB_RC;
+       hwdep->private_data = mixer;
+       hwdep->ops.read = snd_usb_sbrc_hwdep_read;
+       hwdep->ops.open = snd_usb_sbrc_hwdep_open;
+       hwdep->ops.release = snd_usb_sbrc_hwdep_release;
+       hwdep->ops.poll = snd_usb_sbrc_hwdep_poll;
+
+       mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL);
+       if (!mixer->rc_urb)
+               return -ENOMEM;
+       mixer->rc_setup_packet = kmalloc(sizeof(*mixer->rc_setup_packet), GFP_KERNEL);
+       if (!mixer->rc_setup_packet) {
+               usb_free_urb(mixer->rc_urb);
+               mixer->rc_urb = NULL;
+               return -ENOMEM;
+       }
+       mixer->rc_setup_packet->bRequestType =
+               USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE;
+       mixer->rc_setup_packet->bRequest = GET_MEM;
+       mixer->rc_setup_packet->wValue = cpu_to_le16(0);
+       mixer->rc_setup_packet->wIndex = cpu_to_le16(0);
+       mixer->rc_setup_packet->wLength = cpu_to_le16(len);
+       usb_fill_control_urb(mixer->rc_urb, mixer->chip->dev,
+                            usb_rcvctrlpipe(mixer->chip->dev, 0),
+                            (u8*)mixer->rc_setup_packet, mixer->rc_buffer, len,
+                            snd_usb_soundblaster_remote_complete, mixer);
+       return 0;
+}
+
+static int snd_audigy2nx_led_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+       uinfo->count = 1;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = 1;
+       return 0;
+}
+
+static int snd_audigy2nx_led_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+       struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+       int index = kcontrol->private_value;
+
+       ucontrol->value.integer.value[0] = mixer->audigy2nx_leds[index];
+       return 0;
+}
+
+static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+       struct usb_mixer_interface *mixer = snd_kcontrol_chip(kcontrol);
+       int index = kcontrol->private_value;
+       int value = ucontrol->value.integer.value[0];
+       int err, changed;
+
+       if (value > 1)
+               return -EINVAL;
+       changed = value != mixer->audigy2nx_leds[index];
+       err = snd_usb_ctl_msg(mixer->chip->dev,
+                             usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
+                             USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
+                             value, index + 2, NULL, 0, 100);
+       if (err < 0)
+               return err;
+       mixer->audigy2nx_leds[index] = value;
+       return changed;
+}
+
+static struct snd_kcontrol_new snd_audigy2nx_controls[] = {
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "CMSS LED Switch",
+               .info = snd_audigy2nx_led_info,
+               .get = snd_audigy2nx_led_get,
+               .put = snd_audigy2nx_led_put,
+               .private_value = 0,
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Power LED Switch",
+               .info = snd_audigy2nx_led_info,
+               .get = snd_audigy2nx_led_get,
+               .put = snd_audigy2nx_led_put,
+               .private_value = 1,
+       },
+       {
+               .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name = "Dolby Digital LED Switch",
+               .info = snd_audigy2nx_led_info,
+               .get = snd_audigy2nx_led_get,
+               .put = snd_audigy2nx_led_put,
+               .private_value = 2,
+       },
+};
+
+static int snd_audigy2nx_controls_create(struct usb_mixer_interface *mixer)
+{
+       int i, err;
+
+       for (i = 0; i < ARRAY_SIZE(snd_audigy2nx_controls); ++i) {
+               err = snd_ctl_add(mixer->chip->card,
+                                 snd_ctl_new1(&snd_audigy2nx_controls[i], mixer));
+               if (err < 0)
+                       return err;
+       }
+       mixer->audigy2nx_leds[1] = 1; /* Power LED is on by default */
+       return 0;
+}
+
+static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,
+                                   struct snd_info_buffer *buffer)
+{
+       static const struct {
+               int unitid;
+               const char *name;
+       } jacks[] = {
+               {4,  "dig in "},
+               {7,  "line in"},
+               {19, "spk out"},
+               {20, "hph out"},
+       };
+       struct usb_mixer_interface *mixer = entry->private_data;
+       int i, err;
+       u8 buf[3];
+
+       snd_iprintf(buffer, "%s jacks\n\n", mixer->chip->card->shortname);
+       for (i = 0; i < ARRAY_SIZE(jacks); ++i) {
+               snd_iprintf(buffer, "%s: ", jacks[i].name);
+               err = snd_usb_ctl_msg(mixer->chip->dev,
+                                     usb_rcvctrlpipe(mixer->chip->dev, 0),
+                                     GET_MEM, USB_DIR_IN | USB_TYPE_CLASS |
+                                     USB_RECIP_INTERFACE, 0,
+                                     jacks[i].unitid << 8, buf, 3, 100);
+               if (err == 3 && buf[0] == 3)
+                       snd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]);
+               else
+                       snd_iprintf(buffer, "?\n");
+       }
+}
+
+int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif)
+{
+       static struct snd_device_ops dev_ops = {
+               .dev_free = snd_usb_mixer_dev_free
+       };
+       struct usb_mixer_interface *mixer;
+       int err;
+
+       strcpy(chip->card->mixername, "USB Mixer");
+
+       mixer = kzalloc(sizeof(*mixer), GFP_KERNEL);
+       if (!mixer)
+               return -ENOMEM;
+       mixer->chip = chip;
+       mixer->ctrlif = ctrlif;
+#ifdef IGNORE_CTL_ERROR
+       mixer->ignore_ctl_error = 1;
+#endif
+       mixer->id_elems = kcalloc(256, sizeof(*mixer->id_elems), GFP_KERNEL);
+       if (!mixer->id_elems) {
+               kfree(mixer);
+               return -ENOMEM;
+       }
+
+       if ((err = snd_usb_mixer_controls(mixer)) < 0 ||
+           (err = snd_usb_mixer_status_create(mixer)) < 0)
+               goto _error;
+
+       if ((err = snd_usb_soundblaster_remote_init(mixer)) < 0)
+               goto _error;
+
+       if (mixer->chip->usb_id == USB_ID(0x041e, 0x3020)) {
+               struct snd_info_entry *entry;
+
+               if ((err = snd_audigy2nx_controls_create(mixer)) < 0)
+                       goto _error;
+               if (!snd_card_proc_new(chip->card, "audigy2nx", &entry))
+                       snd_info_set_text_ops(entry, mixer,
+                                             snd_audigy2nx_proc_read);
+       }
+
+       err = snd_device_new(chip->card, SNDRV_DEV_LOWLEVEL, mixer, &dev_ops);
+       if (err < 0)
+               goto _error;
+       list_add(&mixer->list, &chip->mixer_list);
+       return 0;
+
+_error:
+       snd_usb_mixer_free(mixer);
+       return err;
+}
+
+void snd_usb_mixer_disconnect(struct list_head *p)
+{
+       struct usb_mixer_interface *mixer;
+       
+       mixer = list_entry(p, struct usb_mixer_interface, list);
+       usb_kill_urb(mixer->urb);
+       usb_kill_urb(mixer->rc_urb);
+}