summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-20 11:59:37 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-20 11:59:37 +0200
commit20406f9b67e6fde4fff4639225c7a0e5ea6eaa9b (patch)
treef87648beb18ba1fc36e93195d1e1877527563e71 /include/sound
parent5e8aa85253513b9c1ade8bd71dc341218a752a65 (diff)
parentebb812cb8df48e299b3d4ab75cbb0042384ef70d (diff)
downloadop-kernel-dev-20406f9b67e6fde4fff4639225c7a0e5ea6eaa9b.zip
op-kernel-dev-20406f9b67e6fde4fff4639225c7a0e5ea6eaa9b.tar.gz
Merge branch 'topic/jack' into for-linus
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/jack.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h
index f236e42..d90b9fa 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -42,6 +42,11 @@ enum snd_jack_types {
SND_JACK_MECHANICAL = 0x0008, /* If detected separately */
SND_JACK_VIDEOOUT = 0x0010,
SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+
+ /* Kept separate from switches to facilitate implementation */
+ SND_JACK_BTN_0 = 0x4000,
+ SND_JACK_BTN_1 = 0x2000,
+ SND_JACK_BTN_2 = 0x1000,
};
struct snd_jack {
@@ -50,6 +55,7 @@ struct snd_jack {
int type;
const char *id;
char name[100];
+ unsigned int key[3]; /* Keep in sync with definitions above */
void *private_data;
void (*private_free)(struct snd_jack *);
};
@@ -59,6 +65,8 @@ struct snd_jack {
int snd_jack_new(struct snd_card *card, const char *id, int type,
struct snd_jack **jack);
void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);
+int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
+ int keytype);
void snd_jack_report(struct snd_jack *jack, int status);
OpenPOWER on IntegriCloud