diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:57:47 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:19:06 -0500 |
commit | c8b6bf9b5ef1f595a65a3414a5ca2588e8d993b2 (patch) | |
tree | 9c297d352b2f6056fc336fb4ccb3f1a9f4c9a102 /sound/pci/hda/hda_local.h | |
parent | 66f8df6bdd388d209c38197785148c994c8a738d (diff) |
[ALSA] Remove xxx_t typedefs: HD-Audio codec
Modules: HDA Codec driver,HDA generic driver
Remove xxx_t typedefs from the HD-Audio codec support codes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r-- | sound/pci/hda/hda_local.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 31d3c7ef5842..502290424c67 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -60,12 +60,12 @@ | |||
60 | #define HDA_CODEC_MUTE(xname, nid, xindex, direction) \ | 60 | #define HDA_CODEC_MUTE(xname, nid, xindex, direction) \ |
61 | HDA_CODEC_MUTE_MONO(xname, nid, 3, xindex, direction) | 61 | HDA_CODEC_MUTE_MONO(xname, nid, 3, xindex, direction) |
62 | 62 | ||
63 | int snd_hda_mixer_amp_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo); | 63 | int snd_hda_mixer_amp_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); |
64 | int snd_hda_mixer_amp_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol); | 64 | int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); |
65 | int snd_hda_mixer_amp_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol); | 65 | int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); |
66 | int snd_hda_mixer_amp_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo); | 66 | int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); |
67 | int snd_hda_mixer_amp_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol); | 67 | int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); |
68 | int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol); | 68 | int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); |
69 | 69 | ||
70 | /* mono switch binding multiple inputs */ | 70 | /* mono switch binding multiple inputs */ |
71 | #define HDA_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \ | 71 | #define HDA_BIND_MUTE_MONO(xname, nid, channel, indices, direction) \ |
@@ -78,8 +78,8 @@ int snd_hda_mixer_amp_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t | |||
78 | /* stereo switch binding multiple inputs */ | 78 | /* stereo switch binding multiple inputs */ |
79 | #define HDA_BIND_MUTE(xname,nid,indices,dir) HDA_BIND_MUTE_MONO(xname,nid,3,indices,dir) | 79 | #define HDA_BIND_MUTE(xname,nid,indices,dir) HDA_BIND_MUTE_MONO(xname,nid,3,indices,dir) |
80 | 80 | ||
81 | int snd_hda_mixer_bind_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol); | 81 | int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); |
82 | int snd_hda_mixer_bind_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol); | 82 | int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); |
83 | 83 | ||
84 | int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid); | 84 | int snd_hda_create_spdif_out_ctls(struct hda_codec *codec, hda_nid_t nid); |
85 | int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid); | 85 | int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid); |
@@ -97,12 +97,12 @@ struct hda_input_mux { | |||
97 | struct hda_input_mux_item items[HDA_MAX_NUM_INPUTS]; | 97 | struct hda_input_mux_item items[HDA_MAX_NUM_INPUTS]; |
98 | }; | 98 | }; |
99 | 99 | ||
100 | int snd_hda_input_mux_info(const struct hda_input_mux *imux, snd_ctl_elem_info_t *uinfo); | 100 | int snd_hda_input_mux_info(const struct hda_input_mux *imux, struct snd_ctl_elem_info *uinfo); |
101 | int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux, | 101 | int snd_hda_input_mux_put(struct hda_codec *codec, const struct hda_input_mux *imux, |
102 | snd_ctl_elem_value_t *ucontrol, hda_nid_t nid, | 102 | struct snd_ctl_elem_value *ucontrol, hda_nid_t nid, |
103 | unsigned int *cur_val); | 103 | unsigned int *cur_val); |
104 | 104 | ||
105 | /* | 105 | /* |
106 | * Channel mode helper | 106 | * Channel mode helper |
107 | */ | 107 | */ |
108 | struct hda_channel_mode { | 108 | struct hda_channel_mode { |
@@ -110,12 +110,12 @@ struct hda_channel_mode { | |||
110 | const struct hda_verb *sequence; | 110 | const struct hda_verb *sequence; |
111 | }; | 111 | }; |
112 | 112 | ||
113 | int snd_hda_ch_mode_info(struct hda_codec *codec, snd_ctl_elem_info_t *uinfo, | 113 | int snd_hda_ch_mode_info(struct hda_codec *codec, struct snd_ctl_elem_info *uinfo, |
114 | const struct hda_channel_mode *chmode, int num_chmodes); | 114 | const struct hda_channel_mode *chmode, int num_chmodes); |
115 | int snd_hda_ch_mode_get(struct hda_codec *codec, snd_ctl_elem_value_t *ucontrol, | 115 | int snd_hda_ch_mode_get(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol, |
116 | const struct hda_channel_mode *chmode, int num_chmodes, | 116 | const struct hda_channel_mode *chmode, int num_chmodes, |
117 | int max_channels); | 117 | int max_channels); |
118 | int snd_hda_ch_mode_put(struct hda_codec *codec, snd_ctl_elem_value_t *ucontrol, | 118 | int snd_hda_ch_mode_put(struct hda_codec *codec, struct snd_ctl_elem_value *ucontrol, |
119 | const struct hda_channel_mode *chmode, int num_chmodes, | 119 | const struct hda_channel_mode *chmode, int num_chmodes, |
120 | int *max_channelsp); | 120 | int *max_channelsp); |
121 | 121 | ||
@@ -138,11 +138,11 @@ struct hda_multi_out { | |||
138 | int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout); | 138 | int snd_hda_multi_out_dig_open(struct hda_codec *codec, struct hda_multi_out *mout); |
139 | int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *mout); | 139 | int snd_hda_multi_out_dig_close(struct hda_codec *codec, struct hda_multi_out *mout); |
140 | int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout, | 140 | int snd_hda_multi_out_analog_open(struct hda_codec *codec, struct hda_multi_out *mout, |
141 | snd_pcm_substream_t *substream); | 141 | struct snd_pcm_substream *substream); |
142 | int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_out *mout, | 142 | int snd_hda_multi_out_analog_prepare(struct hda_codec *codec, struct hda_multi_out *mout, |
143 | unsigned int stream_tag, | 143 | unsigned int stream_tag, |
144 | unsigned int format, | 144 | unsigned int format, |
145 | snd_pcm_substream_t *substream); | 145 | struct snd_pcm_substream *substream); |
146 | int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_out *mout); | 146 | int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, struct hda_multi_out *mout); |
147 | 147 | ||
148 | /* | 148 | /* |
@@ -170,13 +170,13 @@ struct hda_board_config { | |||
170 | }; | 170 | }; |
171 | 171 | ||
172 | int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_config *tbl); | 172 | int snd_hda_check_board_config(struct hda_codec *codec, const struct hda_board_config *tbl); |
173 | int snd_hda_add_new_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew); | 173 | int snd_hda_add_new_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew); |
174 | 174 | ||
175 | /* | 175 | /* |
176 | * power management | 176 | * power management |
177 | */ | 177 | */ |
178 | #ifdef CONFIG_PM | 178 | #ifdef CONFIG_PM |
179 | int snd_hda_resume_ctls(struct hda_codec *codec, snd_kcontrol_new_t *knew); | 179 | int snd_hda_resume_ctls(struct hda_codec *codec, struct snd_kcontrol_new *knew); |
180 | int snd_hda_resume_spdif_out(struct hda_codec *codec); | 180 | int snd_hda_resume_spdif_out(struct hda_codec *codec); |
181 | int snd_hda_resume_spdif_in(struct hda_codec *codec); | 181 | int snd_hda_resume_spdif_in(struct hda_codec *codec); |
182 | #endif | 182 | #endif |