Commit 1c6e555c authored by Mark Brown's avatar Mark Brown

ALSA: Rename jack switch table in preparation for button support

Avoids confusion when we have button support.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 57d54889
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/core.h> #include <sound/core.h>
static int jack_types[] = { static int jack_switch_types[] = {
SW_HEADPHONE_INSERT, SW_HEADPHONE_INSERT,
SW_MICROPHONE_INSERT, SW_MICROPHONE_INSERT,
SW_LINEOUT_INSERT, SW_LINEOUT_INSERT,
...@@ -112,10 +112,10 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, ...@@ -112,10 +112,10 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
jack->type = type; jack->type = type;
for (i = 0; i < ARRAY_SIZE(jack_types); i++) for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++)
if (type & (1 << i)) if (type & (1 << i))
input_set_capability(jack->input_dev, EV_SW, input_set_capability(jack->input_dev, EV_SW,
jack_types[i]); jack_switch_types[i]);
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,10 +163,11 @@ void snd_jack_report(struct snd_jack *jack, int status) ...@@ -163,10 +163,11 @@ void snd_jack_report(struct snd_jack *jack, int status)
if (!jack) if (!jack)
return; return;
for (i = 0; i < ARRAY_SIZE(jack_types); i++) { for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++) {
int testbit = 1 << i; int testbit = 1 << i;
if (jack->type & testbit) if (jack->type & testbit)
input_report_switch(jack->input_dev, jack_types[i], input_report_switch(jack->input_dev,
jack_switch_types[i],
status & testbit); status & testbit);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment