[Asterisk-cvs] zaptel pciradio.c, 1.5, 1.6 tor2.c, 1.20, 1.21 torisa.c, 1.8, 1.9 wcfxo.c, 1.26, 1.27 wct1xxp.c, 1.19, 1.20 wct4xxp.c, 1.52, 1.53 wctdm.c, 1.98, 1.99 wcte11xp.c, 1.5, 1.6 zaptel.c, 1.99, 1.100 ztdummy.c, 1.4, 1.5 ztdynamic.c, 1.7, 1.8

Thu Jan 13 00:16:04 CST 2005

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv17713

Modified Files:
	pciradio.c tor2.c torisa.c wcfxo.c wct1xxp.c wct4xxp.c wctdm.c 
	wcte11xp.c zaptel.c ztdummy.c ztdynamic.c 
Log Message:
Fix for 2.6 module parm (bug #3321)


Index: pciradio.c
===================================================================
RCS file: /usr/cvsroot/zaptel/pciradio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6

--- pciradio.c	22 Dec 2004 04:44:26 -0000	1.5
+++ pciradio.c	13 Jan 2005 06:20:02 -0000	1.6
@@ -1692,7 +1692,11 @@
 	pci_unregister_driver(&pciradio_driver);
 }
 
+#ifdef LINUX26
+module_param(debug, int, 0600);
+#else
 MODULE_PARM(debug, "i");
+#endif
 MODULE_DESCRIPTION("Zapate Telephony PCI Radio Card Zaptel Driver");
 MODULE_AUTHOR("Jim Dixon <jim at lambdatel.com>");
 #ifdef MODULE_LICENSE

Index: tor2.c
===================================================================
RCS file: /usr/cvsroot/zaptel/tor2.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- tor2.c	12 Nov 2004 21:44:02 -0000	1.20
+++ tor2.c	13 Jan 2005 06:20:02 -0000	1.21
@@ -1509,10 +1509,18 @@
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
+
+#ifdef LINUX26
+module_param(debug, int, 0600);
+module_param(loopback, int, 0600);
+module_param(timingcable, int, 0600);
+module_param(japan, int, 0600);
+#else
 MODULE_PARM(debug, "i");
 MODULE_PARM(loopback, "i");
 MODULE_PARM(timingcable, "i");
 MODULE_PARM(japan, "i");
+#endif
 
 MODULE_DEVICE_TABLE(pci, tor2_pci_ids);
 

Index: torisa.c
===================================================================
RCS file: /usr/cvsroot/zaptel/torisa.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- torisa.c	6 Jan 2004 13:26:44 -0000	1.8
+++ torisa.c	13 Jan 2005 06:20:02 -0000	1.9
@@ -1158,11 +1158,20 @@
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
+
+#ifdef LINUX26
+module_param(prefmaster, int, 0600);
+module_param(base, long, 0600);
+module_param(irq, int, 0600);
+module_param(syncsrc, int, 0600);
+module_param(debug, int, 0600);
+#else
 MODULE_PARM(prefmaster, "i");
 MODULE_PARM(base, "i");
 MODULE_PARM(irq, "i");
 MODULE_PARM(syncsrc, "i");
 MODULE_PARM(debug, "i");
+#endif
 
 module_init(tor_init);
 module_exit(tor_exit);

Index: wcfxo.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxo.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- wcfxo.c	14 Dec 2004 22:37:19 -0000	1.26
+++ wcfxo.c	13 Jan 2005 06:20:02 -0000	1.27
@@ -1014,11 +1014,19 @@
 	pci_unregister_driver(&wcfxo_driver);
 }
 
+#ifdef LINUX26
+module_param(debug, int, 0600);
+module_param(quiet, int, 0600);
+module_param(boost, int, 0600);
+module_param(monitor, int, 0600);
+module_param(opermode, int, 0600);
+#else
 MODULE_PARM(debug, "i");
 MODULE_PARM(quiet, "i");
 MODULE_PARM(boost, "i");
 MODULE_PARM(monitor, "i");
 MODULE_PARM(opermode, "i");
+#endif
 MODULE_DESCRIPTION("Wildcard X100P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
 #ifdef MODULE_LICENSE

Index: wct1xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- wct1xxp.c	13 Jun 2004 16:34:45 -0000	1.19
+++ wct1xxp.c	13 Jan 2005 06:20:02 -0000	1.20
@@ -1398,7 +1398,11 @@
 	pci_unregister_driver(&t1xxp_driver);
 }
 
+#ifdef LINUX26
+module_param(debug, int, 0600);
+#else
 MODULE_PARM(debug, "i");
