[dahdi-commits] kpfleming: branch linux/kpfleming/modular_ec r4391 - in /linux/team/kpfleming...

SVN commits to the DAHDI project dahdi-commits at lists.digium.com
Wed Jun 18 11:28:38 CDT 2008


Author: kpfleming
Date: Wed Jun 18 10:41:46 2008
New Revision: 4391

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4391
Log:
various minor things, including marking all Digium-authored or licensed files as GPLv2, not just GPL

Modified:
    linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dummy.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_eth.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_loc.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_echocan_jpah.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_transcode.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/datamods/syncppp.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/pciradio.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/tor2.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/wcfxo.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/wct1xxp.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/wct4xxp/base.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/wctc4xxp/base.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm24xxp/base.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/wcte11xp.c
    linux/team/kpfleming/modular_ec/drivers/dahdi/wcte12xp/base.c
    linux/team/kpfleming/modular_ec/include/dahdi/kernel.h

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi-base.c Wed Jun 18 10:41:46 2008
@@ -350,17 +350,17 @@
 #endif
 
 struct echocan {
-	struct dahdi_echocan *ec;
+	const struct dahdi_echocan *ec;
 	struct module *owner;
 	struct echocan *next;
 };
 
-int dahdi_register_echocan(struct dahdi_echocan *ec, struct module *owner)
+int dahdi_register_echocan(const struct dahdi_echocan *ec, struct module *owner)
 {
 	return -1;
 }
 
-void dahdi_unregister_echocan(struct dahdi_echocan *ec)
+void dahdi_unregister_echocan(const struct dahdi_echocan *ec)
 {
 }
 
@@ -7344,12 +7344,8 @@
 
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
 MODULE_DESCRIPTION("DAHDI Telephony Interface");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
-#ifdef MODULE_VERSION
+MODULE_LICENSE("GPL v2");
 MODULE_VERSION(DAHDI_VERSION);
-#endif
 
 module_param(debug, int, 0644);
 module_param(deftaps, int, 0644);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dummy.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dummy.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dummy.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dummy.c Wed Jun 18 10:41:46 2008
@@ -332,6 +332,4 @@
 
 MODULE_DESCRIPTION("Dummy DAHDI Driver");
 MODULE_AUTHOR("Robert Pleh <robert.pleh at hermes.si>");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic.c Wed Jun 18 10:41:46 2008
