diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-01-13 11:16:29 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 04:23:32 -0500 |
commit | 97c67b65cbdfd19887450ae1b80ddbb54de9559d (patch) | |
tree | ad92dc802a5146c8b86e2333118f0fc394dddcfb /sound/pci/au88x0/au88x0_xtalk.c | |
parent | 7a6c8ff1ef83df4ce44b586999e54966d8e5bda8 (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_xtalk.c')
-rw-r--r-- | sound/pci/au88x0/au88x0_xtalk.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/au88x0/au88x0_xtalk.c b/sound/pci/au88x0/au88x0_xtalk.c index df915fa3f88d..4534e1882ada 100644 --- a/sound/pci/au88x0/au88x0_xtalk.c +++ b/sound/pci/au88x0/au88x0_xtalk.c | |||
@@ -562,7 +562,7 @@ static void | |||
562 | vortex_XtalkHw_SetDelay(vortex_t * vortex, unsigned short right, | 562 | vortex_XtalkHw_SetDelay(vortex_t * vortex, unsigned short right, |
563 | unsigned short left) | 563 | unsigned short left) |
564 | { | 564 | { |
565 | int esp0 = 0; | 565 | u32 esp0 = 0; |
566 | 566 | ||
567 | esp0 &= 0x1FFFFFFF; | 567 | esp0 &= 0x1FFFFFFF; |
568 | esp0 |= 0xA0000000; | 568 | esp0 |= 0xA0000000; |
@@ -632,18 +632,18 @@ static void vortex_XtalkHw_GetRightDline(vortex_t * vortex, xtalk_dline_t dline) | |||
632 | /* Control/Global stuff */ | 632 | /* Control/Global stuff */ |
633 | 633 | ||
634 | #if 0 | 634 | #if 0 |
635 | static void vortex_XtalkHw_SetControlReg(vortex_t * vortex, unsigned long ctrl) | 635 | static void vortex_XtalkHw_SetControlReg(vortex_t * vortex, u32 ctrl) |
636 | { | 636 | { |
637 | hwwrite(vortex->mmio, 0x24660, ctrl); | 637 | hwwrite(vortex->mmio, 0x24660, ctrl); |
638 | } | 638 | } |
639 | static void vortex_XtalkHw_GetControlReg(vortex_t * vortex, unsigned long *ctrl) | 639 | static void vortex_XtalkHw_GetControlReg(vortex_t * vortex, u32 *ctrl) |
640 | { | 640 | { |
641 | *ctrl = hwread(vortex->mmio, 0x24660); | 641 | *ctrl = hwread(vortex->mmio, 0x24660); |
642 | } | 642 | } |
643 | #endif | 643 | #endif |
644 | static void vortex_XtalkHw_SetSampleRate(vortex_t * vortex, int sr) | 644 | static void vortex_XtalkHw_SetSampleRate(vortex_t * vortex, u32 sr) |
645 | { | 645 | { |
646 | int temp; | 646 | u32 temp; |
647 | 647 | ||
648 | temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000; | 648 | temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000; |
649 | temp = (temp & 0xffffff07) | ((sr & 0x1f) << 3); | 649 | temp = (temp & 0xffffff07) | ((sr & 0x1f) << 3); |
@@ -651,7 +651,7 @@ static void vortex_XtalkHw_SetSampleRate(vortex_t * vortex, int sr) | |||
651 | } | 651 | } |
652 | 652 | ||
653 | #if 0 | 653 | #if 0 |
654 | static void vortex_XtalkHw_GetSampleRate(vortex_t * vortex, int *sr) | 654 | static void vortex_XtalkHw_GetSampleRate(vortex_t * vortex, u32 *sr) |
655 | { | 655 | { |
656 | *sr = (hwread(vortex->mmio, 0x24660) >> 3) & 0x1f; | 656 | *sr = (hwread(vortex->mmio, 0x24660) >> 3) & 0x1f; |
657 | } | 657 | } |
@@ -659,7 +659,7 @@ static void vortex_XtalkHw_GetSampleRate(vortex_t * vortex, int *sr) | |||
659 | #endif | 659 | #endif |
660 | static void vortex_XtalkHw_Enable(vortex_t * vortex) | 660 | static void vortex_XtalkHw_Enable(vortex_t * vortex) |
661 | { | 661 | { |
662 | int temp; | 662 | u32 temp; |
663 | 663 | ||
664 | temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000; | 664 | temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000; |
665 | temp |= 1; | 665 | temp |= 1; |
@@ -669,7 +669,7 @@ static void vortex_XtalkHw_Enable(vortex_t * vortex) | |||
669 | 669 | ||
670 | static void vortex_XtalkHw_Disable(vortex_t * vortex) | 670 | static void vortex_XtalkHw_Disable(vortex_t * vortex) |
671 | { | 671 | { |
672 | int temp; | 672 | u32 temp; |
673 | 673 | ||
674 | temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000; | 674 | temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000; |
675 | temp &= 0xfffffffe; | 675 | temp &= 0xfffffffe; |