aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-21 10:33:22 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:29:27 -0500
commit54d174031576a2855c49611d83d4946bde81b504 (patch)
tree6bdcefaccb78bddfa1a3ea7b429e1178b479999d /sound/pci/hda/hda_codec.h
parent1b98ea4791892399d8c23c93e117567eeff38887 (diff)
[ALSA] hda-codec - Fix connection list parsing
Modules: HDA Codec driver,HDA generic driver - Fix connection list parsing (with ranged flag). - Increase the max number of connections - Introduce widget capabilities cache - Power up/down widgets at init, suspend and resume Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r--sound/pci/hda/hda_codec.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 0b5c36788898..63e26c7a2b7a 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -214,6 +214,12 @@ enum {
214#define AC_PWRST_D2SUP (1<<2) 214#define AC_PWRST_D2SUP (1<<2)
215#define AC_PWRST_D3SUP (1<<3) 215#define AC_PWRST_D3SUP (1<<3)
216 216
217/* Power state values */
218#define AC_PWRST_D0 0x00
219#define AC_PWRST_D1 0x01
220#define AC_PWRST_D2 0x02
221#define AC_PWRST_D3 0x03
222
217/* Processing capabilies */ 223/* Processing capabilies */
218#define AC_PCAP_BENIGN (1<<0) 224#define AC_PCAP_BENIGN (1<<0)
219#define AC_PCAP_NUM_COEF (0xff<<8) 225#define AC_PCAP_NUM_COEF (0xff<<8)
@@ -376,7 +382,7 @@ enum {
376}; 382};
377 383
378/* max. connections to a widget */ 384/* max. connections to a widget */
379#define HDA_MAX_CONNECTIONS 16 385#define HDA_MAX_CONNECTIONS 32
380 386
381/* max. codec address */ 387/* max. codec address */
382#define HDA_MAX_CODEC_ADDRESS 0x0f 388#define HDA_MAX_CODEC_ADDRESS 0x0f
@@ -542,6 +548,11 @@ struct hda_codec {
542 /* codec specific info */ 548 /* codec specific info */
543 void *spec; 549 void *spec;
544 550
551 /* widget capabilities cache */
552 unsigned int num_nodes;
553 hda_nid_t start_nid;
554 u32 *wcaps;
555
545 /* hash for amp access */ 556 /* hash for amp access */
546 u16 amp_hash[32]; 557 u16 amp_hash[32];
547 int num_amp_entries; 558 int num_amp_entries;