+#endif
 MODULE_DESCRIPTION("Wildcard T100P/E100P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
 #ifdef MODULE_LICENSE

Index: wct4xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct4xxp.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- wct4xxp.c	14 Oct 2004 15:22:08 -0000	1.52
+++ wct4xxp.c	13 Jan 2005 06:20:02 -0000	1.53
@@ -1735,12 +1735,21 @@
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
+#ifdef LINUX26
+module_param(debug, int, 0600);
+module_param(loopback, int, 0600);
+module_param(noburst, int, 0600);
+module_param(timingcable, int, 0600);
+module_param(t1e1override, int, 0600);
+module_param(alarmdebounce, int, 0600);
+#else
 MODULE_PARM(debug, "i");
 MODULE_PARM(loopback, "i");
 MODULE_PARM(noburst, "i");
 MODULE_PARM(timingcable, "i");
 MODULE_PARM(t1e1override, "i");
 MODULE_PARM(alarmdebounce, "i");
+#endif
 
 MODULE_DEVICE_TABLE(pci, t4_pci_tbl);
 

Index: wctdm.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wctdm.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- wctdm.c	8 Jan 2005 00:05:24 -0000	1.98
+++ wctdm.c	13 Jan 2005 06:20:02 -0000	1.99
@@ -2211,6 +2211,20 @@
 	pci_unregister_driver(&wctdm_driver);
 }
 
+#ifdef LINUX26
+module_param(debug, int, 0600);
+module_param(loopcurrent, int, 0600);
+module_param(robust, int, 0600);
+module_param(_opermode, int, 0600);
+module_param(opermode, charp, 0600);
+module_param(timingonly, int, 0600);
+module_param(lowpower, int, 0600);
+module_param(boostringer, int, 0600);
+module_param(fxshonormode, int, 0600);
+module_param(battdebounce, int, 0600);
+module_param(battthresh, int, 0600);
+module_param(alawoverride, int, 0600);
+#else
 MODULE_PARM(debug, "i");
 MODULE_PARM(loopcurrent, "i");
 MODULE_PARM(robust, "i");
@@ -2223,6 +2237,7 @@
 MODULE_PARM(battdebounce, "i");
 MODULE_PARM(battthresh, "i");
 MODULE_PARM(alawoverride, "i");
+#endif
 MODULE_DESCRIPTION("Wildcard TDM400P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 #ifdef MODULE_LICENSE

Index: wcte11xp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wcte11xp.c	20 Dec 2004 20:01:57 -0000	1.5
+++ wcte11xp.c	13 Jan 2005 06:20:02 -0000	1.6
@@ -1557,11 +1557,19 @@
 	pci_unregister_driver(&t1xxp_driver);
 }
 
+#ifdef LINUX26
+module_param(alarmdebounce, int, 0600);
+module_param(loopback, int, 0600);
+module_param(t1e1override, int, 0600);
+module_param(clockextra, int, 0600);
+module_param(debug, int, 0600);
+#else
 MODULE_PARM(alarmdebounce, "i");
 MODULE_PARM(loopback, "i");
 MODULE_PARM(t1e1override, "i");
 MODULE_PARM(clockextra, "i");
 MODULE_PARM(debug, "i");
+#endif
 MODULE_DESCRIPTION("Wildcard T100P/E100P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
 #ifdef MODULE_LICENSE

Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- zaptel.c	12 Jan 2005 15:59:59 -0000	1.99
+++ zaptel.c	13 Jan 2005 06:20:02 -0000	1.100
@@ -6224,8 +6224,14 @@
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
+
+#ifdef LINUX26
+module_param(debug, int, 0600);
+module_param(deftaps, int, 0600);
+#else
 MODULE_PARM(debug, "i");
 MODULE_PARM(deftaps, "i");
+#endif
 
 static struct file_operations zt_fops = {
 	owner: THIS_MODULE,

Index: ztdummy.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztdummy.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ztdummy.c	26 Jun 2004 19:52:06 -0000	1.4
+++ ztdummy.c	13 Jan 2005 06:20:02 -0000	1.5
@@ -227,7 +227,12 @@
 
 
 
+#ifdef LINUX26
+module_param(debug, int, 0600);
+#else
 MODULE_PARM(debug, "i");
+#endif
+
 #ifndef LINUX26
 MODULE_PARM(monitor, "i");
 #endif

Index: ztdynamic.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztdynamic.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ztdynamic.c	16 Aug 2004 17:27:12 -0000	1.7
+++ ztdynamic.c	13 Jan 2005 06:20:02 -0000	1.8
@@ -817,7 +817,11 @@
 	printk("Zaptel Dynamic Span support unloaded\n");
 }
 
+#ifdef LINUX26
+module_param(debug, int, 0600);
+#else
 MODULE_PARM(debug, "i");
+#endif
 MODULE_DESCRIPTION("Zaptel Dynamic Span Support");
 MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
 #ifdef MODULE_LICENSE


