]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ALSA: Add more jack button slots
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Sep 2010 15:08:56 +0000 (16:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 7 Sep 2010 06:04:38 +0000 (08:04 +0200)
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>
include/sound/jack.h

index d90b9fa327074b9e38ad2c3b84063a3d24effd2f..c140fc7cbd3f276470a949c2701c9989e4f9a2f8 100644 (file)
@@ -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 *);
 };