diff options
Diffstat (limited to 'include/sound/jack.h')
-rw-r--r-- | include/sound/jack.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index f236e426a706..d90b9fa32707 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h | |||
@@ -42,6 +42,11 @@ enum snd_jack_types { | |||
42 | SND_JACK_MECHANICAL = 0x0008, /* If detected separately */ | 42 | SND_JACK_MECHANICAL = 0x0008, /* If detected separately */ |
43 | SND_JACK_VIDEOOUT = 0x0010, | 43 | SND_JACK_VIDEOOUT = 0x0010, |
44 | SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT, | 44 | SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT, |
45 | |||
46 | /* Kept separate from switches to facilitate implementation */ | ||
47 | SND_JACK_BTN_0 = 0x4000, | ||
48 | SND_JACK_BTN_1 = 0x2000, | ||
49 | SND_JACK_BTN_2 = 0x1000, | ||
45 | }; | 50 | }; |
46 | 51 | ||
47 | struct snd_jack { | 52 | struct snd_jack { |
@@ -50,6 +55,7 @@ struct snd_jack { | |||
50 | int type; | 55 | int type; |
51 | const char *id; | 56 | const char *id; |
52 | char name[100]; | 57 | char name[100]; |
58 | unsigned int key[3]; /* Keep in sync with definitions above */ | ||
53 | void *private_data; | 59 | void *private_data; |
54 | void (*private_free)(struct snd_jack *); | 60 | void (*private_free)(struct snd_jack *); |
55 | }; | 61 | }; |
@@ -59,6 +65,8 @@ struct snd_jack { | |||
59 | int snd_jack_new(struct snd_card *card, const char *id, int type, | 65 | int snd_jack_new(struct snd_card *card, const char *id, int type, |
60 | struct snd_jack **jack); | 66 | struct snd_jack **jack); |
61 | void snd_jack_set_parent(struct snd_jack *jack, struct device *parent); | 67 | void snd_jack_set_parent(struct snd_jack *jack, struct device *parent); |
68 | int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type, | ||
69 | int keytype); | ||
62 | 70 | ||
63 | void snd_jack_report(struct snd_jack *jack, int status); | 71 | void snd_jack_report(struct snd_jack *jack, int status); |
64 | 72 | ||