Skip to content

Commit

Permalink
[ALSA] snd_emu10k1: Added support for 14dB Attenuation PADS on DACs a…
Browse files Browse the repository at this point in the history 
…nd ADCs.

Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
  • Loading branch information
James Courtier-Dutton authored and Jaroslav Kysela committed Feb 9, 2007
1 parent 6add0f4 commit 9148cc5
Show file tree
Hide file tree
Showing 3 changed files with 209 additions and 65 deletions.
29 changes: 22 additions & 7 deletions include/sound/emu10k1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@
#define EMU_HANA_OPTICAL_OUT_SPDIF 0x00
#define EMU_HANA_OPTICAL_OUT_ADAT 0x02

#define EMU_HANA_MIDI 0x0c /* 000000x 1 bit Control MIDI */
#define EMU_HANA_MIDI_IN 0x0c /* 000000x 1 bit Control MIDI */
#define EMU_HANA_MIDI_IN_FROM_HAMOA 0x00 /* HAMOA MIDI in to Alice 2 MIDI B */
#define EMU_HANA_MIDI_IN_FROM_DOCK 0x01 /* Audio Dock MIDI in to Alice 2 MIDI B */

Expand All @@ -1000,10 +1000,11 @@
#define EMU_HANA_DOCK_LEDS_3_MANUAL_CLIP 0x10 /* Manual Clip detection */
#define EMU_HANA_DOCK_LEDS_3_MANUAL_SIGNAL 0x20 /* Manual Signal detection */

#define EMU_HANA_DOCK_PADS 0x10 /* 0000xxx 3 bit Audio Dock ADC 14dB pads */
#define EMU_HANA_DOCK_PAD1 0x01 /* 14dB Attenuation on ADC 1 */
#define EMU_HANA_DOCK_PAD2 0x02 /* 14dB Attenuation on ADC 2 */
#define EMU_HANA_DOCK_PAD3 0x04 /* 14dB Attenuation on ADC 3 */
#define EMU_HANA_ADC_PADS 0x10 /* 0000xxx 3 bit Audio Dock ADC 14dB pads */
#define EMU_HANA_DOCK_ADC_PAD1 0x01 /* 14dB Attenuation on Audio Dock ADC 1 */
#define EMU_HANA_DOCK_ADC_PAD2 0x02 /* 14dB Attenuation on Audio Dock ADC 2 */
#define EMU_HANA_DOCK_ADC_PAD3 0x04 /* 14dB Attenuation on Audio Dock ADC 3 */
#define EMU_HANA_0202_ADC_PAD1 0x08 /* 14dB Attenuation on 0202 ADC 1 */

#define EMU_HANA_DOCK_MISC 0x11 /* 0xxxxxx 6 bit Audio Dock misc bits */
#define EMU_HANA_DOCK_DAC1_MUTE 0x01 /* DAC 1 Mute */
Expand All @@ -1015,8 +1016,20 @@
#define EMU_HANA_DOCK_PHONES_192_DAC3 0x20 /* DAC 3 Headphones source at 192kHz */
#define EMU_HANA_DOCK_PHONES_192_DAC4 0x30 /* DAC 4 Headphones source at 192kHz */

#define EMU_HANA_UNKNOWN12 0x12 /* 0xxxxxx 6 bit Unknown12 */
#define EMU_HANA_UNKNOWN13 0x13 /* 0xxxxxx 6 bit Unknown13 */
#define EMU_HANA_MIDI_OUT 0x12 /* 00xxxxx 5 bit Source for each MIDI out port */
#define EMU_HANA_MIDI_OUT_0202 0x01 /* 0202 MIDI from Alice 2. 0 = A, 1 = B */
#define EMU_HANA_MIDI_OUT_DOCK1 0x02 /* Audio Dock MIDI1 front, from Alice 2. 0 = A, 1 = B */
#define EMU_HANA_MIDI_OUT_DOCK2 0x04 /* Audio Dock MIDI2 rear, from Alice 2. 0 = A, 1 = B */
#define EMU_HANA_MIDI_OUT_SYNC2 0x08 /* Sync card. Not the actual MIDI out jack. 0 = A, 1 = B */
#define EMU_HANA_MIDI_OUT_LOOP 0x10 /* 0 = bits (3:0) normal. 1 = MIDI loopback enabled. */

#define EMU_HANA_DAC_PADS 0x13 /* 00xxxxx 5 bit DAC 14dB attenuation pads */
#define EMU_HANA_DOCK_DAC_PAD1 0x01 /* 14dB Attenuation on AudioDock DAC 1. Left and Right */
#define EMU_HANA_DOCK_DAC_PAD2 0x02 /* 14dB Attenuation on AudioDock DAC 2. Left and Right */
#define EMU_HANA_DOCK_DAC_PAD3 0x04 /* 14dB Attenuation on AudioDock DAC 3. Left and Right */
#define EMU_HANA_DOCK_DAC_PAD4 0x08 /* 14dB Attenuation on AudioDock DAC 4. Left and Right */
#define EMU_HANA_0202_DAC_PAD1 0x10 /* 14dB Attenuation on 0202 DAC 1. Left and Right */

