lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: hda: move open coded tricks into get_wcaps_channels()

Browse Source 
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Wu Fengguang
2009-08-24 09:50:46 +08:00
committed by Takashi Iwai
parent 454e134d0e
commit fd72d00846
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sound/pci/hda/hda_local.h
View File

@@ -410,6 +410,16 @@ static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid)
/* get the widget type from widget capability bits */ /* get the widget type from widget capability bits */
#define get_wcaps_type(wcaps) (((wcaps) & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT) #define get_wcaps_type(wcaps) (((wcaps) & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT)
static inline unsigned int get_wcaps_channels(u32 wcaps)
{
unsigned int chans;
chans = (wcaps & AC_WCAP_CHAN_CNT_EXT) >> 13;
chans = ((chans << 1) | 1) + 1;
return chans;
}
u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction); u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction);
int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir, int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,
unsigned int caps); unsigned int caps);

4
sound/pci/hda/hda_proc.c
View File

@@ -515,9 +515,7 @@ static void print_codec_info(struct snd_info_entry *entry,
snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid, snd_iprintf(buffer, "Node 0x%02x [%s] wcaps 0x%x:", nid,
get_wid_type_name(wid_type), wid_caps); get_wid_type_name(wid_type), wid_caps);
if (wid_caps & AC_WCAP_STEREO) { if (wid_caps & AC_WCAP_STEREO) {
unsigned int chans; unsigned int chans = get_wcaps_channels(wid_caps);
chans = (wid_caps & AC_WCAP_CHAN_CNT_EXT) >> 13;
chans = ((chans << 1) | 1) + 1;
if (chans == 2) if (chans == 2)
snd_iprintf(buffer, " Stereo"); snd_iprintf(buffer, " Stereo");
else else

3
sound/pci/hda/patch_atihdmi.c
View File

@@ -141,8 +141,7 @@ static int atihdmi_build_pcms(struct hda_codec *codec)
/* FIXME: we must check ELD and change the PCM parameters dynamically /* FIXME: we must check ELD and change the PCM parameters dynamically
*/ */
chans = get_wcaps(codec, CVT_NID); chans = get_wcaps(codec, CVT_NID);
chans = (chans & AC_WCAP_CHAN_CNT_EXT) >> 13; chans = get_wcaps_channels(chans);
chans = ((chans << 1) | 1) + 1;
info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans; info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans;
return 0; return 0;