diff options
author | markster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-01-13 06:20:02 +0000 |
---|---|---|
committer | markster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-01-13 06:20:02 +0000 |
commit | bac68d2af34466cbaf0473684c47bb25dd44fd9f (patch) | |
tree | 6ffb0294c1100d496eb70ebbb73274418965e820 | |
parent | 69a127fe2d00903fbaa32a37695b22e163c41153 (diff) |
Fix for 2.6 module parm (bug #3321)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@546 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rwxr-xr-x | pciradio.c | 4 | ||||
-rwxr-xr-x | tor2.c | 8 | ||||
-rwxr-xr-x | torisa.c | 9 | ||||
-rwxr-xr-x | wcfxo.c | 8 | ||||
-rwxr-xr-x | wct1xxp.c | 4 | ||||
-rwxr-xr-x | wct4xxp.c | 9 | ||||
-rwxr-xr-x | wctdm.c | 15 | ||||
-rwxr-xr-x | wcte11xp.c | 8 | ||||
-rwxr-xr-x | zaptel.c | 6 | ||||
-rwxr-xr-x | ztdummy.c | 5 | ||||
-rwxr-xr-x | ztdynamic.c | 4 |
11 files changed, 80 insertions, 0 deletions
@@ -1692,7 +1692,11 @@ static void __exit pciradio_cleanup(void) 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@lambdatel.com>"); #ifdef MODULE_LICENSE @@ -1509,10 +1509,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); @@ -1158,11 +1158,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); @@ -1014,11 +1014,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 @@ -1398,7 +1398,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 @@ -1735,12 +1735,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); @@ -2211,6 +2211,20 @@ static void __exit wctdm_cleanup(void) 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(fxshonormode, "i"); MODULE_PARM(battdebounce, "i"); MODULE_PARM(battthresh, "i"); MODULE_PARM(alawoverride, "i"); +#endif MODULE_DESCRIPTION("Wildcard TDM400P Zaptel Driver"); MODULE_AUTHOR("Mark Spencer <markster@digium.com>"); #ifdef MODULE_LICENSE @@ -1557,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 @@ -6224,8 +6224,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, @@ -227,7 +227,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..9a2975c 100755 --- a/ztdynamic.c +++ b/ztdynamic.c @@ -817,7 +817,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 |