From cd4a85bab390f3370848bc6394ea1c3227e15336 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 31 Jan 2007 14:12:37 +0000 Subject: 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 ........ git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2044 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- Makefile | 3 ++- build_tools/genmodconf | 7 ------- makefw.c | 2 +- pciradio.c | 2 +- tonezone.c | 2 +- tor2.c | 2 +- torisa.c | 4 ++-- torisatool.c | 2 +- wcfxo.c | 6 +++--- wcfxsusb.c | 6 +++--- wct1xxp.c | 8 ++++---- wct4xxp/base.c | 3 +++ wctdm.c | 7 +++++-- wctdm24xxp.c | 6 +++--- wcusb.c | 6 +++--- zaptel.c | 4 ++-- ztcfg-dude.c | 4 ++-- ztcfg.c | 4 ++-- ztd-eth.c | 4 ++-- ztdynamic.c | 4 ++-- ztmonitor.c | 4 ++-- zttool.c | 4 ++-- 22 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index c9e579e..a64ec03 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,7 @@ ifeq ($(findstring xpp_usb,$(MENUSELECT_MODULES)),) 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) @@ -398,7 +399,7 @@ endif $(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 diff --git a/build_tools/genmodconf b/build_tools/genmodconf index 34da3ea..9f65d8b 100755 --- a/build_tools/genmodconf +++ b/build_tools/genmodconf @@ -93,13 +93,6 @@ elif [ "${1}" = "linux26" ]; then 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:" diff --git a/makefw.c b/makefw.c index c73d731..6a5b0d9 100644 --- a/makefw.c +++ b/makefw.c @@ -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 + * Primary Author: Mark Spencer * */ diff --git a/pciradio.c b/pciradio.c index ff423a9..382294b 100644 --- a/pciradio.c +++ b/pciradio.c @@ -2,7 +2,7 @@ * PCI RADIO Card Zapata Telephony PCI Quad Radio Interface driver * * Written by Jim Dixon - * Based on previous work by Mark Spencer + * Based on previous work by Mark Spencer * Based on previous works, designs, and archetectures conceived and * written by Jim Dixon . * diff --git a/tonezone.c b/tonezone.c index c455919..deb1ac1 100644 --- a/tonezone.c +++ b/tonezone.c @@ -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 + * Primary Author: Mark Spencer * */ diff --git a/tor2.c b/tor2.c index bc92e84..fd6fb65 100644 --- a/tor2.c +++ b/tor2.c @@ -1,7 +1,7 @@ /* * Tormenta 2 Quad-T1 PCI Driver * - * Written by Mark Spencer + * Written by Mark Spencer * Based on previous works, designs, and archetectures conceived and * written by Jim Dixon . * diff --git a/torisa.c b/torisa.c index 1492732..2d48cc3 100644 --- a/torisa.c +++ b/torisa.c @@ -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 + * Modified from original tor.c by Mark Spencer * original by Jim Dixon */ @@ -1157,7 +1157,7 @@ static void __exit tor_exit(void) zt_unregister(&spans[1]); } -MODULE_AUTHOR("Mark Spencer "); +MODULE_AUTHOR("Mark Spencer "); MODULE_DESCRIPTION("Tormenta ISA Zapata Telephony Driver"); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); diff --git a/torisatool.c b/torisatool.c index 34287ae..5334289 100644 --- a/torisatool.c +++ b/torisatool.c @@ -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 + * Modified from original tor.c by Mark Spencer * original by Jim Dixon */ diff --git a/wcfxo.c b/wcfxo.c index cc4a540..eed5d5f 100644 --- a/wcfxo.c +++ b/wcfxo.c @@ -1,8 +1,8 @@ /* * Wilcard X100P FXO Interface Driver for Zapata Telephony interface * - * Written by Mark Spencer - * Matthew Fredrickson + * Written by Mark Spencer + * Matthew Fredrickson * * Copyright (C) 2001, Linux Support Services, Inc. * @@ -1029,7 +1029,7 @@ MODULE_PARM(monitor, "i"); MODULE_PARM(opermode, "i"); #endif MODULE_DESCRIPTION("Wildcard X100P Zaptel Driver"); -MODULE_AUTHOR("Mark Spencer "); +MODULE_AUTHOR("Mark Spencer "); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); #endif diff --git a/wcfxsusb.c b/wcfxsusb.c index 71e90a0..85ee9bc 100644 --- a/wcfxsusb.c +++ b/wcfxsusb.c @@ -1,8 +1,8 @@ /* * Wildcard S100U USB FXS Interface Zapata Telephony Driver * - * Written by Mark Spencer - * Matthew Fredrickson + * Written by Mark Spencer + * Matthew Fredrickson * * Copyright (C) 2001, Linux Support Services, Inc. * @@ -1513,7 +1513,7 @@ static void __exit wc_cleanup(void) usb_deregister(&wc_usb_driver); } -MODULE_AUTHOR("Mark Spencer "); +MODULE_AUTHOR("Mark Spencer "); MODULE_DESCRIPTION("Wildcard USB FXS Interface driver"); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); diff --git a/wct1xxp.c b/wct1xxp.c index a637e26..81e428e 100644 --- a/wct1xxp.c +++ b/wct1xxp.c @@ -1,9 +1,9 @@ /* * Linux Support Services, Inc. Wildcard T100P T1/PRI card Driver * - * Written by Mark Spencer - * Matthew Fredrickson - * William Meadows + * Written by Mark Spencer + * Matthew Fredrickson + * William Meadows * * Copyright (C) 2001, Linux Support Services, Inc. * @@ -1403,7 +1403,7 @@ module_param(debug, int, 0600); MODULE_PARM(debug, "i"); #endif MODULE_DESCRIPTION("Wildcard T100P/E100P Zaptel Driver"); -MODULE_AUTHOR("Mark Spencer "); +MODULE_AUTHOR("Mark Spencer "); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); #endif diff --git a/wct4xxp/base.c b/wct4xxp/base.c index 6a219d4..7ba6246 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -3829,6 +3829,9 @@ static void __exit t4_cleanup(void) 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 diff --git a/wctdm.c b/wctdm.c index 436f404..05ec616 100644 --- a/wctdm.c +++ b/wctdm.c @@ -1,8 +1,8 @@ /* * Wilcard TDM400P TDM FXS/FXO Interface Driver for Zapata Telephony interface * - * Written by Mark Spencer - * Matthew Fredrickson + * Written by Mark Spencer + * Matthew Fredrickson * * Copyright (C) 2001, Linux Support Services, Inc. * @@ -2512,6 +2512,9 @@ MODULE_PARM(fxsrxgain, "i"); #endif MODULE_DESCRIPTION("Wildcard TDM400P Zaptel Driver"); MODULE_AUTHOR("Mark Spencer "); +#if defined(MODULE_ALIAS) +MODULE_ALIAS("wcfxs"); +#endif #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); #endif diff --git a/wctdm24xxp.c b/wctdm24xxp.c index 8752c17..d0430ea 100644 --- a/wctdm24xxp.c +++ b/wctdm24xxp.c @@ -3577,12 +3577,12 @@ MODULE_PARM(dtmfthreshold, "i"); #endif MODULE_DESCRIPTION("Wildcard TDM2400P/TDM800P Zaptel Driver"); MODULE_AUTHOR("Mark Spencer "); +#if defined(MODULE_ALIAS) +MODULE_ALIAS("wctdm8xxp"); +#endif #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); #endif module_init(wctdm_init); module_exit(wctdm_cleanup); - - - diff --git a/wcusb.c b/wcusb.c index 2d1f7fd..9e5008e 100644 --- a/wcusb.c +++ b/wcusb.c @@ -1,8 +1,8 @@ /* * Wildcard S100U USB FXS Interface Zapata Telephony Driver * - * Written by Mark Spencer - * Matthew Fredrickson + * Written by Mark Spencer + * Matthew Fredrickson * * Copyright (C) 2001, Linux Support Services, Inc. * @@ -1475,7 +1475,7 @@ static void __exit wc_cleanup(void) usb_deregister(&wc_usb_driver); } -MODULE_AUTHOR("Matthew Fredrickson "); +MODULE_AUTHOR("Matthew Fredrickson "); MODULE_DESCRIPTION("Wildcard USB FXS Interface driver"); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); diff --git a/zaptel.c b/zaptel.c index f8cf888..c519310 100644 --- a/zaptel.c +++ b/zaptel.c @@ -1,7 +1,7 @@ /* * Zapata Telephony Interface Driver * - * Written by Mark Spencer + * Written by Mark Spencer * Based on previous works, designs, and architectures conceived and * written by Jim Dixon . * @@ -6853,7 +6853,7 @@ int zt_receive(struct zt_span *span) return 0; } -MODULE_AUTHOR("Mark Spencer "); +MODULE_AUTHOR("Mark Spencer "); MODULE_DESCRIPTION("Zapata Telephony Interface"); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); diff --git a/ztcfg-dude.c b/ztcfg-dude.c index e132e8e..f1027f4 100644 --- a/ztcfg-dude.c +++ b/ztcfg-dude.c @@ -1,7 +1,7 @@ /* * Configuration program for Zapata Telephony Interface * - * Written by Mark Spencer + * Written by Mark Spencer * Based on previous works, designs, and architectures conceived and * written by Jim Dixon . * @@ -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 + * Primary Author: Mark Spencer * */ diff --git a/ztcfg.c b/ztcfg.c index 611a347..8bd07cb 100644 --- a/ztcfg.c +++ b/ztcfg.c @@ -1,7 +1,7 @@ /* * Configuration program for Zapata Telephony Interface * - * Written by Mark Spencer + * Written by Mark Spencer * Based on previous works, designs, and architectures conceived and * written by Jim Dixon . * @@ -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 + * Primary Author: Mark Spencer * Radio Support by Jim Dixon */ diff --git a/ztd-eth.c b/ztd-eth.c index 3bcc880..4391656 100644 --- a/ztd-eth.c +++ b/ztd-eth.c @@ -1,7 +1,7 @@ /* * Dynamic Span Interface for Zaptel (Ethernet Interface) * - * Written by Mark Spencer + * Written by Mark Spencer * * Copyright (C) 2001, Linux Support Services, Inc. * @@ -426,7 +426,7 @@ static void __exit ztdeth_exit(void) } MODULE_DESCRIPTION("Zaptel Dynamic TDMoE Support"); -MODULE_AUTHOR("Mark Spencer "); +MODULE_AUTHOR("Mark Spencer "); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); #endif diff --git a/ztdynamic.c b/ztdynamic.c index 8950f9c..f202630 100644 --- a/ztdynamic.c +++ b/ztdynamic.c @@ -1,7 +1,7 @@ /* * Dynamic Span Interface for Zaptel * - * Written by Mark Spencer + * Written by Mark Spencer * * Copyright (C) 2001, Linux Support Services, Inc. * @@ -859,7 +859,7 @@ module_param(debug, int, 0600); MODULE_PARM(debug, "i"); #endif MODULE_DESCRIPTION("Zaptel Dynamic Span Support"); -MODULE_AUTHOR("Mark Spencer "); +MODULE_AUTHOR("Mark Spencer "); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); #endif diff --git a/ztmonitor.c b/ztmonitor.c index 4e519e8..43333e3 100644 --- a/ztmonitor.c +++ b/ztmonitor.c @@ -1,7 +1,7 @@ /* * Monitor a Zaptel Channel * - * Written by Mark Spencer + * Written by Mark Spencer * Based on previous works, designs, and architectures conceived and * written by Jim Dixon . * @@ -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 + * Primary Author: Mark Spencer * */ diff --git a/zttool.c b/zttool.c index 3c71674..8b7fda6 100644 --- a/zttool.c +++ b/zttool.c @@ -1,7 +1,7 @@ /* * Configuration program for Zapata Telephony Interface * - * Written by Mark Spencer + * Written by Mark Spencer * Based on previous works, designs, and architectures conceived and * written by Jim Dixon . * @@ -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 + * Primary Author: Mark Spencer * */ -- cgit v1.2.3