Commit cdc69364 authored by Mark Brown's avatar Mark Brown Committed by Takashi Iwai
Browse files

ALSA: Add support for mechanical jack insertion 



Some systems support both mechanical and electrical jack detection,
allowing them to report that a jack is physically present but does
not have any functioning connections. Add a new jack type for these,
allowing user space to report faulty connections.

Thanks to Guillem Jover for the suggestion.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a53ccab3

include/linux/input.h

+1 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ struct input_absinfo { 
#define SW_MICROPHONE_INSERT	0x04  /* set = inserted */

#define SW_DOCK			0x05  /* set = plugged into dock */

#define SW_LINEOUT_INSERT	0x06  /* set = inserted */

#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */

#define SW_MAX			0x0f

#define SW_CNT			(SW_MAX+1)

include/sound/jack.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ enum snd_jack_types { 
	SND_JACK_MICROPHONE	= 0x0002,

	SND_JACK_HEADSET	= SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,

	SND_JACK_LINEOUT	= 0x0004,

	SND_JACK_MECHANICAL	= 0x0008, /* If detected separately */

};



struct snd_jack {

sound/core/jack.c

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
	if (type & SND_JACK_MICROPHONE)

		input_set_capability(jack->input_dev, EV_SW,

				     SW_MICROPHONE_INSERT);

	if (type & SND_JACK_MECHANICAL)

		input_set_capability(jack->input_dev, EV_SW,

				     SW_JACK_PHYSICAL_INSERT);



	err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);

	if (err < 0)
@@ -159,6 +162,9 @@ void snd_jack_report(struct snd_jack *jack, int status) 
	if (jack->type & SND_JACK_MICROPHONE)

		input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT,

				    status & SND_JACK_MICROPHONE);

	if (jack->type & SND_JACK_MECHANICAL)

		input_report_switch(jack->input_dev, SW_JACK_PHYSICAL_INSERT,

				    status & SND_JACK_MECHANICAL);



	input_sync(jack->input_dev);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE