]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - sound/pci/emu10k1/emumixer.c
ALSA: emu10k1 - Remove CLFE-related controls for SB Live! Platinum CT4760P
[linux-2.6.git] / sound / pci / emu10k1 / emumixer.c
index 306fe4aa4aa53e5cb05de32a018169d06f897119..1b50a23232b58adc810d4c16cc609aee66254857 100644 (file)
@@ -1,10 +1,13 @@
 /*
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>,
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Takashi Iwai <tiwai@suse.de>
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips / mixer routines
  *  Multichannel PCM support Copyright (c) Lee Revell <rlrevell@joe-job.com>
  *
+ *  Copyright (c) by James Courtier-Dutton <James@superbug.co.uk>
+ *     Added EMU 1010 support.
+ *
  *  BUGS:
  *    --
  *
  *
  */
 
-#include <sound/driver.h>
 #include <linux/time.h>
 #include <linux/init.h>
 #include <sound/core.h>
 #include <sound/emu10k1.h>
+#include <linux/delay.h>
+#include <sound/tlv.h>
+
+#include "p17v.h"
 
 #define AC97_ID_STAC9758       0x83847658
 
+static const DECLARE_TLV_DB_SCALE(snd_audigy_db_scale2, -10350, 50, 1); /* WM8775 gain scale */
+
 static int snd_emu10k1_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