@@ -844,9 +844,7 @@
 
 MODULE_DESCRIPTION("DAHDI Dynamic Span Support");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(ztdynamic_init);
 module_exit(ztdynamic_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_eth.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_eth.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_eth.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_eth.c Wed Jun 18 10:41:46 2008
@@ -429,9 +429,7 @@
 
 MODULE_DESCRIPTION("DAHDI Dynamic TDMoE Support");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(ztdeth_init);
 module_exit(ztdeth_exit);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_loc.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_loc.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_loc.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_dynamic_loc.c Wed Jun 18 10:41:46 2008
@@ -263,6 +263,5 @@
 
 module_init(ztdlocal_init);
 module_exit(ztdlocal_exit);
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+
+MODULE_LICENSE("GPL v2");

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_echocan_jpah.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_echocan_jpah.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_echocan_jpah.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_echocan_jpah.c Wed Jun 18 10:41:46 2008
@@ -6,13 +6,23 @@
  * Based upon mg2ec.h - sort of.
  * This "echo can" will completely hose your audio.
  * Don't use it unless you're absolutely sure you know what you're doing.
+ *
+ * Copyright (C) 2007-2008, Digium, Inc.
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  * 
- * Copyright (C) 2007, Digium, Inc.
- *
- * This program is free software and may be used and
- * distributed according to the terms of the GNU
- * General Public License, incorporated herein by
- * reference.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
  */
 
@@ -21,8 +31,14 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/ctype.h>
+#include <linux/moduleparam.h>
 
 #include <dahdi/kernel.h>
+
+static int debug;
+
+#define module_printk(level, fmt, args...) printk(level "%s: " fmt, THIS_MODULE->name, ## args)
+#define debug_printk(level, fmt, args...) if (debug >= level) printk("%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
 
 struct echo_can_state {
 	int blah;
@@ -87,15 +103,25 @@
 
 static int __init mod_init(void)
 {
+	if (dahdi_register_echocan(&me, THIS_MODULE)) {
+		module_printk(KERN_ERR, "could not register with DAHDI core");
+
+		return -EPERM;
+	}
+
+	return 0;
 }
 
 static void __exit mod_exit(void)
 {
+	dahdi_unregister_echocan(&me);
 }
+
+module_param(debug, int, S_IRUGO | S_IWUSR);
 
 MODULE_DESCRIPTION("DAHDI Jason Parker Audio Hoser");
 MODULE_AUTHOR("Jason Parker <jparker at digium.com>");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 
 module_init(mod_init);
 module_exit(mod_exit);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_transcode.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_transcode.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_transcode.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/dahdi_transcode.c Wed Jun 18 10:41:46 2008
@@ -441,7 +441,7 @@
 	.minor = 250,
 };
 
-int zttranscode_init(void)
+int dahdi_transcode_init(void)
 {
 	int res;
 
@@ -460,7 +460,7 @@
 	return 0;
 }
 
-void zttranscode_cleanup(void)
+void dahdi_transcode_cleanup(void)
 {
 	dahdi_unregister_chardev(&transcode_chardev);
 
@@ -473,9 +473,7 @@
 
 MODULE_DESCRIPTION("DAHDI Transcoder Support");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
-
-module_init(zttranscode_init);
-module_exit(zttranscode_cleanup);
+MODULE_LICENSE("GPL v2");
+
+module_init(dahdi_transcode_init);
+module_exit(dahdi_transcode_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/datamods/syncppp.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/datamods/syncppp.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/datamods/syncppp.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/datamods/syncppp.c Wed Jun 18 10:41:46 2008
@@ -1481,5 +1481,4 @@
 module_init(sync_ppp_init);
 module_exit(sync_ppp_cleanup);
 module_param(debug, int, 0);
-MODULE_LICENSE("GPL");
-
+MODULE_LICENSE("GPL v2");

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/pciradio.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/pciradio.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/pciradio.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/pciradio.c Wed Jun 18 10:41:46 2008
@@ -1888,10 +1888,7 @@
 
 MODULE_DESCRIPTION("DAHDI Telephony PCI Radio Card Driver");
 MODULE_AUTHOR("Jim Dixon <jim at lambdatel.com>");
-
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(pciradio_init);
 module_exit(pciradio_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/tor2.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/tor2.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/tor2.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/tor2.c Wed Jun 18 10:41:46 2008
@@ -1483,9 +1483,7 @@
 
 MODULE_AUTHOR("Mark Spencer");
 MODULE_DESCRIPTION("Tormenta 2 PCI Quad T1 or E1 DAHDI Driver");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_param(debug, int, 0600);
 module_param(loopback, int, 0600);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/wcfxo.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/wcfxo.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/wcfxo.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/wcfxo.c Wed Jun 18 10:41:46 2008
@@ -1061,9 +1061,7 @@
 
 MODULE_DESCRIPTION("Wildcard X100P DAHDI Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(wcfxo_init);
 module_exit(wcfxo_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/wct1xxp.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/wct1xxp.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/wct1xxp.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/wct1xxp.c Wed Jun 18 10:41:46 2008
@@ -1407,9 +1407,7 @@
 
 MODULE_DESCRIPTION("Wildcard T100P/E100P DAHDI Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(t1xxp_init);
 module_exit(t1xxp_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/wct4xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/wct4xxp/base.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/wct4xxp/base.c Wed Jun 18 10:41:46 2008
@@ -3816,12 +3816,9 @@
 
 MODULE_AUTHOR("Mark Spencer");
 MODULE_DESCRIPTION("Unified TE4XXP-TE2XXP PCI Driver");
-#if defined(MODULE_ALIAS)
 MODULE_ALIAS("wct2xxp");
-#endif
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
+
 module_param(pedanticpci, int, 0600);
 module_param(debug, int, 0600);
 module_param(loopback, int, 0600);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/wctc4xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/wctc4xxp/base.c Wed Jun 18 10:41:46 2008
@@ -2013,11 +2013,10 @@
 module_param(debug_notimeout, int, S_IRUGO | S_IWUSR);
 module_param(force_alert, int, S_IRUGO | S_IWUSR);
 module_param(mode, charp, S_IRUGO | S_IWUSR);
+
 MODULE_DESCRIPTION("Wildcard TC400P+TC400M Driver");
 MODULE_AUTHOR("John Sloan <jsloan at digium.com>");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(ztdte_init);
 module_exit(ztdte_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm.c Wed Jun 18 10:41:46 2008
@@ -2498,12 +2498,8 @@
 
 MODULE_DESCRIPTION("Wildcard TDM400P DAHDI Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
-#if defined(MODULE_ALIAS)
 MODULE_ALIAS("wcfxs");
-#endif
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(wctdm_init);
 module_exit(wctdm_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm24xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/wctdm24xxp/base.c Wed Jun 18 10:41:46 2008
@@ -4009,12 +4009,8 @@
 
 MODULE_DESCRIPTION("Wildcard TDM2400P/TDM800P DAHDI Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
-#if defined(MODULE_ALIAS)
 MODULE_ALIAS("wctdm8xxp");
-#endif
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(wctdm_init);
 module_exit(wctdm_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/wcte11xp.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/wcte11xp.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/wcte11xp.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/wcte11xp.c Wed Jun 18 10:41:46 2008
@@ -1611,9 +1611,7 @@
 
 MODULE_DESCRIPTION("Wildcard TE110P DAHDI Driver");
 MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(t1xxp_init);
 module_exit(t1xxp_cleanup);

Modified: linux/team/kpfleming/modular_ec/drivers/dahdi/wcte12xp/base.c
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/drivers/dahdi/wcte12xp/base.c?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/team/kpfleming/modular_ec/drivers/dahdi/wcte12xp/base.c Wed Jun 18 10:41:46 2008
@@ -1725,9 +1725,7 @@
 module_param(vpmtsisupport, int, S_IRUGO | S_IWUSR);
 #endif
 
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
-#endif
+MODULE_LICENSE("GPL v2");
 
 module_init(te12xp_init);
 module_exit(te12xp_cleanup);

Modified: linux/team/kpfleming/modular_ec/include/dahdi/kernel.h
URL: http://svn.digium.com/view/dahdi/linux/team/kpfleming/modular_ec/include/dahdi/kernel.h?view=diff&rev=4391&r1=4390&r2=4391
==============================================================================
--- linux/team/kpfleming/modular_ec/include/dahdi/kernel.h (original)
+++ linux/team/kpfleming/modular_ec/include/dahdi/kernel.h Wed Jun 18 10:41:46 2008
@@ -881,8 +881,8 @@
 	int (*echo_can_traintap)(struct echo_can_state *ec, int pos, short val);
 };
 
-int dahdi_register_echocan(struct dahdi_echocan *ec, struct module *owner);
-void dahdi_unregister_echocan(struct dahdi_echocan *ec);
+int dahdi_register_echocan(const struct dahdi_echocan *ec, struct module *owner);
+void dahdi_unregister_echocan(const struct dahdi_echocan *ec);
 
 struct dahdi_tone_def_header {
 	int count;		/* How many samples follow */




More information about the dahdi-commits mailing list