projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] hda-codec - Add asus model to ALC861 codec
[powerpc.git]
/
sound
/
pci
/
hda
/
hda_codec.h
diff --git
a/sound/pci/hda/hda_codec.h
b/sound/pci/hda/hda_codec.h
index
1179d6c
..
c12bc4e
100644
(file)
--- a/
sound/pci/hda/hda_codec.h
+++ b/
sound/pci/hda/hda_codec.h
@@
-98,7
+98,7
@@
enum {
#define AC_VERB_SET_UNSOLICITED_ENABLE 0x708
#define AC_VERB_SET_PIN_SENSE 0x709
#define AC_VERB_SET_BEEP_CONTROL 0x70a
#define AC_VERB_SET_UNSOLICITED_ENABLE 0x708
#define AC_VERB_SET_PIN_SENSE 0x709
#define AC_VERB_SET_BEEP_CONTROL 0x70a
-#define AC_VERB_SET_EAPD_BTLENA
LB
E 0x70c
+#define AC_VERB_SET_EAPD_BTLENA
BL
E 0x70c
#define AC_VERB_SET_DIGI_CONVERT_1 0x70d
#define AC_VERB_SET_DIGI_CONVERT_2 0x70e
#define AC_VERB_SET_VOLUME_KNOB_CONTROL 0x70f
#define AC_VERB_SET_DIGI_CONVERT_1 0x70d
#define AC_VERB_SET_DIGI_CONVERT_2 0x70e
#define AC_VERB_SET_VOLUME_KNOB_CONTROL 0x70f
@@
-214,6
+214,12
@@
enum {
#define AC_PWRST_D2SUP (1<<2)
#define AC_PWRST_D3SUP (1<<3)
#define AC_PWRST_D2SUP (1<<2)
#define AC_PWRST_D3SUP (1<<3)
+/* Power state values */
+#define AC_PWRST_D0 0x00
+#define AC_PWRST_D1 0x01
+#define AC_PWRST_D2 0x02
+#define AC_PWRST_D3 0x03
+
/* Processing capabilies */
#define AC_PCAP_BENIGN (1<<0)
#define AC_PCAP_NUM_COEF (0xff<<8)
/* Processing capabilies */
#define AC_PCAP_BENIGN (1<<0)
#define AC_PCAP_NUM_COEF (0xff<<8)
@@
-376,7
+382,7
@@
enum {
};
/* max. connections to a widget */
};
/* max. connections to a widget */
-#define HDA_MAX_CONNECTIONS
16
+#define HDA_MAX_CONNECTIONS
32
/* max. codec address */
#define HDA_MAX_CODEC_ADDRESS 0x0f
/* max. codec address */
#define HDA_MAX_CODEC_ADDRESS 0x0f
@@
-420,7
+426,7
@@
struct hda_bus_template {
* A hda_bus contains several codecs in the list codec_list.
*/
struct hda_bus {
* A hda_bus contains several codecs in the list codec_list.
*/
struct hda_bus {
- s
nd_card_t
*card;
+ s
truct snd_card
*card;
/* copied from template */
void *private_data;
/* copied from template */
void *private_data;
@@
-432,12
+438,12
@@
struct hda_bus {
struct list_head codec_list;
struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
struct list_head codec_list;
struct hda_codec *caddr_tbl[HDA_MAX_CODEC_ADDRESS + 1]; /* caddr -> codec */
- struct
semaphore
cmd_mutex;
+ struct
mutex
cmd_mutex;
/* unsolicited event queue */
struct hda_bus_unsolicited *unsol;
/* unsolicited event queue */
struct hda_bus_unsolicited *unsol;
- s
nd_info_entry_t
*proc;
+ s
truct snd_info_entry
*proc;
};
/*
};
/*
@@
-473,7
+479,7
@@
struct hda_codec_ops {
struct hda_amp_info {
u32 key; /* hash key */
u32 amp_caps; /* amp capabilities */
struct hda_amp_info {
u32 key; /* hash key */
u32 amp_caps; /* amp capabilities */
- u16 vol[2]; /* current volume & mute*/
+ u16 vol[2]; /* current volume & mute
*/
u16 status; /* update flag */
u16 next; /* next link */
};
u16 status; /* update flag */
u16 next; /* next link */
};
@@
-481,14
+487,14
@@
struct hda_amp_info {
/* PCM callbacks */
struct hda_pcm_ops {
int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec,
/* PCM callbacks */
struct hda_pcm_ops {
int (*open)(struct hda_pcm_stream *info, struct hda_codec *codec,
- s
nd_pcm_substream_t
*substream);
+ s
truct snd_pcm_substream
*substream);
int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec,
int (*close)(struct hda_pcm_stream *info, struct hda_codec *codec,
- s
nd_pcm_substream_t
*substream);
+ s
truct snd_pcm_substream
*substream);
int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec,
unsigned int stream_tag, unsigned int format,
int (*prepare)(struct hda_pcm_stream *info, struct hda_codec *codec,
unsigned int stream_tag, unsigned int format,
- s
nd_pcm_substream_t
*substream);
+ s
truct snd_pcm_substream
*substream);
int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
- s
nd_pcm_substream_t
*substream);
+ s
truct snd_pcm_substream
*substream);
};
/* PCM information for each substream */
};
/* PCM information for each substream */
@@
-542,12
+548,18
@@
struct hda_codec {
/* codec specific info */
void *spec;
/* codec specific info */
void *spec;
+ /* widget capabilities cache */
+ unsigned int num_nodes;
+ hda_nid_t start_nid;
+ u32 *wcaps;
+
/* hash for amp access */
u16 amp_hash[32];
int num_amp_entries;
/* hash for amp access */
u16 amp_hash[32];
int num_amp_entries;
- struct hda_amp_info amp_info[128]; /* big enough? */
+ int amp_info_size;
+ struct hda_amp_info *amp_info;
- struct
semaphore
spdif_mutex;
+ struct
mutex
spdif_mutex;
unsigned int spdif_status; /* IEC958 status bits */
unsigned short spdif_ctls; /* SPDIF control bits */
unsigned int spdif_in_enable; /* SPDIF input enable? */
unsigned int spdif_status; /* IEC958 status bits */
unsigned short spdif_ctls; /* SPDIF control bits */
unsigned int spdif_in_enable; /* SPDIF input enable? */
@@
-562,7
+574,7
@@
enum {
/*
* constructors
*/
/*
* constructors
*/
-int snd_hda_bus_new(s
nd_card_t
*card, const struct hda_bus_template *temp,
+int snd_hda_bus_new(s
truct snd_card
*card, const struct hda_bus_template *temp,
struct hda_bus **busp);
int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
struct hda_codec **codecp);
struct hda_bus **busp);
int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
struct hda_codec **codecp);