[svn-commits] kpfleming: branch mogorman/zaptel-1.2-transcoder
r2046 - in /team/mogorman/za...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Jan 31 07:22:11 MST 2007
Author: kpfleming
Date: Wed Jan 31 08:22:11 2007
New Revision: 2046
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2046
Log:
Merged revisions 2018,2038,2043 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2018 | russell | 2007-01-30 12:11:11 -0600 (Tue, 30 Jan 2007) | 5 lines
- Make the build of xpp occur with 2.6.8 or above, instead of 2.6.10
- remove the installation of the userspace tools
- remove the architecture check
(issue #8894, tzafrir)
........
r2038 | kpfleming | 2007-01-30 19:33:25 -0600 (Tue, 30 Jan 2007) | 2 lines
final fix for non-hotplug firmware loading
........
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:
team/mogorman/zaptel-1.2-transcoder/ (props changed)
team/mogorman/zaptel-1.2-transcoder/Makefile
team/mogorman/zaptel-1.2-transcoder/build_tools/genmodconf
team/mogorman/zaptel-1.2-transcoder/makefw.c
team/mogorman/zaptel-1.2-transcoder/pciradio.c
team/mogorman/zaptel-1.2-transcoder/tonezone.c
team/mogorman/zaptel-1.2-transcoder/tor2.c
team/mogorman/zaptel-1.2-transcoder/torisa.c
team/mogorman/zaptel-1.2-transcoder/torisatool.c
team/mogorman/zaptel-1.2-transcoder/wcfxo.c
team/mogorman/zaptel-1.2-transcoder/wcfxsusb.c
team/mogorman/zaptel-1.2-transcoder/wct1xxp.c
team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c
team/mogorman/zaptel-1.2-transcoder/wctdm.c
team/mogorman/zaptel-1.2-transcoder/wctdm24xxp.c
team/mogorman/zaptel-1.2-transcoder/wcusb.c
team/mogorman/zaptel-1.2-transcoder/zaptel.c
team/mogorman/zaptel-1.2-transcoder/ztcfg-dude.c
team/mogorman/zaptel-1.2-transcoder/ztcfg.c
team/mogorman/zaptel-1.2-transcoder/ztd-eth.c
team/mogorman/zaptel-1.2-transcoder/ztdynamic.c
team/mogorman/zaptel-1.2-transcoder/ztmonitor.c
team/mogorman/zaptel-1.2-transcoder/zttool.c
Propchange: team/mogorman/zaptel-1.2-transcoder/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 31 08:22:11 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-1999
+/branches/1.2:1-2045
Modified: team/mogorman/zaptel-1.2-transcoder/Makefile
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/Makefile?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/Makefile (original)
+++ team/mogorman/zaptel-1.2-transcoder/Makefile Wed Jan 31 08:22:11 2007
@@ -105,12 +105,12 @@
MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
- ztd-loc zttranscode # ztdummy
+ ztd-loc # ztdummy
#MODULES+=wcfxsusb
-# build ztdummy by default for 2.6 kernels
ifeq ($(BUILDVER),linux26)
-MODULES+=ztdummy
-endif
+MODULES+=ztdummy zttranscode
+endif
+MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
MODULESO:=$(MODULES:%=%.o)
MODULESKO:=$(MODULES:%=%.ko)
@@ -126,7 +126,7 @@
# This line is only meaningful when this Makefile is used as kconfig for
# 2.6 build
-ifneq (,$(shell [ 0$(SUBLEVEL) -ge 10 ] && [ "$(ARCH)" = 'i386' ] && echo 1))
+ifneq (,$(shell [ 0$(SUBLEVEL) -ge 8 ] && echo 1))
obj-m+=xpp/
endif
@@ -316,12 +316,7 @@
tar -zxf mISDNuser.tar.gz
$(MAKE) -C mISDNuser install
-xpp-install: FORCE
-ifneq (,$(findstring xpp,$(obj-m)))
- @$(MAKE) -C xpp/utils install
-endif
-
-install: all devices firmware xpp-install
+install: all devices firmware
install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
if [ -f sethdlc-new ]; then \
install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
@@ -359,7 +354,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 ztdummy zttranscode wctc4xxp,$(MODULES))"
+ build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel ztdummy zttranscode wctc4xxp,$(MODULES)) $(MODULE_ALIASES)"
@if [ -d /etc/modutils ]; then \
/sbin/update-modules ; \
fi
Modified: team/mogorman/zaptel-1.2-transcoder/build_tools/genmodconf
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/build_tools/genmodconf?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/build_tools/genmodconf (original)
+++ team/mogorman/zaptel-1.2-transcoder/build_tools/genmodconf Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/makefw.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/makefw.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/makefw.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/makefw.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/pciradio.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/pciradio.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/pciradio.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/pciradio.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/tonezone.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/tonezone.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/tonezone.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/tonezone.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/tor2.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/tor2.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/tor2.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/tor2.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/torisa.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/torisa.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/torisa.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/torisa.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/torisatool.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/torisatool.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/torisatool.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/torisatool.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/wcfxo.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wcfxo.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wcfxo.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wcfxo.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/wcfxsusb.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wcfxsusb.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wcfxsusb.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wcfxsusb.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wct1xxp.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wct1xxp.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wct1xxp.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c Wed Jan 31 08:22:11 2007
@@ -2679,8 +2679,8 @@
struct firmware embedded_firmware;
const struct firmware *firmware = &embedded_firmware;
#if !defined(HOTPLUG_FIRMWARE)
- extern void *_binary_OCT6114_64D_ima_size;
- extern void *_binary_OCT6114_128D_ima_size;
+ extern void _binary_OCT6114_64D_ima_size;
+ extern void _binary_OCT6114_128D_ima_size;
extern u8 _binary_OCT6114_64D_ima_start[];
extern u8 _binary_OCT6114_128D_ima_start[];
#endif
@@ -2725,7 +2725,7 @@
is to take its address, so we define it as a pointer and
then cast that value to the proper type.
*/
- embedded_firmware.size = (size_t) _binary_OCT6114_64D_ima_size;
+ embedded_firmware.size = (size_t) &_binary_OCT6114_64D_ima_size;
#endif
break;
case 128:
@@ -2743,7 +2743,7 @@
is to take its address, so we define it as a pointer and
then cast that value to the proper type.
*/
- embedded_firmware.size = (size_t) _binary_OCT6114_128D_ima_size;
+ embedded_firmware.size = (size_t) &_binary_OCT6114_128D_ima_size;
#endif
break;
default:
@@ -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: team/mogorman/zaptel-1.2-transcoder/wctdm.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wctdm.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wctdm.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wctdm.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wctdm24xxp.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wctdm24xxp.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wctdm24xxp.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/wcusb.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wcusb.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wcusb.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wcusb.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/zaptel.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/zaptel.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/zaptel.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/zaptel.c Wed Jan 31 08:22:11 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>.
*
@@ -6502,7 +6502,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: team/mogorman/zaptel-1.2-transcoder/ztcfg-dude.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/ztcfg-dude.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/ztcfg-dude.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/ztcfg-dude.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/ztcfg.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/ztcfg.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/ztcfg.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/ztcfg.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/ztd-eth.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/ztd-eth.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/ztd-eth.c Wed Jan 31 08:22:11 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.
*
@@ -404,7 +404,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: team/mogorman/zaptel-1.2-transcoder/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/ztdynamic.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/ztdynamic.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/ztdynamic.c Wed Jan 31 08:22:11 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.
*
@@ -830,7 +830,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: team/mogorman/zaptel-1.2-transcoder/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/ztmonitor.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/ztmonitor.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/ztmonitor.c Wed Jan 31 08:22:11 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: team/mogorman/zaptel-1.2-transcoder/zttool.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/zttool.c?view=diff&rev=2046&r1=2045&r2=2046
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/zttool.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/zttool.c Wed Jan 31 08:22:11 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 svn-commits
mailing list