aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/au88x0/au88x0_synth.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-01-13 11:16:29 -0500
committerJaroslav Kysela <perex@suse.cz>2006-03-22 04:23:32 -0500
commit97c67b65cbdfd19887450ae1b80ddbb54de9559d (patch)
treead92dc802a5146c8b86e2333118f0fc394dddcfb /sound/pci/au88x0/au88x0_synth.c
parent7a6c8ff1ef83df4ce44b586999e54966d8e5bda8 (diff)
[ALSA] au88x0 - 64bit arch fixes
Modules: au88x0 driver Fix the driver codes to run on 64bit architectures. The patch taken from ALSA BTS bug#1047. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/au88x0/au88x0_synth.c')
-rw-r--r--sound/pci/au88x0/au88x0_synth.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c
index 65f375bad43a..d3e662a1285d 100644
--- a/sound/pci/au88x0/au88x0_synth.c
+++ b/sound/pci/au88x0/au88x0_synth.c
@@ -32,7 +32,7 @@ static void vortex_connection_mixin_mix(vortex_t * vortex, int en,
32 unsigned char mix, int a); 32 unsigned char mix, int a);
33static void vortex_fifo_wtinitialize(vortex_t * vortex, int fifo, int j); 33static void vortex_fifo_wtinitialize(vortex_t * vortex, int fifo, int j);
34static int vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, 34static int vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
35 unsigned long val); 35 u32 val);
36 36
37/* WT */ 37/* WT */
38 38
@@ -166,7 +166,7 @@ static int vortex_wt_GetReg(vortex_t * vortex, char reg, int wt)
166/* WT hardware abstraction layer generic register interface. */ 166/* WT hardware abstraction layer generic register interface. */
167static int 167static int
168vortex_wt_SetReg2(vortex_t * vortex, unsigned char reg, int wt, 168vortex_wt_SetReg2(vortex_t * vortex, unsigned char reg, int wt,
169 unsigned short val) 169 u16 val)
170{ 170{
171 /* 171 /*
172 int eax, edx; 172 int eax, edx;
@@ -190,7 +190,7 @@ vortex_wt_SetReg2(vortex_t * vortex, unsigned char reg, int wt,
190#endif 190#endif
191static int 191static int
192vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, 192vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
193 unsigned long val) 193 u32 val)
194{ 194{
195 int ecx; 195 int ecx;
196 196
@@ -279,7 +279,7 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt,
279 279
280static void vortex_wt_init(vortex_t * vortex) 280static void vortex_wt_init(vortex_t * vortex)
281{ 281{
282 int var4, var8, varc, var10 = 0, edi; 282 u32 var4, var8, varc, var10 = 0, edi;
283 283
284 var10 &= 0xFFFFFFE3; 284 var10 &= 0xFFFFFFE3;
285 var10 |= 0x22; 285 var10 |= 0x22;
@@ -353,7 +353,7 @@ static void vortex_wt_SetVolume(vortex_t * vortex, int wt, int vol[])
353static void vortex_wt_SetFrequency(vortex_t * vortex, int wt, unsigned int sr) 353static void vortex_wt_SetFrequency(vortex_t * vortex, int wt, unsigned int sr)
354{ 354{
355 wt_voice_t *voice = &(vortex->wt_voice[wt]); 355 wt_voice_t *voice = &(vortex->wt_voice[wt]);
356 long int eax, edx; 356 u32 eax, edx;
357 357
358 //FIXME: 64 bit operation. 358 //FIXME: 64 bit operation.
359 eax = ((sr << 0xf) * 0x57619F1) & 0xffffffff; 359 eax = ((sr << 0xf) * 0x57619F1) & 0xffffffff;