* [PATCH] ALSA: Add more jack button slots
@ 2010-09-06 15:08 Mark Brown
2010-09-07 6:11 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2010-09-06 15:08 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, patches, Mark Brown
Some devices have more flexible microphone detection and can detect
a wider range of buttons.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
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 d90b9fa..c140fc7 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 *);
};
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ALSA: Add more jack button slots
2010-09-06 15:08 [PATCH] ALSA: Add more jack button slots Mark Brown
@ 2010-09-07 6:11 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-09-07 6:11 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, patches
At Mon, 6 Sep 2010 16:08:56 +0100,
Mark Brown wrote:
>
> Some devices have more flexible microphone detection and can detect
> a wider range of buttons.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Applied now to topic/misc branch.
Thanks.
Takashi
> ---
> 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 d90b9fa..c140fc7 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 *);
> };
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-07 6:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-06 15:08 [PATCH] ALSA: Add more jack button slots Mark Brown
2010-09-07 6:11 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.