diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:48:14 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:18:45 -0500 |
commit | 3d19f804ef5f1d15fe001fc8d1ed58fac9d591fb (patch) | |
tree | e3fd21398754a5c970a2c36f745a910c17db3794 /sound/pci/cs46xx/dsp_spos.h | |
parent | af26367f69a474ed809e4a59abb5855b47daaff4 (diff) |
[ALSA] Remove xxx_t typedefs: PCI CS46xx
Modules: CS46xx driver
Remove xxx_t typedefs from the PCI CS46xx driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cs46xx/dsp_spos.h')
-rw-r--r-- | sound/pci/cs46xx/dsp_spos.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sound/pci/cs46xx/dsp_spos.h b/sound/pci/cs46xx/dsp_spos.h index 90871bf9762f..0d246bca4184 100644 --- a/sound/pci/cs46xx/dsp_spos.h +++ b/sound/pci/cs46xx/dsp_spos.h | |||
@@ -43,7 +43,7 @@ | |||
43 | /* this instruction types | 43 | /* this instruction types |
44 | needs to be reallocated when load | 44 | needs to be reallocated when load |
45 | code into DSP */ | 45 | code into DSP */ |
46 | typedef enum { | 46 | enum wide_opcode { |
47 | WIDE_FOR_BEGIN_LOOP = 0x20, | 47 | WIDE_FOR_BEGIN_LOOP = 0x20, |
48 | WIDE_FOR_BEGIN_LOOP2, | 48 | WIDE_FOR_BEGIN_LOOP2, |
49 | 49 | ||
@@ -58,7 +58,7 @@ typedef enum { | |||
58 | WIDE_TBEQ_COND_CALL1_ADDR, | 58 | WIDE_TBEQ_COND_CALL1_ADDR, |
59 | WIDE_TBEQ_NCOND_GOTOI_ADDR, | 59 | WIDE_TBEQ_NCOND_GOTOI_ADDR, |
60 | WIDE_TBEQ_NCOND_CALL1_ADDR, | 60 | WIDE_TBEQ_NCOND_CALL1_ADDR, |
61 | } wide_opcode_t; | 61 | }; |
62 | 62 | ||
63 | /* SAMPLE segment */ | 63 | /* SAMPLE segment */ |
64 | #define VARI_DECIMATE_BUF1 0x0000 | 64 | #define VARI_DECIMATE_BUF1 0x0000 |
@@ -186,7 +186,8 @@ typedef enum { | |||
186 | #define SP_SPDOUT_CONTROL 0x804D | 186 | #define SP_SPDOUT_CONTROL 0x804D |
187 | #define SP_SPDOUT_CSUV 0x808E | 187 | #define SP_SPDOUT_CSUV 0x808E |
188 | 188 | ||
189 | static inline u8 _wrap_all_bits (u8 val) { | 189 | static inline u8 _wrap_all_bits (u8 val) |
190 | { | ||
190 | u8 wrapped; | 191 | u8 wrapped; |
191 | 192 | ||
192 | /* wrap all 8 bits */ | 193 | /* wrap all 8 bits */ |
@@ -201,11 +202,10 @@ static inline u8 _wrap_all_bits (u8 val) { | |||
201 | ((val & 0x80) >> 7); | 202 | ((val & 0x80) >> 7); |
202 | 203 | ||
203 | return wrapped; | 204 | return wrapped; |
204 | |||
205 | } | 205 | } |
206 | 206 | ||
207 | 207 | static inline void cs46xx_dsp_spos_update_scb (struct snd_cs46xx * chip, | |
208 | static inline void cs46xx_dsp_spos_update_scb (cs46xx_t * chip,dsp_scb_descriptor_t * scb) | 208 | struct dsp_scb_descriptor * scb) |
209 | { | 209 | { |
210 | /* update nextSCB and subListPtr in SCB */ | 210 | /* update nextSCB and subListPtr in SCB */ |
211 | snd_cs46xx_poke(chip, | 211 | snd_cs46xx_poke(chip, |
@@ -214,8 +214,10 @@ static inline void cs46xx_dsp_spos_update_scb (cs46xx_t * chip,dsp_scb_descripto | |||
214 | (scb->next_scb_ptr->address)); | 214 | (scb->next_scb_ptr->address)); |
215 | } | 215 | } |
216 | 216 | ||
217 | static inline void cs46xx_dsp_scb_set_volume (cs46xx_t * chip,dsp_scb_descriptor_t * scb, | 217 | static inline void cs46xx_dsp_scb_set_volume (struct snd_cs46xx * chip, |
218 | u16 left,u16 right) { | 218 | struct dsp_scb_descriptor * scb, |
219 | u16 left, u16 right) | ||
220 | { | ||
219 | unsigned int val = ((0xffff - left) << 16 | (0xffff - right)); | 221 | unsigned int val = ((0xffff - left) << 16 | (0xffff - right)); |
220 | 222 | ||
221 | snd_cs46xx_poke(chip, (scb->address + SCBVolumeCtrl) << 2, val); | 223 | snd_cs46xx_poke(chip, (scb->address + SCBVolumeCtrl) << 2, val); |