aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2009-11-10 08:53:02 -0500
committerTakashi Iwai <tiwai@suse.de>2009-11-10 10:06:57 -0500
commite3303235209c0496b490e10ab131e72a9568c153 (patch)
tree6ebac5010679a20afe06fb9362c52f12f6f55a4c /sound/pci/hda/hda_codec.c
parentfb8d1a344dbe963f16249d07eee8415e93f9f3c2 (diff)
ALSA: hda - proc - show which I/O NID is associated to PCM device
Output something like: Node 0x02 [Audio Output] wcaps 0x11: Stereo Device: name="ALC888 Analog", type="Audio", device=0, substream=0 Converter: stream=0, channel=0 ... Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r--sound/pci/hda/hda_codec.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 146f95be8737..480d1ec49c99 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2877,14 +2877,15 @@ static int set_pcm_default_values(struct hda_codec *codec,
2877 return 0; 2877 return 0;
2878} 2878}
2879 2879
2880const char *snd_hda_pcm_type_name[HDA_PCM_NTYPES] = {
2881 "Audio", "SPDIF", "HDMI", "Modem"
2882};
2883
2880/* 2884/*
2881 * get the empty PCM device number to assign 2885 * get the empty PCM device number to assign
2882 */ 2886 */
2883static int get_empty_pcm_device(struct hda_bus *bus, int type) 2887static int get_empty_pcm_device(struct hda_bus *bus, int type)
2884{ 2888{
2885 static const char *dev_name[HDA_PCM_NTYPES] = {
2886 "Audio", "SPDIF", "HDMI", "Modem"
2887 };
2888 /* audio device indices; not linear to keep compatibility */ 2889 /* audio device indices; not linear to keep compatibility */
2889 static int audio_idx[HDA_PCM_NTYPES][5] = { 2890 static int audio_idx[HDA_PCM_NTYPES][5] = {
2890 [HDA_PCM_TYPE_AUDIO] = { 0, 2, 4, 5, -1 }, 2891 [HDA_PCM_TYPE_AUDIO] = { 0, 2, 4, 5, -1 },
@@ -2903,7 +2904,7 @@ static int get_empty_pcm_device(struct hda_bus *bus, int type)
2903 if (!test_and_set_bit(audio_idx[type][i], bus->pcm_dev_bits)) 2904 if (!test_and_set_bit(audio_idx[type][i], bus->pcm_dev_bits))
2904 return audio_idx[type][i]; 2905 return audio_idx[type][i];
2905 2906
2906 snd_printk(KERN_WARNING "Too many %s devices\n", dev_name[type]); 2907 snd_printk(KERN_WARNING "Too many %s devices\n", snd_hda_pcm_type_name[type]);
2907 return -EAGAIN; 2908 return -EAGAIN;
2908} 2909}
2909 2910