diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-04-28 08:31:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-04-28 08:31:31 +0200 |
| commit | 1962fcab4ee80e555bcc9d0f50e416800d474fa2 (patch) | |
| tree | 945ba95f11016871f9d5241b7da2712f9367081a /include | |
| parent | Merge branch 'for-4.2' into for-next (diff) | |
| parent | ALSA: Docs: Add documentation for Jack kcontrols (diff) | |
| download | linux-1962fcab4ee80e555bcc9d0f50e416800d474fa2.tar.xz linux-1962fcab4ee80e555bcc9d0f50e416800d474fa2.zip | |
Merge branch 'topic/jack' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/control.h | 2 | ||||
| -rw-r--r-- | include/sound/jack.h | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index 95aad6d3fd1a..21d047f229a1 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -252,7 +252,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only); * Helper functions for jack-detection controls */ struct snd_kcontrol * -snd_kctl_jack_new(const char *name, int idx, void *private_data); +snd_kctl_jack_new(const char *name, struct snd_card *card); void snd_kctl_jack_report(struct snd_card *card, struct snd_kcontrol *kctl, bool status); diff --git a/include/sound/jack.h b/include/sound/jack.h index 218235030ebc..23bede121c78 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -73,6 +73,8 @@ enum snd_jack_types { struct snd_jack { struct input_dev *input_dev; + struct list_head kctl_list; + struct snd_card *card; int registered; int type; const char *id; @@ -85,7 +87,8 @@ struct snd_jack { #ifdef CONFIG_SND_JACK int snd_jack_new(struct snd_card *card, const char *id, int type, - struct snd_jack **jack); + struct snd_jack **jack, bool initial_kctl, bool phantom_jack); +int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask); 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); @@ -93,9 +96,13 @@ int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type, void snd_jack_report(struct snd_jack *jack, int status); #else - static inline int snd_jack_new(struct snd_card *card, const char *id, int type, - struct snd_jack **jack) + struct snd_jack **jack, bool initial_kctl, bool phantom_jack) +{ + return 0; +} + +static inline int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask) { return 0; } |