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

Commit 5ec16d12 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Rearrange INPUT_PIN_ATTR_* 



Put INPUT_PIN_ATTR_FRONT after INPUT_PIN_ATTR_REAR, and define
INPUT_PIN_ATTR_LAST to point to the last element.

This is a preliminary work for cleaning up Realtek auto-mic parser.
In the auto-mic implementation, the front panel is preferred over the
rear panel.  By arranging the attr definitions like in this commit, we
can simply use sort() for figuring out the priority order.

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

sound/pci/hda/hda_auto_parser.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -363,7 +363,7 @@ static const char *hda_get_input_pin_label(struct hda_codec *codec, 
{

{

	unsigned int def_conf;

	unsigned int def_conf;

	static const char * const mic_names[] = {

	static const char * const mic_names[] = {

		"Internal Mic", "Dock Mic", "Mic", "Front Mic", "Rear Mic",

		"Internal Mic", "Dock Mic", "Mic", "Rear Mic", "Front Mic"

	};

	};

	int attr;

	int attr;

sound/pci/hda/hda_auto_parser.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -51,8 +51,9 @@ enum { 
	INPUT_PIN_ATTR_INT,	/* internal mic/line-in */

	INPUT_PIN_ATTR_INT,	/* internal mic/line-in */

	INPUT_PIN_ATTR_DOCK,	/* docking mic/line-in */

	INPUT_PIN_ATTR_DOCK,	/* docking mic/line-in */

	INPUT_PIN_ATTR_NORMAL,	/* mic/line-in jack */

	INPUT_PIN_ATTR_NORMAL,	/* mic/line-in jack */

	INPUT_PIN_ATTR_FRONT,	/* mic/line-in jack in front */

	INPUT_PIN_ATTR_REAR,	/* mic/line-in jack in rear */

	INPUT_PIN_ATTR_REAR,	/* mic/line-in jack in rear */

	INPUT_PIN_ATTR_FRONT,	/* mic/line-in jack in front */

	INPUT_PIN_ATTR_LAST = INPUT_PIN_ATTR_FRONT,

};

};





int snd_hda_get_input_pin_attr(unsigned int def_conf);

int snd_hda_get_input_pin_attr(unsigned int def_conf);

sound/pci/hda/patch_via.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1913,7 +1913,7 @@ static void mangle_smart51(struct hda_codec *codec) 
	int i, j, nums, attr;

	int i, j, nums, attr;

	int pins[AUTO_CFG_MAX_INS];

	int pins[AUTO_CFG_MAX_INS];





	for (attr = INPUT_PIN_ATTR_REAR; attr >= INPUT_PIN_ATTR_NORMAL; attr--) {

	for (attr = INPUT_PIN_ATTR_LAST; attr >= INPUT_PIN_ATTR_NORMAL; attr--) {

		nums = 0;

		nums = 0;

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

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

			unsigned int def;

			unsigned int def;