Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1:/tmp/cvs-serv30321/isa/sb
Modified Files:
emu8000.c emu8000_callback.c emu8000_local.h emu8000_patch.c
Log Message:
- added __user prefix to the user-space pointers.
Index: emu8000.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- emu8000.c 13 Jan 2004 17:11:26 -0000 1.20
+++ emu8000.c 16 Jan 2004 18:02:40 -0000 1.21
@@ -655,7 +655,7 @@
};
/*exported*/ int
-snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void *buf, long len)
+snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void __user *buf, long len)
{
soundfont_chorus_fx_t rec;
if (mode < SNDRV_EMU8000_CHORUS_PREDEFINED || mode >=
SNDRV_EMU8000_CHORUS_NUMBERS) {
@@ -782,7 +782,7 @@
};
/*exported*/ int
-snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void *buf, long len)
+snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void __user *buf, long len)
{
soundfont_reverb_fx_t rec;
Index: emu8000_callback.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000_callback.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- emu8000_callback.c 13 Aug 2002 16:13:38 -0000 1.8
+++ emu8000_callback.c 16 Jan 2004 18:02:40 -0000 1.9
@@ -36,7 +36,7 @@
#ifdef CONFIG_SND_SEQUENCER_OSS
static int oss_ioctl(snd_emux_t *emu, int cmd, int p1, int p2);
#endif
-static int load_fx(snd_emux_t *emu, int type, int mode, const void *buf, long len);
+static int load_fx(snd_emux_t *emu, int type, int mode, const void __user *buf, long
len);
static void set_pitch(emu8000_t *hw, snd_emux_voice_t *vp);
static void set_volume(emu8000_t *hw, snd_emux_voice_t *vp);
@@ -523,7 +523,7 @@
*/
static int
-load_fx(snd_emux_t *emu, int type, int mode, const void *buf, long len)
+load_fx(snd_emux_t *emu, int type, int mode, const void __user *buf, long len)
{
emu8000_t *hw;
hw = snd_magic_cast(emu8000_t, emu->hw, return -EINVAL);
Index: emu8000_local.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000_local.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emu8000_local.h 29 Apr 2002 14:30:52 -0000 1.4
+++ emu8000_local.h 16 Jan 2004 18:02:40 -0000 1.5
@@ -32,7 +32,7 @@
#define NELEM(arr) (sizeof(arr)/sizeof((arr)[0]))
/* emu8000_patch.c */
-int snd_emu8000_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp, snd_util_memhdr_t
*hdr, const void *data, long count);
+int snd_emu8000_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp, snd_util_memhdr_t
*hdr, const void __user *data, long count);
int snd_emu8000_sample_free(snd_emux_t *rec, snd_sf_sample_t *sp, snd_util_memhdr_t
*hdr);
void snd_emu8000_sample_reset(snd_emux_t *rec);
Index: emu8000_patch.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000_patch.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emu8000_patch.c 30 Sep 2003 09:28:27 -0000 1.7
+++ emu8000_patch.c 16 Jan 2004 18:02:40 -0000 1.8
@@ -82,7 +82,7 @@
* 8bit samples etc.
*/
static unsigned short
-read_word(const void *buf, int offset, int mode)
+read_word(const void __user *buf, int offset, int mode)
{
unsigned short c;
if (mode & SNDRV_SFNT_SAMPLE_8BITS) {
@@ -146,7 +146,7 @@
*/
int
snd_emu8000_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp,
- snd_util_memhdr_t *hdr, const void *data, long count)
+ snd_util_memhdr_t *hdr, const void __user *data, long count)
{
int i;
int rc;
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
