diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-06 11:08:56 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-07 02:04:38 -0400 |
commit | 831853c87fb7234a8650484d30993242ea9ad6d3 (patch) | |
tree | 0da59f973778d02a242cc75a6febb56ee869dbe3 /include | |
parent | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (diff) |
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')
-rw-r--r-- | include/sound/jack.h | 5 |
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 { | |||
47 | SND_JACK_BTN_0 = 0x4000, | 47 | SND_JACK_BTN_0 = 0x4000, |
48 | SND_JACK_BTN_1 = 0x2000, | 48 | SND_JACK_BTN_1 = 0x2000, |
49 | SND_JACK_BTN_2 = 0x1000, | 49 | SND_JACK_BTN_2 = 0x1000, |
50 | SND_JACK_BTN_3 = 0x0800, | ||
51 | SND_JACK_BTN_4 = 0x0400, | ||
52 | SND_JACK_BTN_5 = 0x0200, | ||
50 | }; | 53 | }; |
51 | 54 | ||
52 | struct snd_jack { | 55 | struct snd_jack { |
@@ -55,7 +58,7 @@ struct snd_jack { | |||
55 | int type; | 58 | int type; |
56 | const char *id; | 59 | const char *id; |
57 | char name[100]; | 60 | char name[100]; |
58 | unsigned int key[3]; /* Keep in sync with definitions above */ | 61 | unsigned int key[6]; /* Keep in sync with definitions above */ |
59 | void *private_data; | 62 | void *private_data; |
60 | void (*private_free)(struct snd_jack *); | 63 | void (*private_free)(struct snd_jack *); |
61 | }; | 64 | }; |