projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] Remove xxx_t typedefs: HD-Audio codec
[deliverable/linux.git]
/
sound
/
pci
/
hda
/
hda_codec.h
diff --git
a/sound/pci/hda/hda_codec.h
b/sound/pci/hda/hda_codec.h
index 63a29a8a2860e34e092f852f92e86b81511abc65..0b5c3678889841a639535aa56744687a3b588338 100644
(file)
--- a/
sound/pci/hda/hda_codec.h
+++ b/
sound/pci/hda/hda_codec.h
@@
-79,6
+79,8
@@
enum {
#define AC_VERB_GET_GPIO_MASK 0x0f16
#define AC_VERB_GET_GPIO_DIRECTION 0x0f17
#define AC_VERB_GET_CONFIG_DEFAULT 0x0f1c
#define AC_VERB_GET_GPIO_MASK 0x0f16
#define AC_VERB_GET_GPIO_DIRECTION 0x0f17
#define AC_VERB_GET_CONFIG_DEFAULT 0x0f1c
+/* f20: AFG/MFG */
+#define AC_VERB_GET_SUBSYSTEM_ID 0x0f20
/*
* SET verbs
/*
* SET verbs
@@
-96,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
@@
-418,7
+420,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;
@@
-435,7
+437,7
@@
struct hda_bus {
/* 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;
};
/*
};
/*
@@
-479,14
+481,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 */
@@
-505,6
+507,7
@@
struct hda_pcm_stream {
struct hda_pcm {
char *name;
struct hda_pcm_stream stream[2];
struct hda_pcm {
char *name;
struct hda_pcm_stream stream[2];
+ unsigned int is_modem; /* modem codec? */
};
/* codec information */
};
/* codec information */
@@
-542,7
+545,8
@@
struct hda_codec {
/* 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;
unsigned int spdif_status; /* IEC958 status bits */
struct semaphore spdif_mutex;
unsigned int spdif_status; /* IEC958 status bits */
@@
-559,7
+563,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);
This page took
0.038343 seconds
and
5
git commands to generate.