diff options
Diffstat (limited to 'sound/pci/au88x0/au88x0.h')
-rw-r--r-- | sound/pci/au88x0/au88x0.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index b1197cfab3fb..745f995a20dd 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h | |||
@@ -129,21 +129,21 @@ typedef struct { | |||
129 | /* Virtual page extender stuff */ | 129 | /* Virtual page extender stuff */ |
130 | int nr_periods; | 130 | int nr_periods; |
131 | int period_bytes; | 131 | int period_bytes; |
132 | snd_pcm_sgbuf_t *sgbuf; /* DMA Scatter Gather struct */ | 132 | struct snd_sg_buf *sgbuf; /* DMA Scatter Gather struct */ |
133 | int period_real; | 133 | int period_real; |
134 | int period_virt; | 134 | int period_virt; |
135 | 135 | ||
136 | snd_pcm_substream_t *substream; | 136 | struct snd_pcm_substream *substream; |
137 | } stream_t; | 137 | } stream_t; |
138 | 138 | ||
139 | typedef struct snd_vortex vortex_t; | 139 | typedef struct snd_vortex vortex_t; |
140 | struct snd_vortex { | 140 | struct snd_vortex { |
141 | /* ALSA structs. */ | 141 | /* ALSA structs. */ |
142 | snd_card_t *card; | 142 | struct snd_card *card; |
143 | snd_pcm_t *pcm[VORTEX_PCM_LAST]; | 143 | struct snd_pcm *pcm[VORTEX_PCM_LAST]; |
144 | 144 | ||
145 | snd_rawmidi_t *rmidi; /* Legacy Midi interface. */ | 145 | struct snd_rawmidi *rmidi; /* Legacy Midi interface. */ |
146 | ac97_t *codec; | 146 | struct snd_ac97 *codec; |
147 | 147 | ||
148 | /* Stream structs. */ | 148 | /* Stream structs. */ |
149 | stream_t dma_adb[NR_ADB]; | 149 | stream_t dma_adb[NR_ADB]; |
@@ -199,7 +199,7 @@ static void vortex_adb_setsrc(vortex_t * vortex, int adbdma, | |||
199 | 199 | ||
200 | /* DMA Engines. */ | 200 | /* DMA Engines. */ |
201 | static void vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma, | 201 | static void vortex_adbdma_setbuffers(vortex_t * vortex, int adbdma, |
202 | snd_pcm_sgbuf_t * sgbuf, int size, | 202 | struct snd_sg_buf * sgbuf, int size, |
203 | int count); | 203 | int count); |
204 | static void vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, | 204 | static void vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, |
205 | int dir, int fmt, int d, | 205 | int dir, int fmt, int d, |
@@ -207,7 +207,7 @@ static void vortex_adbdma_setmode(vortex_t * vortex, int adbdma, int ie, | |||
207 | static void vortex_adbdma_setstartbuffer(vortex_t * vortex, int adbdma, int sb); | 207 | static void vortex_adbdma_setstartbuffer(vortex_t * vortex, int adbdma, int sb); |
208 | #ifndef CHIP_AU8810 | 208 | #ifndef CHIP_AU8810 |
209 | static void vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma, | 209 | static void vortex_wtdma_setbuffers(vortex_t * vortex, int wtdma, |
210 | snd_pcm_sgbuf_t * sgbuf, int size, | 210 | struct snd_sg_buf * sgbuf, int size, |
211 | int count); | 211 | int count); |
212 | static void vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int fmt, int d, /*int e, */ | 212 | static void vortex_wtdma_setmode(vortex_t * vortex, int wtdma, int ie, int fmt, int d, /*int e, */ |
213 | unsigned long offset); | 213 | unsigned long offset); |
@@ -231,9 +231,9 @@ static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma); | |||
231 | 231 | ||
232 | /* global stuff. */ | 232 | /* global stuff. */ |
233 | static void vortex_codec_init(vortex_t * vortex); | 233 | static void vortex_codec_init(vortex_t * vortex); |
234 | static void vortex_codec_write(ac97_t * codec, unsigned short addr, | 234 | static void vortex_codec_write(struct snd_ac97 * codec, unsigned short addr, |
235 | unsigned short data); | 235 | unsigned short data); |
236 | static unsigned short vortex_codec_read(ac97_t * codec, unsigned short addr); | 236 | static unsigned short vortex_codec_read(struct snd_ac97 * codec, unsigned short addr); |
237 | static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode); | 237 | static void vortex_spdif_init(vortex_t * vortex, int spdif_sr, int spdif_mode); |
238 | 238 | ||
239 | static int vortex_core_init(vortex_t * card); | 239 | static int vortex_core_init(vortex_t * card); |