git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
pci
/
au88x0
/
au88x0_xtalk.c
diff --git
a/sound/pci/au88x0/au88x0_xtalk.c
b/sound/pci/au88x0/au88x0_xtalk.c
index
df915fa
..
4534e18
100644
(file)
--- a/
sound/pci/au88x0/au88x0_xtalk.c
+++ b/
sound/pci/au88x0/au88x0_xtalk.c
@@
-562,7
+562,7
@@
static void
vortex_XtalkHw_SetDelay(vortex_t * vortex, unsigned short right,
unsigned short left)
{
vortex_XtalkHw_SetDelay(vortex_t * vortex, unsigned short right,
unsigned short left)
{
-
int
esp0 = 0;
+
u32
esp0 = 0;
esp0 &= 0x1FFFFFFF;
esp0 |= 0xA0000000;
esp0 &= 0x1FFFFFFF;
esp0 |= 0xA0000000;
@@
-632,18
+632,18
@@
static void vortex_XtalkHw_GetRightDline(vortex_t * vortex, xtalk_dline_t dline)
/* Control/Global stuff */
#if 0
/* Control/Global stuff */
#if 0
-static void vortex_XtalkHw_SetControlReg(vortex_t * vortex, u
nsigned long
ctrl)
+static void vortex_XtalkHw_SetControlReg(vortex_t * vortex, u
32
ctrl)
{
hwwrite(vortex->mmio, 0x24660, ctrl);
}
{
hwwrite(vortex->mmio, 0x24660, ctrl);
}
-static void vortex_XtalkHw_GetControlReg(vortex_t * vortex, u
nsigned long
*ctrl)
+static void vortex_XtalkHw_GetControlReg(vortex_t * vortex, u
32
*ctrl)
{
*ctrl = hwread(vortex->mmio, 0x24660);
}
#endif
{
*ctrl = hwread(vortex->mmio, 0x24660);
}
#endif
-static void vortex_XtalkHw_SetSampleRate(vortex_t * vortex,
int
sr)
+static void vortex_XtalkHw_SetSampleRate(vortex_t * vortex,
u32
sr)
{
{
-
int
temp;
+
u32
temp;
temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000;
temp = (temp & 0xffffff07) | ((sr & 0x1f) << 3);
temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000;
temp = (temp & 0xffffff07) | ((sr & 0x1f) << 3);
@@
-651,7
+651,7
@@
static void vortex_XtalkHw_SetSampleRate(vortex_t * vortex, int sr)
}
#if 0
}
#if 0
-static void vortex_XtalkHw_GetSampleRate(vortex_t * vortex,
int
*sr)
+static void vortex_XtalkHw_GetSampleRate(vortex_t * vortex,
u32
*sr)
{
*sr = (hwread(vortex->mmio, 0x24660) >> 3) & 0x1f;
}
{
*sr = (hwread(vortex->mmio, 0x24660) >> 3) & 0x1f;
}
@@
-659,7
+659,7
@@
static void vortex_XtalkHw_GetSampleRate(vortex_t * vortex, int *sr)
#endif
static void vortex_XtalkHw_Enable(vortex_t * vortex)
{
#endif
static void vortex_XtalkHw_Enable(vortex_t * vortex)
{
-
int
temp;
+
u32
temp;
temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000;
temp |= 1;
temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000;
temp |= 1;
@@
-669,7
+669,7
@@
static void vortex_XtalkHw_Enable(vortex_t * vortex)
static void vortex_XtalkHw_Disable(vortex_t * vortex)
{
static void vortex_XtalkHw_Disable(vortex_t * vortex)
{
-
int
temp;
+
u32
temp;
temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000;
temp &= 0xfffffffe;
temp = (hwread(vortex->mmio, 0x24660) & 0x1FFFFFFF) | 0xC0000000;
temp &= 0xfffffffe;