Skip to content

Commit

Permalink
[ALSA] HDA/ALC260: 3/7 - generalise some structures
Browse files Browse the repository at this point in the history
Modules: HDA Codec driver

This patch generalises a structure added for the 'fujitsu' model but which
is potentially useful for other models as well.  It turns the
'alc260_fujitsu_adc_nids' array into 'alc260_dual_adc_nids'; for other
models which decide to utilise the dual ADC functionality there's really
no reason why they need to define their own list of ADC nids.

The 'fujitsu' model preset is adjusted accordingly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Jonathan Woithe authored and Jaroslav Kysela committed Mar 22, 2006
1 parent cdcd926 commit d57fdac
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -2419,7 +2419,10 @@ static hda_nid_t alc260_hp_adc_nids[2] = {
0x05, 0x04
};

static hda_nid_t alc260_fujitsu_adc_nids[2] = {
/* NIDs used when simultaneous access to both ADCs makes sense. Note that
* alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC.
*/
static hda_nid_t alc260_dual_adc_nids[2] = {
/* ADC0, ADC1 */
0x04, 0x05
};
Expand Down Expand Up @@ -3285,8 +3288,8 @@ static struct alc_config_preset alc260_presets[] = {
.init_verbs = { alc260_fujitsu_init_verbs },
.num_dacs = ARRAY_SIZE(alc260_dac_nids),
.dac_nids = alc260_dac_nids,
.num_adc_nids = ARRAY_SIZE(alc260_fujitsu_adc_nids),
.adc_nids = alc260_fujitsu_adc_nids,
.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
.adc_nids = alc260_dual_adc_nids,
.num_channel_mode = ARRAY_SIZE(alc260_modes),
.channel_mode = alc260_modes,
.input_mux = &alc260_fujitsu_capture_source,
Expand Down

0 comments on commit d57fdac

Please sign in to comment.