[zaptel-commits] kpfleming: branch 1.2 r2043 - in /branches/1.2: ./
build_tools/ wct4xxp/
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Wed Jan 31 07:06:35 MST 2007
Author: kpfleming
Date: Wed Jan 31 08:06:34 2007
New Revision: 2043
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2043
Log:
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:
branches/1.2/Makefile
branches/1.2/build_tools/genmodconf
branches/1.2/makefw.c
branches/1.2/pciradio.c
branches/1.2/tonezone.c
branches/1.2/tor2.c
branches/1.2/torisa.c
branches/1.2/torisatool.c
branches/1.2/wcfxo.c
branches/1.2/wcfxsusb.c
branches/1.2/wct1xxp.c
branches/1.2/wct4xxp/base.c
branches/1.2/wctdm.c
branches/1.2/wctdm24xxp.c
branches/1.2/wcusb.c
branches/1.2/zaptel.c
branches/1.2/ztcfg-dude.c
branches/1.2/ztcfg.c
branches/1.2/ztd-eth.c
branches/1.2/ztdynamic.c
branches/1.2/ztmonitor.c
branches/1.2/zttool.c
Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed Jan 31 08:06:34 2007
@@ -111,6 +111,7 @@
ifeq ($(BUILDVER),linux26)
MODULES+=ztdummy
endif
+MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
MODULESO:=$(MODULES:%=%.o)
MODULESKO:=$(MODULES:%=%.ko)
@@ -352,7 +353,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) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+ build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES)) $(MODULE_ALIASES)"
@if [ -d /etc/modutils ]; then \
/sbin/update-modules ; \
fi
Modified: branches/1.2/build_tools/genmodconf
URL: http://svn.digium.com/view/zaptel/branches/1.2/build_tools/genmodconf?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/build_tools/genmodconf (original)
+++ branches/1.2/build_tools/genmodconf Wed Jan 31 08:06:34 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: branches/1.2/makefw.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/makefw.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/makefw.c (original)
+++ branches/1.2/makefw.c Wed Jan 31 08:06:34 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: branches/1.2/pciradio.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/pciradio.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/pciradio.c (original)
+++ branches/1.2/pciradio.c Wed Jan 31 08:06:34 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: branches/1.2/tonezone.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/tonezone.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/tonezone.c (original)
+++ branches/1.2/tonezone.c Wed Jan 31 08:06:34 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: branches/1.2/tor2.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/tor2.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/tor2.c (original)
+++ branches/1.2/tor2.c Wed Jan 31 08:06:34 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: branches/1.2/torisa.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/torisa.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/torisa.c (original)
+++ branches/1.2/torisa.c Wed Jan 31 08:06:34 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>
*/
@@ -1159,7 +1159,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: branches/1.2/torisatool.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/torisatool.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/torisatool.c (original)
+++ branches/1.2/torisatool.c Wed Jan 31 08:06:34 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: branches/1.2/wcfxo.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcfxo.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/wcfxo.c (original)
+++ branches/1.2/wcfxo.c Wed Jan 31 08:06:34 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.
*
@@ -1029,7 +1029,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: branches/1.2/wcfxsusb.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcfxsusb.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/wcfxsusb.c (original)
+++ branches/1.2/wcfxsusb.c Wed Jan 31 08:06:34 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.
*
@@ -1514,7 +1514,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: branches/1.2/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct1xxp.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/wct1xxp.c (original)
+++ branches/1.2/wct1xxp.c Wed Jan 31 08:06:34 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: branches/1.2/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/base.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/wct4xxp/base.c (original)
+++ branches/1.2/wct4xxp/base.c Wed Jan 31 08:06:34 2007
@@ -3398,6 +3398,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: branches/1.2/wctdm.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/wctdm.c (original)
+++ branches/1.2/wctdm.c Wed Jan 31 08:06:34 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.
*
@@ -2425,6 +2425,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: branches/1.2/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm24xxp.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/wctdm24xxp.c (original)
+++ branches/1.2/wctdm24xxp.c Wed Jan 31 08:06:34 2007
@@ -2947,12 +2947,12 @@
#endif
MODULE_DESCRIPTION("Wildcard TDM2400P/TDM800P 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: branches/1.2/wcusb.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcusb.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/wcusb.c (original)
+++ branches/1.2/wcusb.c Wed Jan 31 08:06:34 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.
*
@@ -1476,7 +1476,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: branches/1.2/zaptel.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/zaptel.c (original)
+++ branches/1.2/zaptel.c Wed Jan 31 08:06:34 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>.
*
@@ -6454,7 +6454,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: branches/1.2/ztcfg-dude.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztcfg-dude.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/ztcfg-dude.c (original)
+++ branches/1.2/ztcfg-dude.c Wed Jan 31 08:06:34 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: branches/1.2/ztcfg.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztcfg.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/ztcfg.c (original)
+++ branches/1.2/ztcfg.c Wed Jan 31 08:06:34 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: branches/1.2/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztd-eth.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/ztd-eth.c (original)
+++ branches/1.2/ztd-eth.c Wed Jan 31 08:06:34 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.
*
@@ -403,7 +403,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: branches/1.2/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztdynamic.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/ztdynamic.c (original)
+++ branches/1.2/ztdynamic.c Wed Jan 31 08:06:34 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.
*
@@ -829,7 +829,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: branches/1.2/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztmonitor.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/ztmonitor.c (original)
+++ branches/1.2/ztmonitor.c Wed Jan 31 08:06:34 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: branches/1.2/zttool.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/zttool.c?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- branches/1.2/zttool.c (original)
+++ branches/1.2/zttool.c Wed Jan 31 08:06:34 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