Update of /cvsroot/alsa/alsa-driver/acore/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv28206
Modified Files:
.cvsignore Makefile
Added Files:
mixer_oss.patch pcm_oss.patch
Removed Files:
mixer_oss.c pcm_oss.c
Log Message:
2.5 cleanups
--- NEW FILE: mixer_oss.patch ---
--- mixer_oss.c 2003-05-31 13:13:48.000000000 +0200
+++ mixer_oss.c.old 2003-05-31 13:13:42.000000000 +0200
@@ -376,7 +376,9 @@
static struct file_operations snd_mixer_oss_f_ops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.open = snd_mixer_oss_open,
.release = snd_mixer_oss_release,
.ioctl = snd_mixer_oss_ioctl,
--- NEW FILE: pcm_oss.patch ---
--- pcm_oss.c 2003-05-31 13:17:10.000000000 +0200
+++ pcm_oss.c.old 2003-05-31 13:15:28.000000000 +0200
@@ -1981,7 +1981,11 @@
if (runtime->oss.plugin_first != NULL)
return -EIO;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 25)
if (area->vm_pgoff != 0)
+#else
+ if (area->vm_offset != 0)
+#endif
return -EINVAL;
err = snd_pcm_mmap_data(substream, file, area);
@@ -2144,7 +2148,9 @@
static struct file_operations snd_pcm_oss_f_reg =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.read = snd_pcm_oss_read,
.write = snd_pcm_oss_write,
.open = snd_pcm_oss_open,
@@ -2269,3 +2275,5 @@
module_init(alsa_pcm_oss_init)
module_exit(alsa_pcm_oss_exit)
+
+EXPORT_NO_SYMBOLS;
Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/oss/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Dec 2001 20:09:21 -0000 1.1
+++ .cvsignore 31 May 2003 11:21:06 -0000 1.2
@@ -1 +1,3 @@
.depend
+mixer_oss.c
+pcm_oss.c
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/oss/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 9 Feb 2003 18:35:55 -0000 1.3
+++ Makefile 31 May 2003 11:21:06 -0000 1.4
@@ -3,9 +3,16 @@
include $(TOPDIR)/toplevel.config
include $(TOPDIR)/Makefile.conf
+EXTRA_CLEAN = mixer_oss.c pcm_oss.c
+
export-objs := mixer_oss.o
TOPDIR = $(MAINSRCDIR)
include $(TOPDIR)/alsa-kernel/core/oss/Makefile
+EXTRA_CFLAGS = -I$(TOPDIR)/alsa-kernel/core/oss
+
include $(TOPDIR)/Rules.make
+
+mixer_oss.c: mixer_oss.patch $(TOPDIR)/alsa-kernel/core/oss/mixer_oss.c
+pcm_oss.c: pcm_oss.patch $(TOPDIR)/alsa-kernel/core/oss/pcm_oss.c
--- mixer_oss.c DELETED ---
--- pcm_oss.c DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
