all of the fixes for 2.6 from HEAD ... I think things are calm now

git-svn-id: http://svn.digium.com/svn/zaptel/branches/v1-0@562 5390a7c7-147a-4af0-8ec9-7488f05a26cb

10 files changed, 108 insertions, 2 deletions

diff --git a/tor2.c b/tor2.c
index 0311f55..f68228c 100755
--- a/tor2.c
+++ b/tor2.c
@@ -39,6 +39,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 #define NEED_PCI_IDS
 #include "tor2-hw.h"
 #include "tor2fw.h"
@@ -1482,10 +1485,18 @@ MODULE_DESCRIPTION("Tormenta 2 PCI Quad T1 or E1 Zaptel Driver");
 #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);
 
diff --git a/torisa.c b/torisa.c
index ca395c8..53b49fc 100755
--- a/torisa.c
+++ b/torisa.c
@@ -29,7 +29,6 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
- 
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #include "torisa.h"
@@ -37,6 +36,9 @@
 #include <linux/zaptel.h>
 #include <linux/torisa.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 /* Board address offsets (specified in word (not byte) offsets) */
 #define	DDATA 0			/* Data I/O Register */
@@ -1158,11 +1160,20 @@ MODULE_DESCRIPTION("Tormenta ISA Zapata Telephony Driver");
 #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);
diff --git a/wcfxo.c b/wcfxo.c
index 924a19d..9145d02 100755
--- a/wcfxo.c
+++ b/wcfxo.c
@@ -36,6 +36,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 /* Uncomment to enable tasklet handling in the FXO driver.  Not recommended
    in general, but may improve interactive performance */
@@ -1014,11 +1017,19 @@ static void __exit wcfxo_cleanup(void)
 	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@linux-support.net>");
 #ifdef MODULE_LICENSE
diff --git a/wcfxs.c b/wcfxs.c
index 46fd001..5169d41 100755
--- a/wcfxs.c
+++ b/wcfxs.c
@@ -31,7 +31,6 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
-
 #include "proslic.h"
 #include "wcfxs.h"
 /*
@@ -205,6 +204,10 @@ static struct fxo_mode {
 #include <linux/zaptel.h>
 #endif
 
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
+
 #define NUM_FXO_REGS 60
 
 #define WC_MAX_IFACES 128
@@ -2177,6 +2180,20 @@ static void __exit wcfxs_cleanup(void)
 	pci_unregister_driver(&wcfxs_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");
@@ -2186,6 +2203,7 @@ MODULE_PARM(timingonly, "i");
 MODULE_PARM(lowpower, "i");
 MODULE_PARM(boostringer, "i");
 MODULE_PARM(fxshonormode, "i");
+#endif
 MODULE_DESCRIPTION("Wildcard TDM400P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster@digium.com>");
 #ifdef MODULE_LICENSE
diff --git a/wct1xxp.c b/wct1xxp.c
index ad7ff6c..e014dcf 100755
--- a/wct1xxp.c
+++ b/wct1xxp.c
@@ -39,6 +39,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 #define WC_MAX_CARDS	32
 
@@ -1398,7 +1401,11 @@ static void __exit t1xxp_cleanup(void)
 	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@linux-support.net>");
 #ifdef MODULE_LICENSE
diff --git a/wct4xxp.c b/wct4xxp.c
index 66a4989..104ed2e 100755
--- a/wct4xxp.c
+++ b/wct4xxp.c
@@ -38,6 +38,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 #include "wct4xxp.h"
 
 /*
@@ -1735,12 +1738,21 @@ MODULE_DESCRIPTION("TE410P PCI Driver");
 #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);
 
diff --git a/wcte11xp.c b/wcte11xp.c
index 4e6e616..46a49ff 100755
--- a/wcte11xp.c
+++ b/wcte11xp.c
@@ -39,6 +39,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 #include "wct4xxp.h"	/* For certain definitions */
 
@@ -1554,11 +1557,19 @@ static void __exit t1xxp_cleanup(void)
 	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@linux-support.net>");
 #ifdef MODULE_LICENSE
diff --git a/zaptel.c b/zaptel.c
index 2afd616..c07bbd4 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -84,6 +84,10 @@
 #include <linux/zaptel.h>
 #endif
 
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
+
 /* Get helper arithmetic */
 #include "arith.h"
 #if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)
@@ -6209,8 +6213,14 @@ MODULE_DESCRIPTION("Zapata Telephony Interface");
 #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,
diff --git a/ztdummy.c b/ztdummy.c
index f849ac5..6bbb2d9 100755
--- a/ztdummy.c
+++ b/ztdummy.c
@@ -53,6 +53,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 #include "ztdummy.h"
 
 
@@ -227,7 +230,12 @@ void cleanup_module(void)
 
 
 
+#ifdef LINUX26
+module_param(debug, int, 0600);
+#else
 MODULE_PARM(debug, "i");
+#endif
+
 #ifndef LINUX26
 MODULE_PARM(monitor, "i");
 #endif
diff --git a/ztdynamic.c b/ztdynamic.c
index 3515e16..4d959dd 100755
--- a/ztdynamic.c
+++ b/ztdynamic.c
@@ -40,6 +40,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 /*
  * Tasklets provide better system interactive response at the cost of the
@@ -817,7 +820,11 @@ void ztdynamic_cleanup(void)
 	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@linux-support.net>");
 #ifdef MODULE_LICENSE