Merge branch 'topic/jack-mechanical' into to-push
This commit is contained in:
commit
a802269781
|
@ -660,6 +660,7 @@ struct input_absinfo {
|
||||||
#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */
|
#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */
|
||||||
#define SW_DOCK 0x05 /* set = plugged into dock */
|
#define SW_DOCK 0x05 /* set = plugged into dock */
|
||||||
#define SW_LINEOUT_INSERT 0x06 /* set = inserted */
|
#define SW_LINEOUT_INSERT 0x06 /* set = inserted */
|
||||||
|
#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */
|
||||||
#define SW_MAX 0x0f
|
#define SW_MAX 0x0f
|
||||||
#define SW_CNT (SW_MAX+1)
|
#define SW_CNT (SW_MAX+1)
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,7 @@ enum snd_jack_types {
|
||||||
SND_JACK_MICROPHONE = 0x0002,
|
SND_JACK_MICROPHONE = 0x0002,
|
||||||
SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
|
SND_JACK_HEADSET = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
|
||||||
SND_JACK_LINEOUT = 0x0004,
|
SND_JACK_LINEOUT = 0x0004,
|
||||||
|
SND_JACK_MECHANICAL = 0x0008, /* If detected separately */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct snd_jack {
|
struct snd_jack {
|
||||||
|
|
|
@ -109,6 +109,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
|
||||||
if (type & SND_JACK_MICROPHONE)
|
if (type & SND_JACK_MICROPHONE)
|
||||||
input_set_capability(jack->input_dev, EV_SW,
|
input_set_capability(jack->input_dev, EV_SW,
|
||||||
SW_MICROPHONE_INSERT);
|
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);
|
err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
|
@ -163,6 +166,9 @@ void snd_jack_report(struct snd_jack *jack, int status)
|
||||||
if (jack->type & SND_JACK_MICROPHONE)
|
if (jack->type & SND_JACK_MICROPHONE)
|
||||||
input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT,
|
input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT,
|
||||||
status & SND_JACK_MICROPHONE);
|
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);
|
input_sync(jack->input_dev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue