[Asterisk-cvs] zaptel tor2.c, 1.19.2.1, 1.19.2.2 torisa.c, 1.8.2.1, 1.8.2.2 wcfxo.c, 1.25.2.1, 1.25.2.2 wcfxs.c, 1.84.2.3, 1.84.2.4 wct1xxp.c, 1.19.2.1, 1.19.2.2 wct4xxp.c, 1.51.2.1, 1.51.2.2 wcte11xp.c, 1.1.2.2, 1.1.2.3 zaptel.c, 1.95.2.3, 1.95.2.4 ztdummy.c, 1.4.2.1, 1.4.2.2 ztdynamic.c, 1.7.2.1, 1.7.2.2

russell at lists.digium.com russell at lists.digium.com
Thu Jan 13 17:41:50 CST 2005 

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

Modified Files:
      Tag: v1-0
	tor2.c torisa.c wcfxo.c wcfxs.c wct1xxp.c wct4xxp.c wcte11xp.c 
	zaptel.c ztdummy.c ztdynamic.c 
Log Message:
someone says this doesn't work, so I'm backing it out for now.


Index: tor2.c
===================================================================
RCS file: /usr/cvsroot/zaptel/tor2.c,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -d -r1.19.2.1 -r1.19.2.2
--- tor2.c	13 Jan 2005 18:42:35 -0000	1.19.2.1
+++ tor2.c	13 Jan 2005 23:45:43 -0000	1.19.2.2
@@ -1482,18 +1482,10 @@
 #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.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- torisa.c	13 Jan 2005 18:42:35 -0000	1.8.2.1
+++ torisa.c	13 Jan 2005 23:45:43 -0000	1.8.2.2
@@ -1158,20 +1158,11 @@
 #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.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- wcfxo.c	13 Jan 2005 18:42:35 -0000	1.25.2.1
+++ wcfxo.c	13 Jan 2005 23:45:43 -0000	1.25.2.2
@@ -1014,19 +1014,11 @@
 	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: wcfxs.c
===================================================================
RCS file: /usr/cvsroot/zaptel/Attic/wcfxs.c,v
retrieving revision 1.84.2.3
retrieving revision 1.84.2.4
diff -u -d -r1.84.2.3 -r1.84.2.4
--- wcfxs.c	13 Jan 2005 18:42:35 -0000	1.84.2.3
+++ wcfxs.c	13 Jan 2005 23:45:43 -0000	1.84.2.4
@@ -2177,20 +2177,6 @@
 	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");
@@ -2200,7 +2186,6 @@
 MODULE_PARM(lowpower, "i");
 MODULE_PARM(boostringer, "i");
 MODULE_PARM(fxshonormode, "i");
-#endif
 MODULE_DESCRIPTION("Wildcard TDM400P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 #ifdef MODULE_LICENSE

Index: wct1xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -d -r1.19.2.1 -r1.19.2.2
--- wct1xxp.c	13 Jan 2005 18:42:35 -0000	1.19.2.1
+++ wct1xxp.c	13 Jan 2005 23:45:43 -0000	1.19.2.2
@@ -1398,11 +1398,7 @@
 	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.51.2.1
retrieving revision 1.51.2.2
diff -u -d -r1.51.2.1 -r1.51.2.2
--- wct4xxp.c	13 Jan 2005 18:42:35 -0000	1.51.2.1
+++ wct4xxp.c	13 Jan 2005 23:45:43 -0000	1.51.2.2
@@ -1735,21 +1735,12 @@
 #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: wcte11xp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- wcte11xp.c	13 Jan 2005 18:42:35 -0000	1.1.2.2
+++ wcte11xp.c	13 Jan 2005 23:45:43 -0000	1.1.2.3
@@ -1554,19 +1554,11 @@
 	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.95.2.3
retrieving revision 1.95.2.4
diff -u -d -r1.95.2.3 -r1.95.2.4
--- zaptel.c	13 Jan 2005 18:42:35 -0000	1.95.2.3
+++ zaptel.c	13 Jan 2005 23:45:43 -0000	1.95.2.4
@@ -6209,14 +6209,8 @@
 #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.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- ztdummy.c	13 Jan 2005 18:42:35 -0000	1.4.2.1
+++ ztdummy.c	13 Jan 2005 23:45:43 -0000	1.4.2.2
@@ -227,12 +227,7 @@
 
 
 
-#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.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- ztdynamic.c	13 Jan 2005 18:42:35 -0000	1.7.2.1
+++ ztdynamic.c	13 Jan 2005 23:45:43 -0000	1.7.2.2
@@ -817,11 +817,7 @@
 	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

More information about the svn-commits mailing list