summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-06 16:08:56 +0100
committerTakashi Iwai <tiwai@suse.de>2010-09-07 08:04:38 +0200
commit831853c87fb7234a8650484d30993242ea9ad6d3 (patch)
tree0da59f973778d02a242cc75a6febb56ee869dbe3 /include/sound
parent68885a3ff38ed51fa02f241feb405c9922a90ee0 (diff)
downloadlinux-stable-831853c87fb7234a8650484d30993242ea9ad6d3.tar.gz
linux-stable-831853c87fb7234a8650484d30993242ea9ad6d3.tar.bz2
linux-stable-831853c87fb7234a8650484d30993242ea9ad6d3.zip
ALSA: Add more jack button slots
Some devices have more flexible microphone detection and can detect a wider range of buttons. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/jack.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h
index d90b9fa32707..c140fc7cbd3f 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -47,6 +47,9 @@ enum snd_jack_types {
SND_JACK_BTN_0 = 0x4000,
SND_JACK_BTN_1 = 0x2000,
SND_JACK_BTN_2 = 0x1000,
+ SND_JACK_BTN_3 = 0x0800,
+ SND_JACK_BTN_4 = 0x0400,
+ SND_JACK_BTN_5 = 0x0200,
};
struct snd_jack {
@@ -55,7 +58,7 @@ struct snd_jack {
int type;
const char *id;
char name[100];
- unsigned int key[3]; /* Keep in sync with definitions above */
+ unsigned int key[6]; /* Keep in sync with definitions above */
void *private_data;
void (*private_free)(struct snd_jack *);
};