[alsa-devel] [PATCH 1/5] ALSA: hda - Rearrange INPUT_PIN_ATTR_*

[Takashi Iwai]

At Fri, 30 Nov 2012 00:54:27 +0100,
David Henningsson wrote:
> 
> On 11/29/2012 04:21 PM, Takashi Iwai wrote:
> > 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.
> 
> What practical effect does switching "Rear Mic" and "Front Mic" actually 
> have?

For making the front jack in a higher priority than the rear jack.
This logic is used in the later patch in the series.


Takashi

> 
> 
> 
> >
> > Signed-off-by: Takashi Iwai <tiwai at suse.de>
> > ---
> >   sound/pci/hda/hda_auto_parser.c | 2 +-
> >   sound/pci/hda/hda_auto_parser.h | 3 ++-
> >   sound/pci/hda/patch_via.c       | 2 +-
> >   3 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
> > index 4ec6dc8..90d5b39 100644
> > --- a/sound/pci/hda/hda_auto_parser.c
> > +++ b/sound/pci/hda/hda_auto_parser.c
> > @@ -375,7 +375,7 @@ static const char *hda_get_input_pin_label(struct hda_codec *codec,
> >   {
> >   	unsigned int def_conf;
> >   	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;
> >
> > diff --git a/sound/pci/hda/hda_auto_parser.h b/sound/pci/hda/hda_auto_parser.h
> > index 632ad0a..b7d7103 100644
> > --- a/sound/pci/hda/hda_auto_parser.h
> > +++ b/sound/pci/hda/hda_auto_parser.h
> > @@ -51,8 +51,9 @@ enum {
> >   	INPUT_PIN_ATTR_INT,	/* internal mic/line-in */
> >   	INPUT_PIN_ATTR_DOCK,	/* docking mic/line-in */
> >   	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_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);
> > diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
> > index 274644f..9f04f33 100644
> > --- a/sound/pci/hda/patch_via.c
> > +++ b/sound/pci/hda/patch_via.c
> > @@ -1894,7 +1894,7 @@ static void mangle_smart51(struct hda_codec *codec)
> >   	int i, j, nums, attr;
> >   	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;
> >   		for (i = 0; i < cfg->num_inputs; i++) {
> >   			unsigned int def;
> >
> 
> 
> 
> -- 
> David Henningsson, Canonical Ltd.
> https://launchpad.net/~diwic
>