aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r--sound/pci/hda/hda_codec.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index c93f9021f452..701c2e069b10 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -679,6 +679,7 @@ struct hda_bus {
679 unsigned int response_reset:1; /* controller was reset */ 679 unsigned int response_reset:1; /* controller was reset */
680 unsigned int in_reset:1; /* during reset operation */ 680 unsigned int in_reset:1; /* during reset operation */
681 unsigned int power_keep_link_on:1; /* don't power off HDA link */ 681 unsigned int power_keep_link_on:1; /* don't power off HDA link */
682 unsigned int no_response_fallback:1; /* don't fallback at RIRB error */
682 683
683 int primary_dig_out_type; /* primary digital out PCM type */ 684 int primary_dig_out_type; /* primary digital out PCM type */
684}; 685};
@@ -930,6 +931,8 @@ enum {
930 HDA_INPUT, HDA_OUTPUT 931 HDA_INPUT, HDA_OUTPUT
931}; 932};
932 933
934/* snd_hda_codec_read/write optional flags */
935#define HDA_RW_NO_RESPONSE_FALLBACK (1 << 0)
933 936
934/* 937/*
935 * constructors 938 * constructors
@@ -945,9 +948,9 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec);
945 * low level functions 948 * low level functions
946 */ 949 */
947unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid, 950unsigned int snd_hda_codec_read(struct hda_codec *codec, hda_nid_t nid,
948 int direct, 951 int flags,
949 unsigned int verb, unsigned int parm); 952 unsigned int verb, unsigned int parm);
950int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int direct, 953int snd_hda_codec_write(struct hda_codec *codec, hda_nid_t nid, int flags,
951 unsigned int verb, unsigned int parm); 954 unsigned int verb, unsigned int parm);
952#define snd_hda_param_read(codec, nid, param) \ 955#define snd_hda_param_read(codec, nid, param) \
953 snd_hda_codec_read(codec, nid, 0, AC_VERB_PARAMETERS, param) 956 snd_hda_codec_read(codec, nid, 0, AC_VERB_PARAMETERS, param)
@@ -986,11 +989,11 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex);
986 989
987/* cached write */ 990/* cached write */
988int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid, 991int snd_hda_codec_write_cache(struct hda_codec *codec, hda_nid_t nid,
989 int direct, unsigned int verb, unsigned int parm); 992 int flags, unsigned int verb, unsigned int parm);
990void snd_hda_sequence_write_cache(struct hda_codec *codec, 993void snd_hda_sequence_write_cache(struct hda_codec *codec,
991 const struct hda_verb *seq); 994 const struct hda_verb *seq);
992int snd_hda_codec_update_cache(struct hda_codec *codec, hda_nid_t nid, 995int snd_hda_codec_update_cache(struct hda_codec *codec, hda_nid_t nid,
993 int direct, unsigned int verb, unsigned int parm); 996 int flags, unsigned int verb, unsigned int parm);
994void snd_hda_codec_resume_cache(struct hda_codec *codec); 997void snd_hda_codec_resume_cache(struct hda_codec *codec);
995/* both for cmd & amp caches */ 998/* both for cmd & amp caches */
996void snd_hda_codec_flush_cache(struct hda_codec *codec); 999void snd_hda_codec_flush_cache(struct hda_codec *codec);