Update of /cvsroot/alsa/alsa-driver/pcmcia/vx
In directory sc8-pr-cvs1:/tmp/cvs-serv30173
Modified Files:
.cvsignore Makefile
Added Files:
vx_entry.inc vx_entry.inc1 vx_entry.patch
Removed Files:
vx_entry.c
Log Message:
fixed the compilation on 2.6 kernel.
the compatible layer patch is supplied now.
--- NEW FILE: vx_entry.inc ---
#define __NO_VERSION__
#include <linux/config.h>
#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
#include <pcmcia/cs_types.h>
static void cs_error(client_handle_t handle, int func, int ret);
#endif
--- NEW FILE: vx_entry.inc1 ---
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
/*
* print the error message related with cs
*/
static void cs_error(client_handle_t handle, int func, int ret)
{
error_info_t err = { func, ret };
CardServices(ReportError, handle, &err);
}
#endif
--- NEW FILE: vx_entry.patch ---
--- vx_entry.c 2003-09-24 18:12:23.000000000 +0200
+++ vx_entry.c 2003-09-24 18:13:13.000000000 +0200
@@ -1,3 +1,4 @@
+#include "vx_entry.inc"
/*
* Driver for Digigram VXpocket soundcards
*
@@ -146,6 +147,11 @@
link->irq.Handler = &snd_vx_irq_handler;
link->irq.Instance = chip;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) /* correct version? */
+ link->release.function = (void (*)(unsigned long))vxpocket_release;
+ link->release.data = (u_long)link;
+#endif
+
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.Vcc = 50;
link->conf.IntType = INT_MEMORY_AND_IO;
@@ -224,6 +230,10 @@
{
vx_core_t *chip = snd_magic_cast(vx_core_t, link->priv, return);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) /* correct version? */
+ del_timer(&link->release);
+#endif
+
snd_printdd(KERN_DEBUG "vxpocket_detach called\n");
/* Remove the interface data from the linked list */
if (hw) {
@@ -319,6 +329,9 @@
snd_printdd(KERN_DEBUG "CARD_REMOVAL..\n");
link->state &= ~DEV_PRESENT;
if (link->state & DEV_CONFIG) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) /* correct version? */
+ mod_timer(&link->release, jiffies + HZ/20);
+#endif
chip->chip_status |= VX_STAT_IS_STALE;
}
break;
@@ -370,3 +383,5 @@
EXPORT_SYMBOL(snd_vxpocket_attach);
EXPORT_SYMBOL(snd_vxpocket_detach);
EXPORT_SYMBOL(snd_vxpocket_detach_all);
+
+#include "vx_entry.inc1"
Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pcmcia/vx/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 31 Oct 2002 10:41:37 -0000 1.1
+++ .cvsignore 24 Sep 2003 16:43:33 -0000 1.2
@@ -1 +1,2 @@
.depend
+vx_entry.c
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pcmcia/vx/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile 10 Jun 2003 14:04:27 -0000 1.6
+++ Makefile 24 Sep 2003 16:43:33 -0000 1.7
@@ -3,6 +3,8 @@
include $(TOPDIR)/toplevel.config
include $(TOPDIR)/Makefile.conf
+EXTRA_CLEAN = vx_entry.c
+
#
#
#
@@ -13,3 +15,5 @@
include $(TOPDIR)/alsa-kernel/pcmcia/vx/Makefile
include $(TOPDIR)/Rules.make
+
+vx_entry.c: vx_entry.patch vx_entry.inc vx_entry.inc1
$(TOPDIR)/alsa-kernel/pcmcia/vx/vx_entry.c
--- vx_entry.c DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
