Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1:/tmp/cvs-serv30321/include
Modified Files: emu10k1.h emu8000.h emux_synth.h soundfont.h Log Message: - added __user prefix to the user-space pointers. Index: emu10k1.h =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/include/emu10k1.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- emu10k1.h 7 Nov 2003 17:52:00 -0000 1.34 +++ emu10k1.h 16 Jan 2004 18:02:40 -0000 1.35 @@ -1052,7 +1052,7 @@ snd_util_memblk_t *snd_emu10k1_synth_alloc(emu10k1_t *emu, unsigned int size); int snd_emu10k1_synth_free(emu10k1_t *emu, snd_util_memblk_t *blk); int snd_emu10k1_synth_bzero(emu10k1_t *emu, snd_util_memblk_t *blk, int offset, int size); -int snd_emu10k1_synth_copy_from_user(emu10k1_t *emu, snd_util_memblk_t *blk, int offset, const char *data, int size); +int snd_emu10k1_synth_copy_from_user(emu10k1_t *emu, snd_util_memblk_t *blk, int offset, const char __user *data, int size); int snd_emu10k1_memblk_map(emu10k1_t *emu, emu10k1_memblk_t *blk); /* voice allocation */ Index: emu8000.h =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/include/emu8000.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emu8000.h 2 May 2002 10:53:55 -0000 1.8 +++ emu8000.h 16 Jan 2004 18:02:40 -0000 1.9 @@ -114,7 +114,7 @@ void snd_emu8000_update_chorus_mode(emu8000_t *emu); void snd_emu8000_update_reverb_mode(emu8000_t *emu); void snd_emu8000_update_equalizer(emu8000_t *emu); -int snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void *buf, long len); -int snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void *buf, long len); +int snd_emu8000_load_chorus_fx(emu8000_t *emu, int mode, const void __user *buf, long len); +int snd_emu8000_load_reverb_fx(emu8000_t *emu, int mode, const void __user *buf, long len); #endif /* __SOUND_EMU8000_H */ Index: emux_synth.h =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/include/emux_synth.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emux_synth.h 23 May 2002 08:20:39 -0000 1.8 +++ emux_synth.h 16 Jan 2004 18:02:40 -0000 1.9 @@ -63,7 +63,7 @@ int (*sample_new)(snd_emux_t *emu, snd_sf_sample_t *sp, snd_util_memhdr_t *hdr, const void *data, long count); int (*sample_free)(snd_emux_t *emu, snd_sf_sample_t *sp, snd_util_memhdr_t *hdr); void (*sample_reset)(snd_emux_t *emu); - int (*load_fx)(snd_emux_t *emu, int type, int arg, const void *data, long count); + int (*load_fx)(snd_emux_t *emu, int type, int arg, const void __user *data, long count); void (*sysex)(snd_emux_t *emu, char *buf, int len, int parsed, snd_midi_channel_set_t *chset); #ifdef CONFIG_SND_SEQUENCER_OSS int (*oss_ioctl)(snd_emux_t *emu, int cmd, int p1, int p2); Index: soundfont.h =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/include/soundfont.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- soundfont.h 28 Jul 2003 10:09:52 -0000 1.5 +++ soundfont.h 16 Jan 2004 18:02:40 -0000 1.6 @@ -68,7 +68,7 @@ * Type of the sample access callback */ typedef int (*snd_sf_sample_new_t)(void *private_data, snd_sf_sample_t *sp, - snd_util_memhdr_t *hdr, const void *buf, long count); + snd_util_memhdr_t *hdr, const void __user *buf, long count); typedef int (*snd_sf_sample_free_t)(void *private_data, snd_sf_sample_t *sp, snd_util_memhdr_t *hdr); typedef void (*snd_sf_sample_reset_t)(void *private); @@ -101,8 +101,8 @@ } snd_sf_list_t; /* Prototypes for soundfont.c */ -int snd_soundfont_load(snd_sf_list_t *sflist, const void *data, long count, int client); -int snd_soundfont_load_guspatch(snd_sf_list_t *sflist, const char *data, +int snd_soundfont_load(snd_sf_list_t *sflist, const void __user *data, long count, int client); +int snd_soundfont_load_guspatch(snd_sf_list_t *sflist, const char __user *data, long count, int client); int snd_soundfont_close_check(snd_sf_list_t *sflist, int client); ------------------------------------------------------- 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