diff options
author | Andrew Paprocki <andrew@ishiboo.com> | 2007-12-19 06:13:44 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:42 -0500 |
commit | 3982d17e3d38850908ed3400cb5a68fdc623877d (patch) | |
tree | edc3fa96f032fe767f0cbf5a83f85b853cf1b99a /sound/pci/hda/hda_codec.c | |
parent | 1697055e6c82ee5e99f459c15619605782eb7fcc (diff) |
[ALSA] hda-codec - Add missing #defines (and 1 rename) in hda_codec.h
Added AC_VERB_GET_DIGI_CONVERT_2 and renamed AC_VERB_GET_DIGI_CONVERT to
AC_VERB_GET_DIGI_CONVERT_1 to stay consistent with the SET variants. Added
AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK, AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK,
and AC_PINCAP_LR_SWAP. The missing fields were listed in the ALC883 datasheet
rev 1.3.
Signed-off-by: Andrew Paprocki <andrew@ishiboo.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 23d3befef57b..cd807194e5f1 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -1435,7 +1435,8 @@ int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid) | |||
1435 | return err; | 1435 | return err; |
1436 | } | 1436 | } |
1437 | codec->spdif_ctls = | 1437 | codec->spdif_ctls = |
1438 | snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0); | 1438 | snd_hda_codec_read(codec, nid, 0, |
1439 | AC_VERB_GET_DIGI_CONVERT_1, 0); | ||
1439 | codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls); | 1440 | codec->spdif_status = convert_to_spdif_status(codec->spdif_ctls); |
1440 | return 0; | 1441 | return 0; |
1441 | } | 1442 | } |
@@ -1482,7 +1483,7 @@ static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol, | |||
1482 | unsigned short val; | 1483 | unsigned short val; |
1483 | unsigned int sbits; | 1484 | unsigned int sbits; |
1484 | 1485 | ||
1485 | val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0); | 1486 | val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT_1, 0); |
1486 | sbits = convert_to_spdif_status(val); | 1487 | sbits = convert_to_spdif_status(val); |
1487 | ucontrol->value.iec958.status[0] = sbits; | 1488 | ucontrol->value.iec958.status[0] = sbits; |
1488 | ucontrol->value.iec958.status[1] = sbits >> 8; | 1489 | ucontrol->value.iec958.status[1] = sbits >> 8; |
@@ -1533,7 +1534,8 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid) | |||
1533 | return err; | 1534 | return err; |
1534 | } | 1535 | } |
1535 | codec->spdif_in_enable = | 1536 | codec->spdif_in_enable = |
1536 | snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_DIGI_CONVERT, 0) & | 1537 | snd_hda_codec_read(codec, nid, 0, |
1538 | AC_VERB_GET_DIGI_CONVERT_1, 0) & | ||
1537 | AC_DIG1_ENABLE; | 1539 | AC_DIG1_ENABLE; |
1538 | return 0; | 1540 | return 0; |
1539 | } | 1541 | } |