@@ -49,6 +57,9 @@ static int snd_emu10k1_spdif_get(struct snd_kcontrol *kcontrol,
        unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
        unsigned long flags;
 
+       /* Limit: emu->spdif_bits */
+       if (idx >= 3)
+               return -EINVAL;
        spin_lock_irqsave(&emu->reg_lock, flags);
        ucontrol->value.iec958.status[0] = (emu->spdif_bits[idx] >> 0) & 0xff;
        ucontrol->value.iec958.status[1] = (emu->spdif_bits[idx] >> 8) & 0xff;
@@ -68,6 +79,921 @@ static int snd_emu10k1_spdif_get_mask(struct snd_kcontrol *kcontrol,
        return 0;
 }
 
+/*
+ * Items labels in enum mixer controls assigning source data to
+ * each destination
+ */
+static char *emu1010_src_texts[] = { 
+       "Silence",
+       "Dock Mic A",
+       "Dock Mic B",
+       "Dock ADC1 Left",
+       "Dock ADC1 Right",
+       "Dock ADC2 Left",
+       "Dock ADC2 Right",
+       "Dock ADC3 Left",
+       "Dock ADC3 Right",
+       "0202 ADC Left",
+       "0202 ADC Right",
+       "0202 SPDIF Left",
+       "0202 SPDIF Right",
+       "ADAT 0",
+       "ADAT 1",
+       "ADAT 2",
+       "ADAT 3",
+       "ADAT 4",
+       "ADAT 5",
+       "ADAT 6",
+       "ADAT 7",
+       "DSP 0",
+       "DSP 1",
+       "DSP 2",
+       "DSP 3",
+       "DSP 4",
+       "DSP 5",
+       "DSP 6",
+       "DSP 7",
+       "DSP 8",
+       "DSP 9",
+       "DSP 10",
+       "DSP 11",
+       "DSP 12",
+       "DSP 13",
+       "DSP 14",
+       "DSP 15",
+       "DSP 16",
+       "DSP 17",
+       "DSP 18",
+       "DSP 19",
+       "DSP 20",
+       "DSP 21",
+       "DSP 22",
+       "DSP 23",
+       "DSP 24",
+       "DSP 25",
+       "DSP 26",
+       "DSP 27",
+       "DSP 28",
+       "DSP 29",
+       "DSP 30",
+       "DSP 31",
+};
+
+/* 1616(m) cardbus */
+
+static char *emu1616_src_texts[] = {
+       "Silence",
+       "Dock Mic A",
+       "Dock Mic B",
+       "Dock ADC1 Left",
+       "Dock ADC1 Right",
+       "Dock ADC2 Left",
+       "Dock ADC2 Right",
+       "Dock SPDIF Left",
+       "Dock SPDIF Right",
+       "ADAT 0",
+       "ADAT 1",
+       "ADAT 2",
+       "ADAT 3",
+       "ADAT 4",
+       "ADAT 5",
+       "ADAT 6",
+       "ADAT 7",
+       "DSP 0",
+       "DSP 1",
+       "DSP 2",
+       "DSP 3",
+       "DSP 4",
+       "DSP 5",
+       "DSP 6",
+       "DSP 7",
+       "DSP 8",
+       "DSP 9",
+       "DSP 10",
+       "DSP 11",
+       "DSP 12",
+       "DSP 13",
+       "DSP 14",
+       "DSP 15",
+       "DSP 16",
+       "DSP 17",
+       "DSP 18",
+       "DSP 19",
+       "DSP 20",
+       "DSP 21",
+       "DSP 22",
+       "DSP 23",
+       "DSP 24",
+       "DSP 25",
+       "DSP 26",
+       "DSP 27",
+       "DSP 28",
+       "DSP 29",
+       "DSP 30",
+       "DSP 31",
+};
+
+
+/*
+ * List of data sources available for each destination
+ */
+static unsigned int emu1010_src_regs[] = {
+       EMU_SRC_SILENCE,/* 0 */
+       EMU_SRC_DOCK_MIC_A1, /* 1 */
+       EMU_SRC_DOCK_MIC_B1, /* 2 */
+       EMU_SRC_DOCK_ADC1_LEFT1, /* 3 */
+       EMU_SRC_DOCK_ADC1_RIGHT1, /* 4 */
+       EMU_SRC_DOCK_ADC2_LEFT1, /* 5 */
+       EMU_SRC_DOCK_ADC2_RIGHT1, /* 6 */
+       EMU_SRC_DOCK_ADC3_LEFT1, /* 7 */
+       EMU_SRC_DOCK_ADC3_RIGHT1, /* 8 */
+       EMU_SRC_HAMOA_ADC_LEFT1, /* 9 */
+       EMU_SRC_HAMOA_ADC_RIGHT1, /* 10 */
+       EMU_SRC_HANA_SPDIF_LEFT1, /* 11 */
+       EMU_SRC_HANA_SPDIF_RIGHT1, /* 12 */
+       EMU_SRC_HANA_ADAT, /* 13 */
+       EMU_SRC_HANA_ADAT+1, /* 14 */
+       EMU_SRC_HANA_ADAT+2, /* 15 */
+       EMU_SRC_HANA_ADAT+3, /* 16 */
+       EMU_SRC_HANA_ADAT+4, /* 17 */
+       EMU_SRC_HANA_ADAT+5, /* 18 */
+       EMU_SRC_HANA_ADAT+6, /* 19 */
+       EMU_SRC_HANA_ADAT+7, /* 20 */
+       EMU_SRC_ALICE_EMU32A, /* 21 */
+       EMU_SRC_ALICE_EMU32A+1, /* 22 */
+       EMU_SRC_ALICE_EMU32A+2, /* 23 */
+       EMU_SRC_ALICE_EMU32A+3, /* 24 */
+       EMU_SRC_ALICE_EMU32A+4, /* 25 */
+       EMU_SRC_ALICE_EMU32A+5, /* 26 */
+       EMU_SRC_ALICE_EMU32A+6, /* 27 */
+       EMU_SRC_ALICE_EMU32A+7, /* 28 */
+       EMU_SRC_ALICE_EMU32A+8, /* 29 */
+       EMU_SRC_ALICE_EMU32A+9, /* 30 */
+       EMU_SRC_ALICE_EMU32A+0xa, /* 31 */
+       EMU_SRC_ALICE_EMU32A+0xb, /* 32 */
+       EMU_SRC_ALICE_EMU32A+0xc, /* 33 */
+       EMU_SRC_ALICE_EMU32A+0xd, /* 34 */
+       EMU_SRC_ALICE_EMU32A+0xe, /* 35 */
+       EMU_SRC_ALICE_EMU32A+0xf, /* 36 */
+       EMU_SRC_ALICE_EMU32B, /* 37 */
+       EMU_SRC_ALICE_EMU32B+1, /* 38 */
+       EMU_SRC_ALICE_EMU32B+2, /* 39 */
+       EMU_SRC_ALICE_EMU32B+3, /* 40 */
+       EMU_SRC_ALICE_EMU32B+4, /* 41 */
+       EMU_SRC_ALICE_EMU32B+5, /* 42 */
+       EMU_SRC_ALICE_EMU32B+6, /* 43 */
+       EMU_SRC_ALICE_EMU32B+7, /* 44 */
+       EMU_SRC_ALICE_EMU32B+8, /* 45 */
+       EMU_SRC_ALICE_EMU32B+9, /* 46 */
+       EMU_SRC_ALICE_EMU32B+0xa, /* 47 */
+       EMU_SRC_ALICE_EMU32B+0xb, /* 48 */
+       EMU_SRC_ALICE_EMU32B+0xc, /* 49 */
+       EMU_SRC_ALICE_EMU32B+0xd, /* 50 */
+       EMU_SRC_ALICE_EMU32B+0xe, /* 51 */
+       EMU_SRC_ALICE_EMU32B+0xf, /* 52 */
+};
+
+/* 1616(m) cardbus */
+static unsigned int emu1616_src_regs[] = {
+       EMU_SRC_SILENCE,
+       EMU_SRC_DOCK_MIC_A1,
+       EMU_SRC_DOCK_MIC_B1,
+       EMU_SRC_DOCK_ADC1_LEFT1,
+       EMU_SRC_DOCK_ADC1_RIGHT1,
+       EMU_SRC_DOCK_ADC2_LEFT1,
+       EMU_SRC_DOCK_ADC2_RIGHT1,
+       EMU_SRC_MDOCK_SPDIF_LEFT1,
+       EMU_SRC_MDOCK_SPDIF_RIGHT1,
+       EMU_SRC_MDOCK_ADAT,
+       EMU_SRC_MDOCK_ADAT+1,
+       EMU_SRC_MDOCK_ADAT+2,
+       EMU_SRC_MDOCK_ADAT+3,
+       EMU_SRC_MDOCK_ADAT+4,
+       EMU_SRC_MDOCK_ADAT+5,
+       EMU_SRC_MDOCK_ADAT+6,
+       EMU_SRC_MDOCK_ADAT+7,
+       EMU_SRC_ALICE_EMU32A,
+       EMU_SRC_ALICE_EMU32A+1,
+       EMU_SRC_ALICE_EMU32A+2,
+       EMU_SRC_ALICE_EMU32A+3,
+       EMU_SRC_ALICE_EMU32A+4,
+       EMU_SRC_ALICE_EMU32A+5,
+       EMU_SRC_ALICE_EMU32A+6,
+       EMU_SRC_ALICE_EMU32A+7,
+       EMU_SRC_ALICE_EMU32A+8,
+       EMU_SRC_ALICE_EMU32A+9,
+       EMU_SRC_ALICE_EMU32A+0xa,
+       EMU_SRC_ALICE_EMU32A+0xb,
+       EMU_SRC_ALICE_EMU32A+0xc,
+       EMU_SRC_ALICE_EMU32A+0xd,
+       EMU_SRC_ALICE_EMU32A+0xe,
+       EMU_SRC_ALICE_EMU32A+0xf,
+       EMU_SRC_ALICE_EMU32B,
+       EMU_SRC_ALICE_EMU32B+1,
+       EMU_SRC_ALICE_EMU32B+2,
+       EMU_SRC_ALICE_EMU32B+3,
+       EMU_SRC_ALICE_EMU32B+4,
+       EMU_SRC_ALICE_EMU32B+5,
+       EMU_SRC_ALICE_EMU32B+6,
+       EMU_SRC_ALICE_EMU32B+7,
+       EMU_SRC_ALICE_EMU32B+8,
+       EMU_SRC_ALICE_EMU32B+9,
+       EMU_SRC_ALICE_EMU32B+0xa,
+       EMU_SRC_ALICE_EMU32B+0xb,
+       EMU_SRC_ALICE_EMU32B+0xc,
+       EMU_SRC_ALICE_EMU32B+0xd,
+       EMU_SRC_ALICE_EMU32B+0xe,
+       EMU_SRC_ALICE_EMU32B+0xf,
+};
+
+/*
+ * Data destinations - physical EMU outputs.
+ * Each destination has an enum mixer control to choose a data source
+ */
+static unsigned int emu1010_output_dst[] = {
+       EMU_DST_DOCK_DAC1_LEFT1, /* 0 */
+       EMU_DST_DOCK_DAC1_RIGHT1, /* 1 */
+       EMU_DST_DOCK_DAC2_LEFT1, /* 2 */
+       EMU_DST_DOCK_DAC2_RIGHT1, /* 3 */
+       EMU_DST_DOCK_DAC3_LEFT1, /* 4 */
+       EMU_DST_DOCK_DAC3_RIGHT1, /* 5 */
+       EMU_DST_DOCK_DAC4_LEFT1, /* 6 */
+       EMU_DST_DOCK_DAC4_RIGHT1, /* 7 */
+       EMU_DST_DOCK_PHONES_LEFT1, /* 8 */
+       EMU_DST_DOCK_PHONES_RIGHT1, /* 9 */
+       EMU_DST_DOCK_SPDIF_LEFT1, /* 10 */
+       EMU_DST_DOCK_SPDIF_RIGHT1, /* 11 */
+       EMU_DST_HANA_SPDIF_LEFT1, /* 12 */
+       EMU_DST_HANA_SPDIF_RIGHT1, /* 13 */
+       EMU_DST_HAMOA_DAC_LEFT1, /* 14 */
+       EMU_DST_HAMOA_DAC_RIGHT1, /* 15 */
+       EMU_DST_HANA_ADAT, /* 16 */
+       EMU_DST_HANA_ADAT+1, /* 17 */
+       EMU_DST_HANA_ADAT+2, /* 18 */
+       EMU_DST_HANA_ADAT+3, /* 19 */
+       EMU_DST_HANA_ADAT+4, /* 20 */
+       EMU_DST_HANA_ADAT+5, /* 21 */
+       EMU_DST_HANA_ADAT+6, /* 22 */
+       EMU_DST_HANA_ADAT+7, /* 23 */
+};
+
+/* 1616(m) cardbus */
+static unsigned int emu1616_output_dst[] = {
+       EMU_DST_DOCK_DAC1_LEFT1,
+       EMU_DST_DOCK_DAC1_RIGHT1,
+       EMU_DST_DOCK_DAC2_LEFT1,
+       EMU_DST_DOCK_DAC2_RIGHT1,
+       EMU_DST_DOCK_DAC3_LEFT1,
+       EMU_DST_DOCK_DAC3_RIGHT1,
+       EMU_DST_MDOCK_SPDIF_LEFT1,
+       EMU_DST_MDOCK_SPDIF_RIGHT1,
+       EMU_DST_MDOCK_ADAT,
+       EMU_DST_MDOCK_ADAT+1,
+       EMU_DST_MDOCK_ADAT+2,
+       EMU_DST_MDOCK_ADAT+3,
+       EMU_DST_MDOCK_ADAT+4,
+       EMU_DST_MDOCK_ADAT+5,
+       EMU_DST_MDOCK_ADAT+6,
+       EMU_DST_MDOCK_ADAT+7,
+       EMU_DST_MANA_DAC_LEFT,
+       EMU_DST_MANA_DAC_RIGHT,
+};
+
+/*
+ * Data destinations - HANA outputs going to Alice2 (audigy) for
+ *   capture (EMU32 + I2S links)
+ * Each destination has an enum mixer control to choose a data source
+ */
+static unsigned int emu1010_input_dst[] = {
+       EMU_DST_ALICE2_EMU32_0,
+       EMU_DST_ALICE2_EMU32_1,
+       EMU_DST_ALICE2_EMU32_2,
+       EMU_DST_ALICE2_EMU32_3,
+       EMU_DST_ALICE2_EMU32_4,
+       EMU_DST_ALICE2_EMU32_5,
+       EMU_DST_ALICE2_EMU32_6,
+       EMU_DST_ALICE2_EMU32_7,
+       EMU_DST_ALICE2_EMU32_8,
+       EMU_DST_ALICE2_EMU32_9,
+       EMU_DST_ALICE2_EMU32_A,
+       EMU_DST_ALICE2_EMU32_B,
+       EMU_DST_ALICE2_EMU32_C,
+       EMU_DST_ALICE2_EMU32_D,
+       EMU_DST_ALICE2_EMU32_E,
+       EMU_DST_ALICE2_EMU32_F,
+       EMU_DST_ALICE_I2S0_LEFT,
+       EMU_DST_ALICE_I2S0_RIGHT,
+       EMU_DST_ALICE_I2S1_LEFT,
+       EMU_DST_ALICE_I2S1_RIGHT,
+       EMU_DST_ALICE_I2S2_LEFT,
+       EMU_DST_ALICE_I2S2_RIGHT,
+};
+
+static int snd_emu1010_input_output_source_info(struct snd_kcontrol *kcontrol,
+                                               struct snd_ctl_elem_info *uinfo)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       char **items;
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
+               uinfo->value.enumerated.items = 49;
+               items = emu1616_src_texts;
+       } else {
+               uinfo->value.enumerated.items = 53;
+               items = emu1010_src_texts;
+       }
+       if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+               uinfo->value.enumerated.item =
+                       uinfo->value.enumerated.items - 1;
+       strcpy(uinfo->value.enumerated.name,
+              items[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int snd_emu1010_output_source_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int channel;
+
+       channel = (kcontrol->private_value) & 0xff;
+       /* Limit: emu1010_output_dst, emu->emu1010.output_source */
+       if (channel >= 24 ||
+           (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+            channel >= 18))
+               return -EINVAL;
+       ucontrol->value.enumerated.item[0] = emu->emu1010.output_source[channel];
+       return 0;
+}
+
+static int snd_emu1010_output_source_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int val;
+       unsigned int channel;
+
+       val = ucontrol->value.enumerated.item[0];
+       if (val >= 53 ||
+           (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+            val >= 49))
+               return -EINVAL;
+       channel = (kcontrol->private_value) & 0xff;
+       /* Limit: emu1010_output_dst, emu->emu1010.output_source */
+       if (channel >= 24 ||
+           (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+            channel >= 18))
+               return -EINVAL;
+       if (emu->emu1010.output_source[channel] == val)
+               return 0;
+       emu->emu1010.output_source[channel] = val;
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       emu1616_output_dst[channel], emu1616_src_regs[val]);
+       else
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       emu1010_output_dst[channel], emu1010_src_regs[val]);
+       return 1;
+}
+
+static int snd_emu1010_input_source_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int channel;
+
+       channel = (kcontrol->private_value) & 0xff;
+       /* Limit: emu1010_input_dst, emu->emu1010.input_source */
+       if (channel >= 22)
+               return -EINVAL;
+       ucontrol->value.enumerated.item[0] = emu->emu1010.input_source[channel];
+       return 0;
+}
+
+static int snd_emu1010_input_source_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int val;
+       unsigned int channel;
+
+       val = ucontrol->value.enumerated.item[0];
+       if (val >= 53 ||
+           (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+            val >= 49))
+               return -EINVAL;
+       channel = (kcontrol->private_value) & 0xff;
+       /* Limit: emu1010_input_dst, emu->emu1010.input_source */
+       if (channel >= 22)
+               return -EINVAL;
+       if (emu->emu1010.input_source[channel] == val)
+               return 0;
+       emu->emu1010.input_source[channel] = val;
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       emu1010_input_dst[channel], emu1616_src_regs[val]);
+       else
+               snd_emu1010_fpga_link_dst_src_write(emu,
+                       emu1010_input_dst[channel], emu1010_src_regs[val]);
+       return 1;
+}
+
+#define EMU1010_SOURCE_OUTPUT(xname,chid) \
+{                                                              \
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
+       .info =  snd_emu1010_input_output_source_info,          \
+       .get =   snd_emu1010_output_source_get,                 \
+       .put =   snd_emu1010_output_source_put,                 \
+       .private_value = chid                                   \
+}
+
+static struct snd_kcontrol_new snd_emu1010_output_enum_ctls[] __devinitdata = {
+       EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Enum", 0),
+       EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Enum", 1),
+       EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Enum", 2),
+       EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Enum", 3),
+       EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Enum", 4),
+       EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Enum", 5),
+       EMU1010_SOURCE_OUTPUT("Dock DAC4 Left Playback Enum", 6),
+       EMU1010_SOURCE_OUTPUT("Dock DAC4 Right Playback Enum", 7),
+       EMU1010_SOURCE_OUTPUT("Dock Phones Left Playback Enum", 8),
+       EMU1010_SOURCE_OUTPUT("Dock Phones Right Playback Enum", 9),
+       EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Enum", 0xa),
+       EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Enum", 0xb),
+       EMU1010_SOURCE_OUTPUT("1010 SPDIF Left Playback Enum", 0xc),
+       EMU1010_SOURCE_OUTPUT("1010 SPDIF Right Playback Enum", 0xd),
+       EMU1010_SOURCE_OUTPUT("0202 DAC Left Playback Enum", 0xe),
+       EMU1010_SOURCE_OUTPUT("0202 DAC Right Playback Enum", 0xf),
+       EMU1010_SOURCE_OUTPUT("1010 ADAT 0 Playback Enum", 0x10),
+       EMU1010_SOURCE_OUTPUT("1010 ADAT 1 Playback Enum", 0x11),
+       EMU1010_SOURCE_OUTPUT("1010 ADAT 2 Playback Enum", 0x12),
+       EMU1010_SOURCE_OUTPUT("1010 ADAT 3 Playback Enum", 0x13),
+       EMU1010_SOURCE_OUTPUT("1010 ADAT 4 Playback Enum", 0x14),
+       EMU1010_SOURCE_OUTPUT("1010 ADAT 5 Playback Enum", 0x15),
+       EMU1010_SOURCE_OUTPUT("1010 ADAT 6 Playback Enum", 0x16),
+       EMU1010_SOURCE_OUTPUT("1010 ADAT 7 Playback Enum", 0x17),
+};
+
+
+/* 1616(m) cardbus */
+static struct snd_kcontrol_new snd_emu1616_output_enum_ctls[] __devinitdata = {
+       EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Enum", 0),
+       EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Enum", 1),
+       EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Enum", 2),
+       EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Enum", 3),
+       EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Enum", 4),
+       EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Enum", 5),
+       EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Enum", 6),
+       EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Enum", 7),
+       EMU1010_SOURCE_OUTPUT("Dock ADAT 0 Playback Enum", 8),
+       EMU1010_SOURCE_OUTPUT("Dock ADAT 1 Playback Enum", 9),
+       EMU1010_SOURCE_OUTPUT("Dock ADAT 2 Playback Enum", 0xa),
+       EMU1010_SOURCE_OUTPUT("Dock ADAT 3 Playback Enum", 0xb),
+       EMU1010_SOURCE_OUTPUT("Dock ADAT 4 Playback Enum", 0xc),
+       EMU1010_SOURCE_OUTPUT("Dock ADAT 5 Playback Enum", 0xd),
+       EMU1010_SOURCE_OUTPUT("Dock ADAT 6 Playback Enum", 0xe),
+       EMU1010_SOURCE_OUTPUT("Dock ADAT 7 Playback Enum", 0xf),
+       EMU1010_SOURCE_OUTPUT("Mana DAC Left Playback Enum", 0x10),
+       EMU1010_SOURCE_OUTPUT("Mana DAC Right Playback Enum", 0x11),
+};
+
+
+#define EMU1010_SOURCE_INPUT(xname,chid) \
+{                                                              \
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
+       .info =  snd_emu1010_input_output_source_info,          \
+       .get =   snd_emu1010_input_source_get,                  \
+       .put =   snd_emu1010_input_source_put,                  \
+       .private_value = chid                                   \
+}
+
+static struct snd_kcontrol_new snd_emu1010_input_enum_ctls[] __devinitdata = {
+       EMU1010_SOURCE_INPUT("DSP 0 Capture Enum", 0),
+       EMU1010_SOURCE_INPUT("DSP 1 Capture Enum", 1),
+       EMU1010_SOURCE_INPUT("DSP 2 Capture Enum", 2),
+       EMU1010_SOURCE_INPUT("DSP 3 Capture Enum", 3),
+       EMU1010_SOURCE_INPUT("DSP 4 Capture Enum", 4),
+       EMU1010_SOURCE_INPUT("DSP 5 Capture Enum", 5),
+       EMU1010_SOURCE_INPUT("DSP 6 Capture Enum", 6),
+       EMU1010_SOURCE_INPUT("DSP 7 Capture Enum", 7),
+       EMU1010_SOURCE_INPUT("DSP 8 Capture Enum", 8),
+       EMU1010_SOURCE_INPUT("DSP 9 Capture Enum", 9),
+       EMU1010_SOURCE_INPUT("DSP A Capture Enum", 0xa),
+       EMU1010_SOURCE_INPUT("DSP B Capture Enum", 0xb),
+       EMU1010_SOURCE_INPUT("DSP C Capture Enum", 0xc),
+       EMU1010_SOURCE_INPUT("DSP D Capture Enum", 0xd),
+       EMU1010_SOURCE_INPUT("DSP E Capture Enum", 0xe),
+       EMU1010_SOURCE_INPUT("DSP F Capture Enum", 0xf),
+       EMU1010_SOURCE_INPUT("DSP 10 Capture Enum", 0x10),
+       EMU1010_SOURCE_INPUT("DSP 11 Capture Enum", 0x11),
+       EMU1010_SOURCE_INPUT("DSP 12 Capture Enum", 0x12),
+       EMU1010_SOURCE_INPUT("DSP 13 Capture Enum", 0x13),
+       EMU1010_SOURCE_INPUT("DSP 14 Capture Enum", 0x14),
+       EMU1010_SOURCE_INPUT("DSP 15 Capture Enum", 0x15),
+};
+
+
+
+#define snd_emu1010_adc_pads_info      snd_ctl_boolean_mono_info
+
+static int snd_emu1010_adc_pads_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int mask = kcontrol->private_value & 0xff;
+       ucontrol->value.integer.value[0] = (emu->emu1010.adc_pads & mask) ? 1 : 0;
+       return 0;
+}
+
+static int snd_emu1010_adc_pads_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int mask = kcontrol->private_value & 0xff;
+       unsigned int val, cache;
+       val = ucontrol->value.integer.value[0];
+       cache = emu->emu1010.adc_pads;
+       if (val == 1) 
+               cache = cache | mask;
+       else
+               cache = cache & ~mask;
+       if (cache != emu->emu1010.adc_pads) {
+               snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, cache );
+               emu->emu1010.adc_pads = cache;
+       }
+
+       return 0;
+}
+
+
+
+#define EMU1010_ADC_PADS(xname,chid) \
+{                                                              \
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
+       .info =  snd_emu1010_adc_pads_info,                     \
+       .get =   snd_emu1010_adc_pads_get,                      \
+       .put =   snd_emu1010_adc_pads_put,                      \
+       .private_value = chid                                   \
+}
+
+static struct snd_kcontrol_new snd_emu1010_adc_pads[] __devinitdata = {
+       EMU1010_ADC_PADS("ADC1 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD1),
+       EMU1010_ADC_PADS("ADC2 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD2),
+       EMU1010_ADC_PADS("ADC3 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD3),
+       EMU1010_ADC_PADS("ADC1 14dB PAD 0202 Capture Switch", EMU_HANA_0202_ADC_PAD1),
+};
+
+#define snd_emu1010_dac_pads_info      snd_ctl_boolean_mono_info
+
+static int snd_emu1010_dac_pads_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int mask = kcontrol->private_value & 0xff;
+       ucontrol->value.integer.value[0] = (emu->emu1010.dac_pads & mask) ? 1 : 0;
+       return 0;
+}
+
+static int snd_emu1010_dac_pads_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int mask = kcontrol->private_value & 0xff;
+       unsigned int val, cache;
+       val = ucontrol->value.integer.value[0];
+       cache = emu->emu1010.dac_pads;
+       if (val == 1) 
+               cache = cache | mask;
+       else
+               cache = cache & ~mask;
+       if (cache != emu->emu1010.dac_pads) {
+               snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, cache );
+               emu->emu1010.dac_pads = cache;
+       }
+
+       return 0;
+}
+
+
+
+#define EMU1010_DAC_PADS(xname,chid) \
+{                                                              \
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
+       .info =  snd_emu1010_dac_pads_info,                     \
+       .get =   snd_emu1010_dac_pads_get,                      \
+       .put =   snd_emu1010_dac_pads_put,                      \
+       .private_value = chid                                   \
+}
+
+static struct snd_kcontrol_new snd_emu1010_dac_pads[] __devinitdata = {
+       EMU1010_DAC_PADS("DAC1 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD1),
+       EMU1010_DAC_PADS("DAC2 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD2),
+       EMU1010_DAC_PADS("DAC3 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD3),
+       EMU1010_DAC_PADS("DAC4 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD4),
+       EMU1010_DAC_PADS("DAC1 0202 14dB PAD Playback Switch", EMU_HANA_0202_DAC_PAD1),
+};
+
+
+static int snd_emu1010_internal_clock_info(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_info *uinfo)
+{
+       static char *texts[4] = {
+               "44100", "48000", "SPDIF", "ADAT"
+       };
+               
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 4;
+       if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+               uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       return 0;
+       
+       
+}
+
+static int snd_emu1010_internal_clock_get(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+
+       ucontrol->value.enumerated.item[0] = emu->emu1010.internal_clock;
+       return 0;
+}
+
+static int snd_emu1010_internal_clock_put(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int val;
+       int change = 0;
+
+       val = ucontrol->value.enumerated.item[0] ;
+       /* Limit: uinfo->value.enumerated.items = 4; */
+       if (val >= 4)
+               return -EINVAL;
+       change = (emu->emu1010.internal_clock != val);
+       if (change) {
+               emu->emu1010.internal_clock = val;
+               switch (val) {
+               case 0:
+                       /* 44100 */
+                       /* Mute all */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
+                       /* Default fallback clock 48kHz */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_44_1K );
+                       /* Word Clock source, Internal 44.1kHz x1 */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
+                       EMU_HANA_WCLOCK_INT_44_1K | EMU_HANA_WCLOCK_1X );
+                       /* Set LEDs on Audio Dock */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,
+                               EMU_HANA_DOCK_LEDS_2_44K | EMU_HANA_DOCK_LEDS_2_LOCK );
+                       /* Allow DLL to settle */
+                       msleep(10);
+                       /* Unmute all */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+                       break;
+               case 1:
+                       /* 48000 */
+                       /* Mute all */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
+                       /* Default fallback clock 48kHz */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );
+                       /* Word Clock source, Internal 48kHz x1 */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
+                               EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_1X );
+                       /* Set LEDs on Audio Dock */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,
+                               EMU_HANA_DOCK_LEDS_2_48K | EMU_HANA_DOCK_LEDS_2_LOCK );
+                       /* Allow DLL to settle */
+                       msleep(10);
+                       /* Unmute all */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+                       break;
+                       
+               case 2: /* Take clock from S/PDIF IN */
+                       /* Mute all */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
+                       /* Default fallback clock 48kHz */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );
+                       /* Word Clock source, sync to S/PDIF input */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
+                               EMU_HANA_WCLOCK_HANA_SPDIF_IN | EMU_HANA_WCLOCK_1X );
+                       /* Set LEDs on Audio Dock */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,
+                               EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_LOCK );
+                       /* FIXME: We should set EMU_HANA_DOCK_LEDS_2_LOCK only when clock signal is present and valid */        
+                       /* Allow DLL to settle */
+                       msleep(10);
+                       /* Unmute all */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+                       break;
+               
+               case 3:                         
+                       /* Take clock from ADAT IN */
+                       /* Mute all */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
+                       /* Default fallback clock 48kHz */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );
+                       /* Word Clock source, sync to ADAT input */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
+                               EMU_HANA_WCLOCK_HANA_ADAT_IN | EMU_HANA_WCLOCK_1X );
+                       /* Set LEDs on Audio Dock */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_LOCK );
+                       /* FIXME: We should set EMU_HANA_DOCK_LEDS_2_LOCK only when clock signal is present and valid */        
+                       /* Allow DLL to settle */
+                       msleep(10);
+                       /*   Unmute all */
+                       snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+                        
+                       
+                       break;          
+               }
+       }
+        return change;
+}
+
+static struct snd_kcontrol_new snd_emu1010_internal_clock =
+{
+       .access =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
+       .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name =         "Clock Internal Rate",
+       .count =        1,
+       .info =         snd_emu1010_internal_clock_info,
+       .get =          snd_emu1010_internal_clock_get,
+       .put =          snd_emu1010_internal_clock_put
+};
+
+static int snd_audigy_i2c_capture_source_info(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_info *uinfo)
+{
+#if 0
+       static char *texts[4] = {
+               "Unknown1", "Unknown2", "Mic", "Line"
+       };
+#endif
+       static char *texts[2] = {
+               "Mic", "Line"
+       };
+
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+       uinfo->count = 1;
+       uinfo->value.enumerated.items = 2;
+       if (uinfo->value.enumerated.item > 1)
+                uinfo->value.enumerated.item = 1;
+       strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+       return 0;
+}
+
+static int snd_audigy_i2c_capture_source_get(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+
+       ucontrol->value.enumerated.item[0] = emu->i2c_capture_source;
+       return 0;
+}
+
+static int snd_audigy_i2c_capture_source_put(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int source_id;
+       unsigned int ngain, ogain;
+       u32 gpio;
+       int change = 0;
+       unsigned long flags;
+       u32 source;
+       /* If the capture source has changed,
+        * update the capture volume from the cached value
+        * for the particular source.
+        */
+       source_id = ucontrol->value.enumerated.item[0];
+       /* Limit: uinfo->value.enumerated.items = 2; */
+       /*        emu->i2c_capture_volume */
+       if (source_id >= 2)
+               return -EINVAL;
+       change = (emu->i2c_capture_source != source_id);
+       if (change) {
+               snd_emu10k1_i2c_write(emu, ADC_MUX, 0); /* Mute input */
+               spin_lock_irqsave(&emu->emu_lock, flags);
+               gpio = inl(emu->port + A_IOCFG);
+               if (source_id==0)
+                       outl(gpio | 0x4, emu->port + A_IOCFG);
+               else
+                       outl(gpio & ~0x4, emu->port + A_IOCFG);
+               spin_unlock_irqrestore(&emu->emu_lock, flags);
+
+               ngain = emu->i2c_capture_volume[source_id][0]; /* Left */
+               ogain = emu->i2c_capture_volume[emu->i2c_capture_source][0]; /* Left */
+               if (ngain != ogain)
+                       snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCL, ((ngain) & 0xff));
+               ngain = emu->i2c_capture_volume[source_id][1]; /* Right */
+               ogain = emu->i2c_capture_volume[emu->i2c_capture_source][1]; /* Right */
+               if (ngain != ogain)
+                       snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCR, ((ngain) & 0xff));
+
+               source = 1 << (source_id + 2);
+               snd_emu10k1_i2c_write(emu, ADC_MUX, source); /* Set source */
+               emu->i2c_capture_source = source_id;
+       }
+        return change;
+}
+
+static struct snd_kcontrol_new snd_audigy_i2c_capture_source =
+{
+               .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+               .name =         "Capture Source",
+               .info =         snd_audigy_i2c_capture_source_info,
+               .get =          snd_audigy_i2c_capture_source_get,
+               .put =          snd_audigy_i2c_capture_source_put
+};
+
+static int snd_audigy_i2c_volume_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo)
+{
+       uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+       uinfo->count = 2;
+       uinfo->value.integer.min = 0;
+       uinfo->value.integer.max = 255;
+       return 0;
+}
+
+static int snd_audigy_i2c_volume_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int source_id;
+
+       source_id = kcontrol->private_value;
+       /* Limit: emu->i2c_capture_volume */
+        /*        capture_source: uinfo->value.enumerated.items = 2 */
+       if (source_id >= 2)
+               return -EINVAL;
+
+       ucontrol->value.integer.value[0] = emu->i2c_capture_volume[source_id][0];
+       ucontrol->value.integer.value[1] = emu->i2c_capture_volume[source_id][1];
+       return 0;
+}
+
+static int snd_audigy_i2c_volume_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int ogain;
+       unsigned int ngain;
+       unsigned int source_id;
+       int change = 0;
+
+       source_id = kcontrol->private_value;
+       /* Limit: emu->i2c_capture_volume */
+        /*        capture_source: uinfo->value.enumerated.items = 2 */
+       if (source_id >= 2)
+               return -EINVAL;
+       ogain = emu->i2c_capture_volume[source_id][0]; /* Left */
+       ngain = ucontrol->value.integer.value[0];
+       if (ngain > 0xff)
+               return 0;
+       if (ogain != ngain) {
+               if (emu->i2c_capture_source == source_id)
+                       snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCL, ((ngain) & 0xff) );
+               emu->i2c_capture_volume[source_id][0] = ngain;
+               change = 1;
+       }
+       ogain = emu->i2c_capture_volume[source_id][1]; /* Right */
+       ngain = ucontrol->value.integer.value[1];
+       if (ngain > 0xff)
+               return 0;
+       if (ogain != ngain) {
+               if (emu->i2c_capture_source == source_id)
+                       snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCR, ((ngain) & 0xff));
+               emu->i2c_capture_volume[source_id][1] = ngain;
+               change = 1;
+       }
+
+       return change;
+}
+
+#define I2C_VOLUME(xname,chid) \
+{                                                              \
+       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
+       .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |             \
+                 SNDRV_CTL_ELEM_ACCESS_TLV_READ,               \
+       .info =  snd_audigy_i2c_volume_info,                    \
+       .get =   snd_audigy_i2c_volume_get,                     \
+       .put =   snd_audigy_i2c_volume_put,                     \
+       .tlv = { .p = snd_audigy_db_scale2 },                   \
+       .private_value = chid                                   \
+}
+
+
+static struct snd_kcontrol_new snd_audigy_i2c_volume_ctls[] __devinitdata = {
+       I2C_VOLUME("Mic Capture Volume", 0),
+       I2C_VOLUME("Line Capture Volume", 0)
+};
+
 #if 0
 static int snd_audigy_spdif_output_rate_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
