Update of /cvsroot/alsa/alsa-driver/pcmcia/vx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21578/pcmcia/vx

Modified Files:
        Makefile vxp440.c 
Added Files:
        vxpocket.patch 
Removed Files:
        vxpocket.c 
Log Message:
use the new module_param*() functions.
added wrapper functions for older kernels.









--- NEW FILE: vxpocket.patch ---
--- vxpocket.c  2004-04-07 19:25:27.053679483 +0200
+++ vxpocket.c  2004-04-07 19:25:17.241893084 +0200
@@ -35,6 +35,7 @@
 #include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <pcmcia/version.h>
+#include "compat_cs.h"
 #include "vxpocket.h"
 #include <sound/initval.h>
 
@@ -72,7 +73,11 @@
 MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
 module_param(irq_mask, int, 0444);
 MODULE_PARM_DESC(irq_mask, "IRQ bitmask for " CARD_NAME " soundcard.");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+MODULE_PARM(irq_list, "1-4i");
+#else
 module_param_array(irq_list, int, boot_devs, 0444);
+#endif
 MODULE_PARM_DESC(irq_list, "List of Available interrupts for " CARD_NAME " 
soundcard.");
 module_param_array(ibl, int, boot_devs, 0444);
 MODULE_PARM_DESC(ibl, "Capture IBL size for " CARD_NAME " soundcard.");
@@ -176,3 +181,5 @@
 
 module_init(init_vxpocket);
 module_exit(exit_vxpocket);
+
+EXPORT_NO_SYMBOLS;

Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pcmcia/vx/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile    11 Nov 2003 13:12:26 -0000      1.9
+++ Makefile    7 Apr 2004 17:53:41 -0000       1.10
@@ -5,7 +5,7 @@
 include $(SND_TOPDIR)/toplevel.config
 include $(SND_TOPDIR)/Makefile.conf
 
-clean-files := vx_entry.c
+clean-files := vxpocket.c vx_entry.c
 
 export-objs = vx_entry.o
 
@@ -13,4 +13,5 @@
 
 include $(SND_TOPDIR)/Rules.make
 
+vxpocket.c: vxpocket.patch $(SND_TOPDIR)/alsa-kernel/pcmcia/vx/vxpocket.c
 vx_entry.c: vx_entry.patch vx_entry.inc vx_entry.inc1 
$(SND_TOPDIR)/alsa-kernel/pcmcia/vx/vx_entry.c

Index: vxp440.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pcmcia/vx/vxp440.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vxp440.c    8 Jan 2004 11:23:23 -0000       1.6
+++ vxp440.c    7 Apr 2004 17:53:41 -0000       1.7
@@ -1,17 +1,2 @@
-#include <linux/config.h>
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-#if defined(CONFIG_MODVERSIONS) && !defined(__GENKSYMS__) && !defined(__DEPEND__)
-#define MODVERSIONS
-#include <linux/modversions.h>
-#include "sndversions.h"
-#endif
-#endif
-
-#include "config.h"
-#include "adriver.h"
-#include "compat_cs.h"
-
-#include "../../alsa-kernel/pcmcia/vx/vxp440.c"
-EXPORT_NO_SYMBOLS;
+#define COMPILE_VXP440
+#include "vxpocket.c"

--- vxpocket.c DELETED ---



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to