From 9dc5820bfd7c60ad191869bfedd49757141a9fcf Mon Sep 17 00:00:00 2001 From: russell Date: Thu, 13 Jan 2005 18:42:35 +0000 Subject: use module_parm for 2.6 (bug #3321) git-svn-id: http://svn.digium.com/svn/zaptel/branches/v1-0@547 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- tor2.c | 8 ++++++++ torisa.c | 9 +++++++++ wcfxo.c | 8 ++++++++ wcfxs.c | 15 +++++++++++++++ wct1xxp.c | 4 ++++ wct4xxp.c | 9 +++++++++ wcte11xp.c | 8 ++++++++ zaptel.c | 6 ++++++ ztdummy.c | 5 +++++ ztdynamic.c | 4 ++++ 10 files changed, 76 insertions(+) diff --git a/tor2.c b/tor2.c index 0311f55..8b6583b 100755 --- a/tor2.c +++ b/tor2.c @@ -1482,10 +1482,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..8ef23d6 100755 --- a/torisa.c +++ b/torisa.c @@ -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); diff --git a/wcfxo.c b/wcfxo.c index 924a19d..be7952f 100755 --- a/wcfxo.c +++ b/wcfxo.c @@ -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 "); #ifdef MODULE_LICENSE diff --git a/wcfxs.c b/wcfxs.c index 46fd001..b817c2f 100755 --- a/wcfxs.c +++ b/wcfxs.c @@ -2177,6 +2177,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 +2200,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 "); #ifdef MODULE_LICENSE diff --git a/wct1xxp.c b/wct1xxp.c index ad7ff6c..a801bf4 100755 --- a/wct1xxp.c +++ b/wct1xxp.c @@ -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 "); #ifdef MODULE_LICENSE diff --git a/wct4xxp.c b/wct4xxp.c index 66a4989..deef71d 100755 --- a/wct4xxp.c +++ b/wct4xxp.c @@ -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); diff --git a/wcte11xp.c b/wcte11xp.c index 4e6e616..0671596 100755 --- a/wcte11xp.c +++ b/wcte11xp.c @@ -1554,11 +1554,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 "); #ifdef MODULE_LICENSE diff --git a/zaptel.c b/zaptel.c index 2afd616..7e6f1c8 100755 --- a/zaptel.c +++ b/zaptel.c @@ -6209,8 +6209,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..7da9720 100755 --- a/ztdummy.c +++ b/ztdummy.c @@ -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 "); #ifdef MODULE_LICENSE -- cgit v1.2.3