diff options
author | Jie Yang <yang.jie@intel.com> | 2015-04-27 09:20:58 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-27 15:37:41 -0400 |
commit | 4e3f0dc65883cac95807549b2f7a3ac183686bcb (patch) | |
tree | 68b4c872e0a9167909730354af05cf54b061c02c /include/sound | |
parent | b8dd086674cfbfc246a5b9d7d7ff37f62350a878 (diff) |
ALSA: jack: extend snd_jack_new to support phantom jack
Dont create input devices for phantom jacks.
Here, we extend snd_jack_new() to support phantom jack creating:
pass in a bool param for [non-]phantom flag, and a bool param
initial_jack to indicate whether we need to create a kctl at
this stage.
We can also add a kctl to the jack after its created meaning we
can now integrate the HDA and ASoC jacks.
Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/jack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h index 433b13b89125..23bede121c78 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h | |||
@@ -87,7 +87,7 @@ struct snd_jack { | |||
87 | #ifdef CONFIG_SND_JACK | 87 | #ifdef CONFIG_SND_JACK |
88 | 88 | ||
89 | int snd_jack_new(struct snd_card *card, const char *id, int type, | 89 | int snd_jack_new(struct snd_card *card, const char *id, int type, |
90 | struct snd_jack **jack); | 90 | struct snd_jack **jack, bool initial_kctl, bool phantom_jack); |
91 | int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask); | 91 | int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask); |
92 | void snd_jack_set_parent(struct snd_jack *jack, struct device *parent); | 92 | void snd_jack_set_parent(struct snd_jack *jack, struct device *parent); |
93 | int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type, | 93 | int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type, |
@@ -97,7 +97,7 @@ void snd_jack_report(struct snd_jack *jack, int status); | |||
97 | 97 | ||
98 | #else | 98 | #else |
99 | static inline int snd_jack_new(struct snd_card *card, const char *id, int type, | 99 | static inline int snd_jack_new(struct snd_card *card, const char *id, int type, |
100 | struct snd_jack **jack) | 100 | struct snd_jack **jack, bool initial_kctl, bool phantom_jack) |
101 | { | 101 | { |
102 | return 0; | 102 | return 0; |
103 | } | 103 | } |