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
/
oss
/
dmasound
/
dmasound_paula.c
diff --git
a/sound/oss/dmasound/dmasound_paula.c
b/sound/oss/dmasound/dmasound_paula.c
index
558db53
..
494070a
100644
(file)
--- a/
sound/oss/dmasound/dmasound_paula.c
+++ b/
sound/oss/dmasound/dmasound_paula.c
@@
-34,6
+34,7
@@
#define DMASOUND_PAULA_REVISION 0
#define DMASOUND_PAULA_EDITION 4
#define DMASOUND_PAULA_REVISION 0
#define DMASOUND_PAULA_EDITION 4
+#define custom amiga_custom
/*
* The minimum period for audio depends on htotal (for OCS/ECS/AGA)
* (Imported from arch/m68k/amiga/amisound.c)
/*
* The minimum period for audio depends on htotal (for OCS/ECS/AGA)
* (Imported from arch/m68k/amiga/amisound.c)
@@
-69,7
+70,7
@@
static int write_sq_block_size_half, write_sq_block_size_quarter;
/*** Low level stuff *********************************************************/
/*** Low level stuff *********************************************************/
-static void *AmiAlloc(unsigned int size,
in
t flags);
+static void *AmiAlloc(unsigned int size,
gfp_
t flags);
static void AmiFree(void *obj, unsigned int size);
static int AmiIrqInit(void);
#ifdef MODULE
static void AmiFree(void *obj, unsigned int size);
static int AmiIrqInit(void);
#ifdef MODULE
@@
-156,7
+157,7
@@
static int AmiStateInfo(char *buffer, size_t space);
* Native format
*/
* Native format
*/
-static ssize_t ami_ct_s8(const u_char *userPtr, size_t userCount,
+static ssize_t ami_ct_s8(const u_char
__user
*userPtr, size_t userCount,
u_char frame[], ssize_t *frameUsed, ssize_t frameLeft)
{
ssize_t count, used;
u_char frame[], ssize_t *frameUsed, ssize_t frameLeft)
{
ssize_t count, used;
@@
-189,7
+190,7
@@
static ssize_t ami_ct_s8(const u_char *userPtr, size_t userCount,
*/
#define GENERATE_AMI_CT8(funcname, convsample) \
*/
#define GENERATE_AMI_CT8(funcname, convsample) \
-static ssize_t funcname(const u_char
*userPtr, size_t userCount,
\
+static ssize_t funcname(const u_char
__user *userPtr, size_t userCount,
\
u_char frame[], ssize_t *frameUsed, \
ssize_t frameLeft) \
{ \
u_char frame[], ssize_t *frameUsed, \
ssize_t frameLeft) \
{ \
@@
-240,10
+241,11
@@
GENERATE_AMI_CT8(ami_ct_u8, AMI_CT_U8)
*/
#define GENERATE_AMI_CT_16(funcname, convsample) \
*/
#define GENERATE_AMI_CT_16(funcname, convsample) \
-static ssize_t funcname(const u_char
*userPtr, size_t userCount,
\
+static ssize_t funcname(const u_char
__user *userPtr, size_t userCount,
\
u_char frame[], ssize_t *frameUsed, \
ssize_t frameLeft) \
{ \
u_char frame[], ssize_t *frameUsed, \
ssize_t frameLeft) \
{ \
+ const u_short __user *ptr = (const u_short __user *)userPtr; \
ssize_t count, used; \
u_short data; \
\
ssize_t count, used; \
u_short data; \
\
@@
-253,7
+255,7
@@
static ssize_t funcname(const u_char *userPtr, size_t userCount, \
count = min_t(size_t, userCount, frameLeft)>>1 & ~1; \
used = count*2; \
while (count > 0) { \
count = min_t(size_t, userCount, frameLeft)>>1 & ~1; \
used = count*2; \
while (count > 0) { \
- if (get_user(data,
((u_short *)userPtr)++))
\
+ if (get_user(data,
ptr++))
\
return -EFAULT; \
data = convsample(data); \
*high++ = data>>8; \
return -EFAULT; \
data = convsample(data); \
*high++ = data>>8; \
@@
-268,12
+270,12
@@
static ssize_t funcname(const u_char *userPtr, size_t userCount, \
count = min_t(size_t, userCount, frameLeft)>>2 & ~1; \
used = count*4; \
while (count > 0) { \
count = min_t(size_t, userCount, frameLeft)>>2 & ~1; \
used = count*4; \
while (count > 0) { \
- if (get_user(data,
((u_short *)userPtr)++))
\
+ if (get_user(data,
ptr++))
\
return -EFAULT; \
data = convsample(data); \
*lefth++ = data>>8; \
*leftl++ = (data>>2) & 0x3f; \
return -EFAULT; \
data = convsample(data); \
*lefth++ = data>>8; \
*leftl++ = (data>>2) & 0x3f; \
- if (get_user(data,
((u_short *)userPtr)++))
\
+ if (get_user(data,
ptr++))
\
return -EFAULT; \
data = convsample(data); \
*righth++ = data>>8; \
return -EFAULT; \
data = convsample(data); \
*righth++ = data>>8; \
@@
-317,7
+319,7
@@
static inline void StopDMA(void)
enable_heartbeat();
}
enable_heartbeat();
}
-static void *AmiAlloc(unsigned int size,
in
t flags)
+static void *AmiAlloc(unsigned int size,
gfp_
t flags)
{
return amiga_chip_alloc((long)size, "dmasound [Paula]");
}
{
return amiga_chip_alloc((long)size, "dmasound [Paula]");
}