@@ -164,6 +1090,9 @@ static int snd_emu10k1_spdif_put(struct snd_kcontrol *kcontrol,
        unsigned int val;
        unsigned long flags;
 
+       /* Limit: emu->spdif_bits */
+       if (idx >= 3)
+               return -EINVAL;
        val = (ucontrol->value.iec958.status[0] << 0) |
              (ucontrol->value.iec958.status[1] << 8) |
              (ucontrol->value.iec958.status[2] << 16) |
@@ -183,7 +1112,7 @@ static struct snd_kcontrol_new snd_emu10k1_spdif_mask_control =
        .access =       SNDRV_CTL_ELEM_ACCESS_READ,
        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
-       .count =        4,
+       .count =        3,
        .info =         snd_emu10k1_spdif_info,
        .get =          snd_emu10k1_spdif_get_mask
 };
@@ -192,7 +1121,7 @@ static struct snd_kcontrol_new snd_emu10k1_spdif_control =
 {
        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-       .count =        4,
+       .count =        3,
        .info =         snd_emu10k1_spdif_info,
        .get =          snd_emu10k1_spdif_get,
        .put =          snd_emu10k1_spdif_put
@@ -638,14 +1567,7 @@ static struct snd_kcontrol_new snd_emu10k1_efx_attn_control =
        .put =          snd_emu10k1_efx_attn_put
 };
 
