diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:18 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:18 -0500 |
commit | 9e4ce164ee3a1d07580f017069c25d180b0aa785 (patch) | |
tree | 7569661eae727a5a349e4c98dba42ca681857462 /sound/core | |
parent | 627b79628f56c3deeb17dec1edf6899b49552fa4 (diff) | |
parent | f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33 (diff) |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/Kconfig | 3 | ||||
-rw-r--r-- | sound/core/Makefile | 1 | ||||
-rw-r--r-- | sound/core/ctljack.c | 56 |
3 files changed, 60 insertions, 0 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index 2dc7776e218c..ca6cdf6f9968 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig | |||
@@ -217,6 +217,9 @@ config SND_PCM_XRUN_DEBUG | |||
217 | config SND_VMASTER | 217 | config SND_VMASTER |
218 | bool | 218 | bool |
219 | 219 | ||
220 | config SND_KCTL_JACK | ||
221 | bool | ||
222 | |||
220 | config SND_DMA_SGBUF | 223 | config SND_DMA_SGBUF |
221 | def_bool y | 224 | def_bool y |
222 | depends on X86 | 225 | depends on X86 |
diff --git a/sound/core/Makefile b/sound/core/Makefile index 67c8e9336611..43d4117428ac 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile | |||
@@ -7,6 +7,7 @@ snd-y := sound.o init.o memory.o info.o control.o misc.o device.o | |||
7 | snd-$(CONFIG_ISA_DMA_API) += isadma.o | 7 | snd-$(CONFIG_ISA_DMA_API) += isadma.o |
8 | snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o | 8 | snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o |
9 | snd-$(CONFIG_SND_VMASTER) += vmaster.o | 9 | snd-$(CONFIG_SND_VMASTER) += vmaster.o |
10 | snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o | ||
10 | snd-$(CONFIG_SND_JACK) += jack.o | 11 | snd-$(CONFIG_SND_JACK) += jack.o |
11 | 12 | ||
12 | snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ | 13 | snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ |
diff --git a/sound/core/ctljack.c b/sound/core/ctljack.c new file mode 100644 index 000000000000..e4b38fbe51da --- /dev/null +++ b/sound/core/ctljack.c | |||
@@ -0,0 +1,56 @@ | |||
1 | /* | ||
2 | * Helper functions for jack-detection kcontrols | ||
3 | * | ||
4 | * Copyright (c) 2011 Takashi Iwai <tiwai@suse.de> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the Free | ||
8 | * Software Foundation; either version 2 of the License, or (at your option) | ||
9 | * any later version. | ||
10 | */ | ||
11 | |||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/export.h> | ||
14 | #include <sound/core.h> | ||
15 | #include <sound/control.h> | ||
16 | |||
17 | #define jack_detect_kctl_info snd_ctl_boolean_mono_info | ||
18 | |||
19 | static int jack_detect_kctl_get(struct snd_kcontrol *kcontrol, | ||
20 | struct snd_ctl_elem_value *ucontrol) | ||
21 | { | ||
22 | ucontrol->value.integer.value[0] = kcontrol->private_value; | ||
23 | return 0; | ||
24 | } | ||
25 | |||
26 | static struct snd_kcontrol_new jack_detect_kctl = { | ||
27 | /* name is filled later */ | ||
28 | .iface = SNDRV_CTL_ELEM_IFACE_CARD, | ||
29 | .access = SNDRV_CTL_ELEM_ACCESS_READ, | ||
30 | .info = jack_detect_kctl_info, | ||
31 | .get = jack_detect_kctl_get, | ||
32 | }; | ||
33 | |||
34 | struct snd_kcontrol * | ||
35 | snd_kctl_jack_new(const char *name, int idx, void *private_data) | ||
36 | { | ||
37 | struct snd_kcontrol *kctl; | ||
38 | kctl = snd_ctl_new1(&jack_detect_kctl, private_data); | ||
39 | if (!kctl) | ||
40 | return NULL; | ||
41 | snprintf(kctl->id.name, sizeof(kctl->id.name), "%s Jack", name); | ||
42 | kctl->id.index = idx; | ||
43 | kctl->private_value = 0; | ||
44 | return kctl; | ||
45 | } | ||
46 | EXPORT_SYMBOL_GPL(snd_kctl_jack_new); | ||
47 | |||
48 | void snd_kctl_jack_report(struct snd_card *card, | ||
49 | struct snd_kcontrol *kctl, bool status) | ||
50 | { | ||
51 | if (kctl->private_value == status) | ||
52 | return; | ||
53 | kctl->private_value = status; | ||
54 | snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id); | ||
55 | } | ||
56 | EXPORT_SYMBOL_GPL(snd_kctl_jack_report); | ||