[zaptel-commits] kpfleming: trunk r2045 - in /trunk: ./
build_tools/ wct4xxp/
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Wed Jan 31 07:17:48 MST 2007
Author: kpfleming
Date: Wed Jan 31 08:17:47 2007
New Revision: 2045
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2045
Log:
Merged revisions 2044 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r2044 | kpfleming | 2007-01-31 08:12:37 -0600 (Wed, 31 Jan 2007) | 12 lines
Merged revisions 2043 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2043 | kpfleming | 2007-01-31 08:06:34 -0600 (Wed, 31 Jan 2007) | 4 lines
fix up author email addresses
use the kernel's built-in support for module aliases instead of manually doing it in modprobe.conf or equivalent
add wctdm8xxp alias for wctdm24xxp
........
................
Modified:
trunk/ (props changed)
trunk/Makefile
trunk/build_tools/genmodconf
trunk/makefw.c
trunk/pciradio.c
trunk/tonezone.c
trunk/tor2.c
trunk/torisa.c
trunk/torisatool.c
trunk/wcfxo.c
trunk/wcfxsusb.c
trunk/wct1xxp.c
trunk/wct4xxp/base.c
trunk/wctdm.c
trunk/wctdm24xxp.c
trunk/wcusb.c
trunk/zaptel.c
trunk/ztcfg-dude.c
trunk/ztcfg.c
trunk/ztd-eth.c
trunk/ztdynamic.c
trunk/ztmonitor.c
trunk/zttool.c
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Jan 31 08:17:47 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044
Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jan 31 08:17:47 2007
@@ -135,6 +135,7 @@
endif
MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode
MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES))
+MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
MODULESO:=$(MODULES:%=%.o)
MODULESKO:=$(MODULES:%=%.ko)
@@ -405,7 +406,7 @@
$(INSTALL) -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
[ -f $(CONFIG_FILE) ] || $(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+ build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES)) $(MODULE_ALIASES)"
@if [ -d /etc/modutils ]; then \
/sbin/update-modules ; \
fi
Modified: trunk/build_tools/genmodconf
URL: http://svn.digium.com/view/zaptel/trunk/build_tools/genmodconf?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/build_tools/genmodconf (original)
+++ trunk/build_tools/genmodconf Wed Jan 31 08:17:47 2007
@@ -93,13 +93,6 @@
done
fi
-if ! grep -q "alias wcfxs" ${target}; then
- echo "alias wcfxs wctdm" >> ${target};
-fi;
-if ! grep -q "alias wct2xxp" ${target}; then
- echo "alias wct2xxp wct4xxp" >> ${target};
-fi;
-
if [ -z "${combined}" ]; then
echo "***"
echo "*** WARNING:"
Modified: trunk/makefw.c
URL: http://svn.digium.com/view/zaptel/trunk/makefw.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/makefw.c (original)
+++ trunk/makefw.c Wed Jan 31 08:17:47 2007
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
*
*/
Modified: trunk/pciradio.c
URL: http://svn.digium.com/view/zaptel/trunk/pciradio.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/pciradio.c (original)
+++ trunk/pciradio.c Wed Jan 31 08:17:47 2007
@@ -2,7 +2,7 @@
* PCI RADIO Card Zapata Telephony PCI Quad Radio Interface driver
*
* Written by Jim Dixon <jim at lambdatel.com>
- * Based on previous work by Mark Spencer <markster at linux-support.net>
+ * Based on previous work by Mark Spencer <markster at digium.com>
* Based on previous works, designs, and archetectures conceived and
* written by Jim Dixon <jim at lambdatel.com>.
*
Modified: trunk/tonezone.c
URL: http://svn.digium.com/view/zaptel/trunk/tonezone.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/tonezone.c (original)
+++ trunk/tonezone.c Wed Jan 31 08:17:47 2007
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
*
*/
Modified: trunk/tor2.c
URL: http://svn.digium.com/view/zaptel/trunk/tor2.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/tor2.c (original)
+++ trunk/tor2.c Wed Jan 31 08:17:47 2007
@@ -1,7 +1,7 @@
/*
* Tormenta 2 Quad-T1 PCI Driver
*
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
* Based on previous works, designs, and archetectures conceived and
* written by Jim Dixon <jim at lambdatel.com>.
*
Modified: trunk/torisa.c
URL: http://svn.digium.com/view/zaptel/trunk/torisa.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/torisa.c (original)
+++ trunk/torisa.c Wed Jan 31 08:17:47 2007
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Modified from original tor.c by Mark Spencer <markster at linux-support.net>
+ * Modified from original tor.c by Mark Spencer <markster at digium.com>
* original by Jim Dixon <jim at lambdatel.com>
*/
@@ -1157,7 +1157,7 @@
zt_unregister(&spans[1]);
}
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
MODULE_DESCRIPTION("Tormenta ISA Zapata Telephony Driver");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
Modified: trunk/torisatool.c
URL: http://svn.digium.com/view/zaptel/trunk/torisatool.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/torisatool.c (original)
+++ trunk/torisatool.c Wed Jan 31 08:17:47 2007
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Modified from original tor.c by Mark Spencer <markster at linux-support.net>
+ * Modified from original tor.c by Mark Spencer <markster at digium.com>
* original by Jim Dixon <jim at lambdatel.com>
*/
Modified: trunk/wcfxo.c
URL: http://svn.digium.com/view/zaptel/trunk/wcfxo.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/wcfxo.c (original)
+++ trunk/wcfxo.c Wed Jan 31 08:17:47 2007
@@ -1,8 +1,8 @@
/*
* Wilcard X100P FXO Interface Driver for Zapata Telephony interface
*
- * Written by Mark Spencer <markster at linux-support.net>
- * Matthew Fredrickson <creslin at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ * Matthew Fredrickson <creslin at digium.com>
*
* Copyright (C) 2001, Linux Support Services, Inc.
*
@@ -1032,7 +1032,7 @@
MODULE_PARM(opermode, "i");
#endif
MODULE_DESCRIPTION("Wildcard X100P Zaptel Driver");
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
#endif
Modified: trunk/wcfxsusb.c
URL: http://svn.digium.com/view/zaptel/trunk/wcfxsusb.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/wcfxsusb.c (original)
+++ trunk/wcfxsusb.c Wed Jan 31 08:17:47 2007
@@ -1,8 +1,8 @@
/*
* Wildcard S100U USB FXS Interface Zapata Telephony Driver
*
- * Written by Mark Spencer <markster at linux-support.net>
- * Matthew Fredrickson <creslin at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ * Matthew Fredrickson <creslin at digium.com>
*
* Copyright (C) 2001, Linux Support Services, Inc.
*
@@ -1513,7 +1513,7 @@
usb_deregister(&wc_usb_driver);
}
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
MODULE_DESCRIPTION("Wildcard USB FXS Interface driver");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
Modified: trunk/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wct1xxp.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/wct1xxp.c (original)
+++ trunk/wct1xxp.c Wed Jan 31 08:17:47 2007
@@ -1,9 +1,9 @@
/*
* Linux Support Services, Inc. Wildcard T100P T1/PRI card Driver
*
- * Written by Mark Spencer <markster at linux-support.net>
- * Matthew Fredrickson <creslin at linux-support.net>
- * William Meadows <wmeadows at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ * Matthew Fredrickson <creslin at digium.com>
+ * William Meadows <wmeadows at digium.com>
*
* Copyright (C) 2001, Linux Support Services, Inc.
*
@@ -1403,7 +1403,7 @@
MODULE_PARM(debug, "i");
#endif
MODULE_DESCRIPTION("Wildcard T100P/E100P Zaptel Driver");
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
#endif
Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Wed Jan 31 08:17:47 2007
@@ -3834,6 +3834,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
Modified: trunk/wctdm.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/wctdm.c (original)
+++ trunk/wctdm.c Wed Jan 31 08:17:47 2007
@@ -1,8 +1,8 @@
/*
* Wilcard TDM400P TDM FXS/FXO Interface Driver for Zapata Telephony interface
*
- * Written by Mark Spencer <markster at linux-support.net>
- * Matthew Fredrickson <creslin at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ * Matthew Fredrickson <creslin at digium.com>
*
* Copyright (C) 2001, Linux Support Services, Inc.
*
@@ -2512,6 +2512,9 @@
#endif
MODULE_DESCRIPTION("Wildcard TDM400P Zaptel Driver");
MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
+#if defined(MODULE_ALIAS)
+MODULE_ALIAS("wcfxs");
+#endif
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
#endif
Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Wed Jan 31 08:17:47 2007
@@ -3579,12 +3579,12 @@
#endif
MODULE_DESCRIPTION("Wildcard TDMXX00P Zaptel 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_init(wctdm_init);
module_exit(wctdm_cleanup);
-
-
-
Modified: trunk/wcusb.c
URL: http://svn.digium.com/view/zaptel/trunk/wcusb.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/wcusb.c (original)
+++ trunk/wcusb.c Wed Jan 31 08:17:47 2007
@@ -1,8 +1,8 @@
/*
* Wildcard S100U USB FXS Interface Zapata Telephony Driver
*
- * Written by Mark Spencer <markster at linux-support.net>
- * Matthew Fredrickson <creslin at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
+ * Matthew Fredrickson <creslin at digium.com>
*
* Copyright (C) 2001, Linux Support Services, Inc.
*
@@ -1475,7 +1475,7 @@
usb_deregister(&wc_usb_driver);
}
-MODULE_AUTHOR("Matthew Fredrickson <creslin at linux-support.net>");
+MODULE_AUTHOR("Matthew Fredrickson <creslin at digium.com>");
MODULE_DESCRIPTION("Wildcard USB FXS Interface driver");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Wed Jan 31 08:17:47 2007
@@ -1,7 +1,7 @@
/*
* Zapata Telephony Interface Driver
*
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
* Based on previous works, designs, and architectures conceived and
* written by Jim Dixon <jim at lambdatel.com>.
*
@@ -6853,7 +6853,7 @@
return 0;
}
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
MODULE_DESCRIPTION("Zapata Telephony Interface");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
Modified: trunk/ztcfg-dude.c
URL: http://svn.digium.com/view/zaptel/trunk/ztcfg-dude.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/ztcfg-dude.c (original)
+++ trunk/ztcfg-dude.c Wed Jan 31 08:17:47 2007
@@ -1,7 +1,7 @@
/*
* Configuration program for Zapata Telephony Interface
*
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
* Based on previous works, designs, and architectures conceived and
* written by Jim Dixon <jim at lambdatel.com>.
*
@@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
*
*/
Modified: trunk/ztcfg.c
URL: http://svn.digium.com/view/zaptel/trunk/ztcfg.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/ztcfg.c (original)
+++ trunk/ztcfg.c Wed Jan 31 08:17:47 2007
@@ -1,7 +1,7 @@
/*
* Configuration program for Zapata Telephony Interface
*
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
* Based on previous works, designs, and architectures conceived and
* written by Jim Dixon <jim at lambdatel.com>.
*
@@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
* Radio Support by Jim Dixon <jim at lambdatel.com>
*/
Modified: trunk/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/trunk/ztd-eth.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/ztd-eth.c (original)
+++ trunk/ztd-eth.c Wed Jan 31 08:17:47 2007
@@ -1,7 +1,7 @@
/*
* Dynamic Span Interface for Zaptel (Ethernet Interface)
*
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
*
* Copyright (C) 2001, Linux Support Services, Inc.
*
@@ -426,7 +426,7 @@
}
MODULE_DESCRIPTION("Zaptel Dynamic TDMoE Support");
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
#endif
Modified: trunk/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/trunk/ztdynamic.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/ztdynamic.c (original)
+++ trunk/ztdynamic.c Wed Jan 31 08:17:47 2007
@@ -1,7 +1,7 @@
/*
* Dynamic Span Interface for Zaptel
*
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
*
* Copyright (C) 2001, Linux Support Services, Inc.
*
@@ -859,7 +859,7 @@
MODULE_PARM(debug, "i");
#endif
MODULE_DESCRIPTION("Zaptel Dynamic Span Support");
-MODULE_AUTHOR("Mark Spencer <markster at linux-support.net>");
+MODULE_AUTHOR("Mark Spencer <markster at digium.com>");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
#endif
Modified: trunk/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/trunk/ztmonitor.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/ztmonitor.c (original)
+++ trunk/ztmonitor.c Wed Jan 31 08:17:47 2007
@@ -1,7 +1,7 @@
/*
* Monitor a Zaptel Channel
*
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
* Based on previous works, designs, and architectures conceived and
* written by Jim Dixon <jim at lambdatel.com>.
*
@@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
*
*/
Modified: trunk/zttool.c
URL: http://svn.digium.com/view/zaptel/trunk/zttool.c?view=diff&rev=2045&r1=2044&r2=2045
==============================================================================
--- trunk/zttool.c (original)
+++ trunk/zttool.c Wed Jan 31 08:17:47 2007
@@ -1,7 +1,7 @@
/*
* Configuration program for Zapata Telephony Interface
*
- * Written by Mark Spencer <markster at linux-support.net>
+ * Written by Mark Spencer <markster at digium.com>
* Based on previous works, designs, and architectures conceived and
* written by Jim Dixon <jim at lambdatel.com>.
*
@@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Primary Author: Mark Spencer <markster at linux-support.net>
+ * Primary Author: Mark Spencer <markster at digium.com>
*
*/
More information about the zaptel-commits
mailing list