-static int snd_emu10k1_shared_spdif_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;
-}
+#define snd_emu10k1_shared_spdif_info  snd_ctl_boolean_mono_info
 
 static int snd_emu10k1_shared_spdif_get(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
@@ -656,6 +1578,10 @@ static int snd_emu10k1_shared_spdif_get(struct snd_kcontrol *kcontrol,
                ucontrol->value.integer.value[0] = inl(emu->port + A_IOCFG) & A_IOCFG_GPOUT0 ? 1 : 0;
        else
                ucontrol->value.integer.value[0] = inl(emu->port + HCFG) & HCFG_GPOUT0 ? 1 : 0;
+       if (emu->card_capabilities->invert_shared_spdif)
+               ucontrol->value.integer.value[0] =
+                       !ucontrol->value.integer.value[0];
+               
        return 0;
 }
 
@@ -664,13 +1590,18 @@ static int snd_emu10k1_shared_spdif_put(struct snd_kcontrol *kcontrol,
 {
        unsigned long flags;
        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-       unsigned int reg, val;
+       unsigned int reg, val, sw;
        int change = 0;
 
+       sw = ucontrol->value.integer.value[0];
+       if (emu->card_capabilities->invert_shared_spdif)
+               sw = !sw;
        spin_lock_irqsave(&emu->reg_lock, flags);
-       if (emu->audigy) {
+       if ( emu->card_capabilities->i2c_adc) {
+               /* Do nothing for Audigy 2 ZS Notebook */
+       } else if (emu->audigy) {
                reg = inl(emu->port + A_IOCFG);
-               val = ucontrol->value.integer.value[0] ? A_IOCFG_GPOUT0 : 0;
+               val = sw ? A_IOCFG_GPOUT0 : 0;
                change = (reg & A_IOCFG_GPOUT0) != val;
                if (change) {
                        reg &= ~A_IOCFG_GPOUT0;
@@ -679,7 +1610,7 @@ static int snd_emu10k1_shared_spdif_put(struct snd_kcontrol *kcontrol,
                }
        }
        reg = inl(emu->port + HCFG);
-       val = ucontrol->value.integer.value[0] ? HCFG_GPOUT0 : 0;
+       val = sw ? HCFG_GPOUT0 : 0;
        change |= (reg & HCFG_GPOUT0) != val;
        if (change) {
                reg &= ~HCFG_GPOUT0;
@@ -708,6 +1639,45 @@ static struct snd_kcontrol_new snd_audigy_shared_spdif __devinitdata =
        .put =          snd_emu10k1_shared_spdif_put
 };
 
+/* workaround for too low volume on Audigy due to 16bit/24bit conversion */
+
+#define snd_audigy_capture_boost_info  snd_ctl_boolean_mono_info
+
+static int snd_audigy_capture_boost_get(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int val;
+
+       /* FIXME: better to use a cached version */
+       val = snd_ac97_read(emu->ac97, AC97_REC_GAIN);
+       ucontrol->value.integer.value[0] = !!val;
+       return 0;
+}
+
+static int snd_audigy_capture_boost_put(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+       struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+       unsigned int val;
+
+       if (ucontrol->value.integer.value[0])
+               val = 0x0f0f;
+       else
+               val = 0;
+       return snd_ac97_update(emu->ac97, AC97_REC_GAIN, val);
+}
+
+static struct snd_kcontrol_new snd_audigy_capture_boost __devinitdata =
+{
+       .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+       .name =         "Analog Capture Boost",
+       .info =         snd_audigy_capture_boost_info,
+       .get =          snd_audigy_capture_boost_get,
+       .put =          snd_audigy_capture_boost_put
+};
+
+
 /*
  */
 static void snd_emu10k1_mixer_free_ac97(struct snd_ac97 *ac97)
@@ -759,6 +1729,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                "Master Mono Playback Volume",
                "PCM Out Path & Mute",
                "Mono Output Select",
+               "Front Playback Switch",
+               "Front Playback Volume",
                "Surround Playback Switch",
                "Surround Playback Volume",
                "Center Playback Switch",
@@ -775,6 +1747,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
        };
        static char *audigy_remove_ctls[] = {
                /* Master/PCM controls on ac97 of Audigy has no effect */
+               /* On the Audigy2 the AC97 playback is piped into
+                * the Philips ADC for 24bit capture */
                "PCM Playback Switch",
                "PCM Playback Volume",
                "Master Mono Playback Switch",
@@ -802,6 +1776,65 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                "AMic Playback Volume", "Mic Playback Volume",
                NULL
        };
+       static char *audigy_rename_ctls_i2c_adc[] = {
+               //"Analog Mix Capture Volume","OLD Analog Mix Capture Volume",
+               "Line Capture Volume", "Analog Mix Capture Volume",
+               "Wave Playback Volume", "OLD PCM Playback Volume",
+               "Wave Master Playback Volume", "Master Playback Volume",
+               "AMic Playback Volume", "Old Mic Playback Volume",
+               "CD Capture Volume", "IEC958 Optical Capture Volume",
+               NULL
+       };
+       static char *audigy_remove_ctls_i2c_adc[] = {
+               /* On the Audigy2 ZS Notebook
+                * Capture via WM8775  */
+               "Mic Capture Volume",
+               "Analog Mix Capture Volume",
+               "Aux Capture Volume",
+               "IEC958 Optical Capture Volume",
+               NULL
+       };
+       static char *audigy_remove_ctls_1361t_adc[] = {
+               /* On the Audigy2 the AC97 playback is piped into
+                * the Philips ADC for 24bit capture */
+               "PCM Playback Switch",
+               "PCM Playback Volume",
+               "Master Mono Playback Switch",
+               "Master Mono Playback Volume",
+               "Capture Source",
+               "Capture Switch",
+               "Capture Volume",
+               "Mic Capture Volume",
+               "Headphone Playback Switch",
+               "Headphone Playback Volume",
+               "3D Control - Center",
+               "3D Control - Depth",
+               "3D Control - Switch",
+               "Line2 Playback Volume",
+               "Line2 Capture Volume",
+               NULL
+       };
+       static char *audigy_rename_ctls_1361t_adc[] = {
+               "Master Playback Switch", "Master Capture Switch",
+               "Master Playback Volume", "Master Capture Volume",
+               "Wave Master Playback Volume", "Master Playback Volume",
+               "Beep Playback Switch", "Beep Capture Switch",
+               "Beep Playback Volume", "Beep Capture Volume",
+               "Phone Playback Switch", "Phone Capture Switch",
+               "Phone Playback Volume", "Phone Capture Volume",
+               "Mic Playback Switch", "Mic Capture Switch",
+               "Mic Playback Volume", "Mic Capture Volume",
+               "Line Playback Switch", "Line Capture Switch",
+               "Line Playback Volume", "Line Capture Volume",
+               "CD Playback Switch", "CD Capture Switch",
+               "CD Playback Volume", "CD Capture Volume",
+               "Aux Playback Switch", "Aux Capture Switch",
+               "Aux Playback Volume", "Aux Capture Volume",
+               "Video Playback Switch", "Video Capture Switch",
+               "Video Playback Volume", "Video Capture Volume",
+
+               NULL
+       };
 
        if (emu->card_capabilities->ac97_chip) {
                struct snd_ac97_bus *pbus;
@@ -829,10 +1862,13 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                }
                if (emu->audigy) {
                        /* set master volume to 0 dB */
-                       snd_ac97_write(emu->ac97, AC97_MASTER, 0x0000);
+                       snd_ac97_write_cache(emu->ac97, AC97_MASTER, 0x0000);
                        /* set capture source to mic */
-                       snd_ac97_write(emu->ac97, AC97_REC_SEL, 0x0000);
-                       c = audigy_remove_ctls;
+                       snd_ac97_write_cache(emu->ac97, AC97_REC_SEL, 0x0000);
+                       if (emu->card_capabilities->adc_1361t)
+                               c = audigy_remove_ctls_1361t_adc;
+                       else 
+                               c = audigy_remove_ctls;
                } else {
                        /*
                         * Credits for cards based on STAC9758:
@@ -842,14 +1878,19 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                        if (emu->ac97->id == AC97_ID_STAC9758) {
                                emu->rear_ac97 = 1;
                                snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);
+                               snd_ac97_write_cache(emu->ac97, AC97_HEADPHONE, 0x0202);
                        }
                        /* remove unused AC97 controls */
-                       snd_ac97_write(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
-                       snd_ac97_write(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202);
+                       snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
+                       snd_ac97_write_cache(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202);
                        c = emu10k1_remove_ctls;
                }
                for (; *c; c++)
                        remove_ctl(card, *c);
+       } else if (emu->card_capabilities->i2c_adc) {
+               c = audigy_remove_ctls_i2c_adc;
+               for (; *c; c++)
+                       remove_ctl(card, *c);
        } else {
        no_ac97:
                if (emu->card_capabilities->ecard)
@@ -861,12 +1902,34 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
        }
 
        if (emu->audigy)
-               c = audigy_rename_ctls;
+               if (emu->card_capabilities->adc_1361t)
+                       c = audigy_rename_ctls_1361t_adc;
+               else if (emu->card_capabilities->i2c_adc)
+                       c = audigy_rename_ctls_i2c_adc;
+               else
+                       c = audigy_rename_ctls;
        else
                c = emu10k1_rename_ctls;
        for (; *c; c += 2)
                rename_ctl(card, c[0], c[1]);
 
+       if (emu->card_capabilities->subsystem == 0x80401102) { /* SB Live! Platinum CT4760P */
+               remove_ctl(card, "Center Playback Volume");
+               remove_ctl(card, "LFE Playback Volume");
+               remove_ctl(card, "Wave Center Playback Volume");
+               remove_ctl(card, "Wave LFE Playback Volume");
+       }
+       if (emu->card_capabilities->subsystem == 0x20071102) {  /* Audigy 4 Pro */
+               rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume");
+               rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume");
+               rename_ctl(card, "Aux2 Capture Volume", "Line3 Capture Volume");
+               rename_ctl(card, "Mic Capture Volume", "Unknown1 Capture Volume");
+               remove_ctl(card, "Headphone Playback Switch");
+               remove_ctl(card, "Headphone Playback Volume");
+               remove_ctl(card, "3D Control - Center");
+               remove_ctl(card, "3D Control - Depth");
+               remove_ctl(card, "3D Control - Switch");
+       }
        if ((kctl = emu->ctl_send_routing = snd_ctl_new1(&snd_emu10k1_send_routing_control, emu)) == NULL)
                return -ENOMEM;
        kctl->id.device = pcm_device;
@@ -959,7 +2022,7 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                        return err;
        }
 
-       if ( emu->card_capabilities->emu1212m) {
+       if (emu->card_capabilities->emu_model) {
                ;  /* Disable the snd_audigy_spdif_shared_spdif */
        } else if (emu->audigy) {
                if ((kctl = snd_ctl_new1(&snd_audigy_shared_spdif, emu)) == NULL)
@@ -983,6 +2046,98 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                if ((err = snd_p16v_mixer(emu)))
                        return err;
        }
+
+       if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
+               /* 1616(m) cardbus */
+               int i;
+
+               for (i = 0; i < ARRAY_SIZE(snd_emu1616_output_enum_ctls); i++) {
+                       err = snd_ctl_add(card,
+                               snd_ctl_new1(&snd_emu1616_output_enum_ctls[i],
+                                            emu));
+                       if (err < 0)
+                               return err;
+               }
+               for (i = 0; i < ARRAY_SIZE(snd_emu1010_input_enum_ctls); i++) {
+                       err = snd_ctl_add(card,
+                               snd_ctl_new1(&snd_emu1010_input_enum_ctls[i],
+                                            emu));
+                       if (err < 0)
+                               return err;
+               }
+               for (i = 0; i < ARRAY_SIZE(snd_emu1010_adc_pads) - 2; i++) {
+                       err = snd_ctl_add(card,
+                               snd_ctl_new1(&snd_emu1010_adc_pads[i], emu));
+                       if (err < 0)
+                               return err;
+               }
+               for (i = 0; i < ARRAY_SIZE(snd_emu1010_dac_pads) - 2; i++) {
+                       err = snd_ctl_add(card,
+                               snd_ctl_new1(&snd_emu1010_dac_pads[i], emu));
+                       if (err < 0)
+                               return err;
+               }
+               err = snd_ctl_add(card,
+                       snd_ctl_new1(&snd_emu1010_internal_clock, emu));
+               if (err < 0)
+                       return err;
+
+       } else if (emu->card_capabilities->emu_model) {
+               /* all other e-mu cards for now */
+               int i;
+
+               for (i = 0; i < ARRAY_SIZE(snd_emu1010_output_enum_ctls); i++) {
+                       err = snd_ctl_add(card,
+                               snd_ctl_new1(&snd_emu1010_output_enum_ctls[i],
+                                            emu));
+                       if (err < 0)
+                               return err;
+               }
+               for (i = 0; i < ARRAY_SIZE(snd_emu1010_input_enum_ctls); i++) {
+                       err = snd_ctl_add(card,
+                               snd_ctl_new1(&snd_emu1010_input_enum_ctls[i],
+                                            emu));
+                       if (err < 0)
+                               return err;
+               }
+               for (i = 0; i < ARRAY_SIZE(snd_emu1010_adc_pads); i++) {
+                       err = snd_ctl_add(card,
+                               snd_ctl_new1(&snd_emu1010_adc_pads[i], emu));
+                       if (err < 0)
+                               return err;
+               }
+               for (i = 0; i < ARRAY_SIZE(snd_emu1010_dac_pads); i++) {
+                       err = snd_ctl_add(card,
+                               snd_ctl_new1(&snd_emu1010_dac_pads[i], emu));
+                       if (err < 0)
+                               return err;
+               }
+               err = snd_ctl_add(card,
+                       snd_ctl_new1(&snd_emu1010_internal_clock, emu));
+               if (err < 0)
+                       return err;
+       }
+
+       if ( emu->card_capabilities->i2c_adc) {
+               int i;
+
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_audigy_i2c_capture_source, emu));
+               if (err < 0)
+                       return err;
+
+               for (i = 0; i < ARRAY_SIZE(snd_audigy_i2c_volume_ctls); i++) {
+                       err = snd_ctl_add(card, snd_ctl_new1(&snd_audigy_i2c_volume_ctls[i], emu));
+                       if (err < 0)
+                               return err;
+               }
+       }
                
+       if (emu->card_capabilities->ac97_chip && emu->audigy) {
+               err = snd_ctl_add(card, snd_ctl_new1(&snd_audigy_capture_boost,
+                                                    emu));
+               if (err < 0)
+                       return err;
+       }
+
        return 0;
 }