提交 a1855d80 编写于 作者: T Takashi Iwai 提交者: Jaroslav Kysela

ALSA: hda - Fix digital converter proc output

AC_VERB_GET_DIGI_CONVERT_2 isn't actually implemented but reserved.
The whole SIC bits are returned from DIGI_CONVERT_1.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
Signed-off-by: NJaroslav Kysela <perex@perex.cz>
上级 28bb1711
...@@ -78,7 +78,7 @@ enum { ...@@ -78,7 +78,7 @@ enum {
#define AC_VERB_GET_BEEP_CONTROL 0x0f0a #define AC_VERB_GET_BEEP_CONTROL 0x0f0a
#define AC_VERB_GET_EAPD_BTLENABLE 0x0f0c #define AC_VERB_GET_EAPD_BTLENABLE 0x0f0c
#define AC_VERB_GET_DIGI_CONVERT_1 0x0f0d #define AC_VERB_GET_DIGI_CONVERT_1 0x0f0d
#define AC_VERB_GET_DIGI_CONVERT_2 0x0f0e #define AC_VERB_GET_DIGI_CONVERT_2 0x0f0e /* unused */
#define AC_VERB_GET_VOLUME_KNOB_CONTROL 0x0f0f #define AC_VERB_GET_VOLUME_KNOB_CONTROL 0x0f0f
/* f10-f1a: GPIO */ /* f10-f1a: GPIO */
#define AC_VERB_GET_GPIO_DATA 0x0f15 #define AC_VERB_GET_GPIO_DATA 0x0f15
......
...@@ -366,8 +366,6 @@ static void print_digital_conv(struct snd_info_buffer *buffer, ...@@ -366,8 +366,6 @@ static void print_digital_conv(struct snd_info_buffer *buffer,
{ {
unsigned int digi1 = snd_hda_codec_read(codec, nid, 0, unsigned int digi1 = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_DIGI_CONVERT_1, 0); AC_VERB_GET_DIGI_CONVERT_1, 0);
unsigned int digi2 = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_DIGI_CONVERT_2, 0);
snd_iprintf(buffer, " Digital:"); snd_iprintf(buffer, " Digital:");
if (digi1 & AC_DIG1_ENABLE) if (digi1 & AC_DIG1_ENABLE)
snd_iprintf(buffer, " Enabled"); snd_iprintf(buffer, " Enabled");
...@@ -386,7 +384,8 @@ static void print_digital_conv(struct snd_info_buffer *buffer, ...@@ -386,7 +384,8 @@ static void print_digital_conv(struct snd_info_buffer *buffer,
if (digi1 & AC_DIG1_LEVEL) if (digi1 & AC_DIG1_LEVEL)
snd_iprintf(buffer, " GenLevel"); snd_iprintf(buffer, " GenLevel");
snd_iprintf(buffer, "\n"); snd_iprintf(buffer, "\n");
snd_iprintf(buffer, " Digital category: 0x%x\n", digi2 & AC_DIG2_CC); snd_iprintf(buffer, " Digital category: 0x%x\n",
(digi1 >> 8) & AC_DIG2_CC);
} }
static const char *get_pwr_state(u32 state) static const char *get_pwr_state(u32 state)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册