Update of /cvsroot/alsa/alsa-driver/acore
In directory sc8-pr-cvs1:/tmp/cvs-serv6208
Modified Files:
.cvsignore Makefile
Added Files:
control.patch hwdep.patch init.patch rawmidi.patch sound.inc
sound.patch timer.patch
Removed Files:
control.c hwdep.c init.c rawmidi.c sound.c timer.c
Log Message:
code 2.5 cleanups - introducing patches
--- NEW FILE: control.patch ---
--- control.c 2003-05-30 15:17:58.000000000 +0200
+++ control.c.old 2003-05-30 15:17:56.000000000 +0200
@@ -1,3 +1,4 @@
+#define __NO_VERSION__
/*
* Routines for driver control interface
* Copyright (c) by Jaroslav Kysela <[EMAIL PROTECTED]>
@@ -927,7 +928,9 @@
static struct file_operations snd_ctl_f_ops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.read = snd_ctl_read,
.open = snd_ctl_open,
.release = snd_ctl_release,
--- NEW FILE: hwdep.patch ---
--- hwdep.c 2003-05-30 15:19:39.000000000 +0200
+++ hwdep.c 2003-05-30 15:19:30.000000000 +0200
@@ -292,7 +292,9 @@
static struct file_operations snd_hwdep_f_ops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.llseek = snd_hwdep_llseek,
.read = snd_hwdep_read,
.write = snd_hwdep_write,
--- NEW FILE: init.patch ---
--- init.c 2003-05-30 15:23:05.000000000 +0200
+++ init.c.old 2003-05-30 15:23:30.000000000 +0200
@@ -1,3 +1,4 @@
+#define __NO_VERSION__
/*
* Initialization routines
* Copyright (c) by Jaroslav Kysela <[EMAIL PROTECTED]>
@@ -193,7 +194,9 @@
f_ops = &s_f_ops->f_ops;
memset(f_ops, 0, sizeof(*f_ops));
+#ifndef LINUX_2_2
f_ops->owner = file->f_op->owner;
+#endif
f_ops->release = file->f_op->release;
f_ops->poll = snd_disconnect_poll;
--- NEW FILE: rawmidi.patch ---
--- rawmidi.c 2003-05-30 15:26:44.000000000 +0200
+++ rawmidi.c.old 2003-05-30 15:26:39.000000000 +0200
@@ -1316,7 +1316,9 @@
static struct file_operations snd_rawmidi_f_ops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.read = snd_rawmidi_read,
.write = snd_rawmidi_write,
.open = snd_rawmidi_open,
--- NEW FILE: sound.inc ---
/* misc.c */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
EXPORT_SYMBOL(try_inc_mod_count);
EXPORT_SYMBOL(snd_compat_request_region);
EXPORT_SYMBOL(snd_compat_release_resource);
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) && defined(CONFIG_PM)
EXPORT_SYMBOL(pm_register);
EXPORT_SYMBOL(pm_unregister);
EXPORT_SYMBOL(pm_send);
#endif
/* wrappers */
#ifndef CONFIG_HAVE_STRLCPY
EXPORT_SYMBOL(snd_compat_strlcpy);
EXPORT_SYMBOL(snd_compat_strlcat);
#endif
#ifndef CONFIG_HAVE_SNPRINTF
EXPORT_SYMBOL(snd_compat_snprintf);
EXPORT_SYMBOL(snd_compat_vsnprintf);
#endif
#ifdef CONFIG_HAVE_OLD_REQUEST_MODULE
EXPORT_SYMBOL(snd_compat_request_module);
#endif
#ifdef CONFIG_OLD_KILL_FASYNC
EXPORT_SYMBOL(snd_wrapper_kill_fasync);
#endif
#if defined(CONFIG_DEVFS_FS) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 29)
EXPORT_SYMBOL(snd_compat_devfs_remove);
#endif
#if defined(CONFIG_DEVFS_FS) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 67)
EXPORT_SYMBOL(snd_compat_devfs_mk_dir);
EXPORT_SYMBOL(snd_compat_devfs_mk_cdev);
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0) && LINUX_VERSION_CODE <
KERNEL_VERSION(2, 5, 69)
EXPORT_SYMBOL(snd_compat_vmap);
#endif
--- NEW FILE: sound.patch ---
--- sound.c 2003-05-30 15:29:14.000000000 +0200
+++ sound.c.old 2003-05-30 15:30:11.000000000 +0200
@@ -154,7 +154,9 @@
struct file_operations snd_fops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.open = snd_open
};
@@ -364,6 +366,9 @@
#ifndef MODULE
printk(KERN_INFO "Advanced Linux Sound Architecture Driver Version "
CONFIG_SND_VERSION CONFIG_SND_DATE ".\n");
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) && defined(CONFIG_APM)
+ pm_init();
+#endif
return 0;
}
@@ -378,6 +383,9 @@
snd_info_minor_unregister();
#endif
snd_info_done();
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) && defined(CONFIG_APM)
+ pm_done();
+#endif
#ifdef CONFIG_SND_DEBUG_MEMORY
snd_memory_done();
#endif
@@ -490,3 +498,5 @@
EXPORT_SYMBOL(snd_wrapper_vmalloc);
EXPORT_SYMBOL(snd_wrapper_vfree);
#endif
+
+#include "sound.inc"
--- NEW FILE: timer.patch ---
--- timer.c 2003-05-30 15:33:01.000000000 +0200
+++ timer.c.old 2003-05-30 15:32:56.000000000 +0200
@@ -1733,7 +1733,9 @@
static struct file_operations snd_timer_f_ops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.read = snd_timer_user_read,
.open = snd_timer_user_open,
.release = snd_timer_user_release,
Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Dec 2001 20:09:20 -0000 1.1
+++ .cvsignore 30 May 2003 13:37:40 -0000 1.2
@@ -1 +1,9 @@
.depend
+control.c
+hwdep.c
+init.c
+rawmidi.c
+sound.c
+timer.c
+pcm_native.c
+info.c
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile 30 May 2003 13:16:08 -0000 1.21
+++ Makefile 30 May 2003 13:37:40 -0000 1.22
@@ -18,3 +18,9 @@
info.c: info.inc info.patch $(TOPDIR)/alsa-kernel/core/info.c
pcm_native.c: pcm_native.patch $(TOPDIR)/alsa-kernel/core/pcm_native.c
+control.c: control.patch $(TOPDIR)/alsa-kernel/core/control.c
+hwdep.c: hwdep.patch $(TOPDIR)/alsa-kernel/core/hwdep.c
+init.c: init.patch $(TOPDIR)/alsa-kernel/core/init.c
+rawmidi.c: rawmidi.patch $(TOPDIR)/alsa-kernel/core/rawmidi.c
+sound.c: sound.patch $(TOPDIR)/alsa-kernel/core/sound.c
+timer.c: timer.patch $(TOPDIR)/alsa-kernel/core/timer.c
--- control.c DELETED ---
--- hwdep.c DELETED ---
--- init.c DELETED ---
--- rawmidi.c DELETED ---
--- sound.c DELETED ---
--- timer.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