/* 0x14 - 0x1f Unused R/W registers */
#define EMU_HANA_IRQ_STATUS 0x20 /* 000xxxx 4 bits IRQ Status */
#if 0 /* Already defined for reg 0x09 IRQ_ENABLE */
Expand Down Expand Up @@ -1377,6 +1390,8 @@ struct snd_emu_chip_details {
struct snd_emu1010 {
unsigned int output_source[64];
unsigned int input_source[64];
unsigned int adc_pads; /* bit mask */
unsigned int dac_pads; /* bit mask */
};

struct snd_emu10k1 {
Expand Down
29 changes: 17 additions & 12 deletions sound/pci/emu10k1/emu10k1_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,25 +725,27 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp );
/* ADAT input. */
snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x01 );
snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_PADS, &tmp );
snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp );
/* Set no attenuation on Audio Dock pads. */
snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PADS, 0x00 );
snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00 );
emu->emu1010.adc_pads = 0x00;
snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp );
/* Unmute Audio dock DACs, Headphone source DAC-4. */
snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30 );
snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12 );
snd_emu1010_fpga_read(emu, EMU_HANA_UNKNOWN13, &tmp );
/* Unknown. */
snd_emu1010_fpga_write(emu, EMU_HANA_UNKNOWN13, 0x0f );
snd_emu1010_fpga_read(emu, EMU_HANA_DAC_PADS, &tmp );
/* DAC PADs. */
snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, 0x0f );
emu->emu1010.dac_pads = 0x0f;
snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp );
snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30 );
snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp );
/* SPDIF Format. Set Consumer mode, 24bit, copy enable */
snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10 );
/* MIDI routing */
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI, 0x19 );
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 );
/* Unknown. */
snd_emu1010_fpga_write(emu, EMU_HANA_UNKNOWN12, 0x0c );
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c );
/* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); // IRQ Enable: All on */
/* IRQ Enable: All off */
snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00 );
Expand Down Expand Up @@ -880,10 +882,10 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
/* Initial boot complete. Now patches */

snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp );
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI, 0x19 ); /* MIDI Route */
snd_emu1010_fpga_write(emu, EMU_HANA_UNKNOWN12, 0x0c ); /* Unknown */
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI, 0x19 ); /* MIDI Route */
snd_emu1010_fpga_write(emu, EMU_HANA_UNKNOWN12, 0x0c ); /* Unknown */
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 ); /* MIDI Route */
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c ); /* Unknown */
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 ); /* MIDI Route */
snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c ); /* Unknown */
snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp );
snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10 ); /* SPDIF Format spdif (or 0x11 for aes/ebu) */

