Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75e0eb24 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Add inputs[] to auto_pin_cfg struct 



Added the new fields to contain all input-pins to struct auto_pin_cfg.
Unlike the existing input_pins[], this array contains all input pins
even if the multiple pins are assigned for a single role (i.e. two
front mics).  The former input_pins[] still remains for a while, but
will be removed in near future.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f3268512

sound/pci/hda/hda_codec.c

+29 −11
Original line number Diff line number Diff line
@@ -4372,6 +4372,17 @@ static void sort_pins_by_sequence(hda_nid_t *pins, short *sequences, 
}





/* add the found input-pin to the cfg->inputs[] table */

static void add_auto_cfg_input_pin(struct auto_pin_cfg *cfg, hda_nid_t nid,

				   int type)

{

	if (cfg->num_inputs < AUTO_CFG_MAX_INS) {

		cfg->inputs[cfg->num_inputs].pin = nid;

		cfg->inputs[cfg->num_inputs].type = type;

		cfg->num_inputs++;

	}

}



/*

 * Parse all pin widgets and store the useful pin nids to cfg

 *
@@ -4398,6 +4409,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, 
	short sequences_line_out[ARRAY_SIZE(cfg->line_out_pins)];

	short sequences_speaker[ARRAY_SIZE(cfg->speaker_pins)];

	short sequences_hp[ARRAY_SIZE(cfg->hp_pins)];

	int i;



	memset(cfg, 0, sizeof(*cfg));
@@ -4482,19 +4494,26 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, 
				cfg->input_pins[preferred] = nid;

			else if (!cfg->input_pins[alt])

				cfg->input_pins[alt] = nid;

			add_auto_cfg_input_pin(cfg, nid, preferred);

			break;

		}

		case AC_JACK_LINE_IN:

		case AC_JACK_LINE_IN: {

			int type;

			if (loc == AC_JACK_LOC_FRONT)

				cfg->input_pins[AUTO_PIN_FRONT_LINE] = nid;

				type = AUTO_PIN_FRONT_LINE;

			else

				cfg->input_pins[AUTO_PIN_LINE] = nid;

				type = AUTO_PIN_LINE;

			cfg->input_pins[type] = nid;

			add_auto_cfg_input_pin(cfg, nid, type);

			break;

		}

		case AC_JACK_CD:

			cfg->input_pins[AUTO_PIN_CD] = nid;

			add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_CD);

			break;

		case AC_JACK_AUX:

			cfg->input_pins[AUTO_PIN_AUX] = nid;

			add_auto_cfg_input_pin(cfg, nid, AUTO_PIN_AUX);

			break;

		case AC_JACK_SPDIF_OUT:

		case AC_JACK_DIG_OTHER_OUT:
@@ -4621,14 +4640,13 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec, 
	if (cfg->dig_outs)

		snd_printd("   dig-out=0x%x/0x%x\n",

			   cfg->dig_out_pins[0], cfg->dig_out_pins[1]);

	snd_printd("   inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x,"

		   " cd=0x%x, aux=0x%x\n",

		   cfg->input_pins[AUTO_PIN_MIC],

		   cfg->input_pins[AUTO_PIN_FRONT_MIC],

		   cfg->input_pins[AUTO_PIN_LINE],

		   cfg->input_pins[AUTO_PIN_FRONT_LINE],

		   cfg->input_pins[AUTO_PIN_CD],

		   cfg->input_pins[AUTO_PIN_AUX]);

	snd_printd("   inputs:");

	for (i = 0; i < cfg->num_inputs; i++) {

		snd_printdd(" %s=0x%x",

			    auto_pin_cfg_labels[cfg->inputs[i].type],

			    cfg->inputs[i].pin);

	}

	snd_printd("\n");

	if (cfg->dig_in_pin)

		snd_printd("   dig-in=0x%x\n", cfg->dig_in_pin);

sound/pci/hda/hda_local.h

+11 −1
Original line number Diff line number Diff line
@@ -383,6 +383,14 @@ enum { 
extern const char *auto_pin_cfg_labels[AUTO_PIN_LAST];



#define AUTO_CFG_MAX_OUTS	5

#define AUTO_CFG_MAX_INS	8



struct auto_pin_cfg_item {

	hda_nid_t pin;

	int type;

};



struct auto_pin_cfg;



struct auto_pin_cfg {

	int line_outs;
@@ -393,7 +401,9 @@ struct auto_pin_cfg { 
	int hp_outs;

	int line_out_type;	/* AUTO_PIN_XXX_OUT */

	hda_nid_t hp_pins[AUTO_CFG_MAX_OUTS];

	hda_nid_t input_pins[AUTO_PIN_LAST];

	hda_nid_t input_pins[AUTO_PIN_LAST]; /* old config; to be deprecated */

	int num_inputs;

	struct auto_pin_cfg_item inputs[AUTO_CFG_MAX_INS];

	int dig_outs;

	hda_nid_t dig_out_pins[2];

	hda_nid_t dig_in_pin;