Expand All @@ -902,7 +904,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
if ((err = snd_emu1010_load_firmware(emu, dock_filename)) != 0) {
return err;
}
snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0 );
snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg );
snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS=0x%x\n",reg);
Expand All @@ -915,6 +916,10 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
return 0;
return -ENODEV;
}
snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp );
snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2 );
snd_printk("Audio Dock ver:%d.%d\n",tmp ,tmp2);
}
#if 0
snd_emu1010_fpga_link_dst_src_write(emu,
Expand Down
216 changes: 170 additions & 46 deletions sound/pci/emu10k1/emumixer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,30 +315,30 @@ static int snd_emu1010_input_source_put(struct snd_kcontrol *kcontrol,
}

static struct snd_kcontrol_new snd_emu1010_output_enum_ctls[] __devinitdata = {
EMU1010_SOURCE_OUTPUT("Playback Dock DAC1 Left", 0),
EMU1010_SOURCE_OUTPUT("Playback Dock DAC1 Right", 1),
EMU1010_SOURCE_OUTPUT("Playback Dock DAC2 Left", 2),
EMU1010_SOURCE_OUTPUT("Playback Dock DAC2 Right", 3),
EMU1010_SOURCE_OUTPUT("Playback Dock DAC3 Left", 4),
EMU1010_SOURCE_OUTPUT("Playback Dock DAC3 Right", 5),
EMU1010_SOURCE_OUTPUT("Playback Dock DAC4 Left", 6),
EMU1010_SOURCE_OUTPUT("Playback Dock DAC4 Right", 7),
EMU1010_SOURCE_OUTPUT("Playback Dock Phones Left", 8),
EMU1010_SOURCE_OUTPUT("Playback Dock Phones Right", 9),
EMU1010_SOURCE_OUTPUT("Playback Dock SPDIF Left", 0xa),
EMU1010_SOURCE_OUTPUT("Playback Dock SPDIF Right", 0xb),
EMU1010_SOURCE_OUTPUT("Playback 1010 SPDIF Left", 0xc),
EMU1010_SOURCE_OUTPUT("Playback 1010 SPDIF Right", 0xd),
EMU1010_SOURCE_OUTPUT("Playback 0202 DAC Left", 0xe),
EMU1010_SOURCE_OUTPUT("Playback 0202 DAC Right", 0xf),
EMU1010_SOURCE_OUTPUT("Playback 1010 ADAT 0", 0x10),
EMU1010_SOURCE_OUTPUT("Playback 1010 ADAT 1", 0x11),
EMU1010_SOURCE_OUTPUT("Playback 1010 ADAT 2", 0x12),
EMU1010_SOURCE_OUTPUT("Playback 1010 ADAT 3", 0x13),
EMU1010_SOURCE_OUTPUT("Playback 1010 ADAT 4", 0x14),
EMU1010_SOURCE_OUTPUT("Playback 1010 ADAT 5", 0x15),
EMU1010_SOURCE_OUTPUT("Playback 1010 ADAT 6", 0x16),
EMU1010_SOURCE_OUTPUT("Playback 1010 ADAT 7", 0x17),
EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Switch", 0),
EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Switch", 1),
EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Switch", 2),
EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Switch", 3),
EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Switch", 4),
EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Switch", 5),
EMU1010_SOURCE_OUTPUT("Dock DAC4 Left Playback Switch", 6),
EMU1010_SOURCE_OUTPUT("Dock DAC4 Right Playback Switch", 7),
EMU1010_SOURCE_OUTPUT("Dock Phones Left Playback Switch", 8),
EMU1010_SOURCE_OUTPUT("Dock Phones Right Playback Switch", 9),
EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Switch", 0xa),
EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Switch", 0xb),
EMU1010_SOURCE_OUTPUT("1010 SPDIF Left Playback Switch", 0xc),
EMU1010_SOURCE_OUTPUT("1010 SPDIF Right Playback Switch", 0xd),
EMU1010_SOURCE_OUTPUT("0202 DAC Left Playback Switch", 0xe),
EMU1010_SOURCE_OUTPUT("0202 DAC Right Playback Switch", 0xf),
EMU1010_SOURCE_OUTPUT("1010 ADAT 0 Playback Switch", 0x10),
EMU1010_SOURCE_OUTPUT("1010 ADAT 1 Playback Switch", 0x11),
EMU1010_SOURCE_OUTPUT("1010 ADAT 2 Playback Switch", 0x12),
EMU1010_SOURCE_OUTPUT("1010 ADAT 3 Playback Switch", 0x13),
EMU1010_SOURCE_OUTPUT("1010 ADAT 4 Playback Switch", 0x14),
EMU1010_SOURCE_OUTPUT("1010 ADAT 5 Playback Switch", 0x15),
EMU1010_SOURCE_OUTPUT("1010 ADAT 6 Playback Switch", 0x16),
EMU1010_SOURCE_OUTPUT("1010 ADAT 7 Playback Switch", 0x17),
};

#define EMU1010_SOURCE_INPUT(xname,chid) \
Expand All @@ -352,28 +352,142 @@ static struct snd_kcontrol_new snd_emu1010_output_enum_ctls[] __devinitdata = {
}

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),
EMU1010_SOURCE_INPUT("DSP 0 Capture Switch", 0),
EMU1010_SOURCE_INPUT("DSP 1 Capture Switch", 1),
EMU1010_SOURCE_INPUT("DSP 2 Capture Switch", 2),
EMU1010_SOURCE_INPUT("DSP 3 Capture Switch", 3),
EMU1010_SOURCE_INPUT("DSP 4 Capture Switch", 4),
EMU1010_SOURCE_INPUT("DSP 5 Capture Switch", 5),
EMU1010_SOURCE_INPUT("DSP 6 Capture Switch", 6),
EMU1010_SOURCE_INPUT("DSP 7 Capture Switch", 7),
EMU1010_SOURCE_INPUT("DSP 8 Capture Switch", 8),
EMU1010_SOURCE_INPUT("DSP 9 Capture Switch", 9),
EMU1010_SOURCE_INPUT("DSP A Capture Switch", 0xa),
EMU1010_SOURCE_INPUT("DSP B Capture Switch", 0xb),
EMU1010_SOURCE_INPUT("DSP C Capture Switch", 0xc),
EMU1010_SOURCE_INPUT("DSP D Capture Switch", 0xd),
EMU1010_SOURCE_INPUT("DSP E Capture Switch", 0xe),
EMU1010_SOURCE_INPUT("DSP F Capture Switch", 0xf),
EMU1010_SOURCE_INPUT("DSP 10 Capture Switch", 0x10),
EMU1010_SOURCE_INPUT("DSP 11 Capture Switch", 0x11),
EMU1010_SOURCE_INPUT("DSP 12 Capture Switch", 0x12),
EMU1010_SOURCE_INPUT("DSP 13 Capture Switch", 0x13),
EMU1010_SOURCE_INPUT("DSP 14 Capture Switch", 0x14),
EMU1010_SOURCE_INPUT("DSP 15 Capture Switch", 0x15),
};




static int snd_emu1010_adc_pads_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_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),
};

static int snd_emu1010_dac_pads_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_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),
};

#if 0
Expand Down Expand Up @@ -1367,6 +1481,16 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *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;
}
}

return 0;
Expand Down

0 comments on commit 9148cc5

Please sign in to comment.