[svn-commits] trunk - r866 in /trunk: ./ build_tools/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Fri Dec 16 20:04:31 CST 2005
Author: kpfleming
Date: Fri Dec 16 20:04:30 2005
New Revision: 866
URL: http://svn.digium.com/view/zaptel?rev=866&view=rev
Log:
Merged revisions 865 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r865 | kpfleming | 2005-12-16 20:04:05 -0600 (Fri, 16 Dec 2005) | 3 lines
add version and echo canceller selection reporting when zaptel module is loaded
make 'update' target work like the Asterisk one and report conflicts
........
Added:
trunk/build_tools/
- copied from r865, branches/1.2/build_tools/
trunk/build_tools/make_svn_branch_name
- copied unchanged from r865, branches/1.2/build_tools/make_svn_branch_name
trunk/build_tools/make_version_h
- copied unchanged from r865, branches/1.2/build_tools/make_version_h
Modified:
trunk/ (props changed)
trunk/Makefile
trunk/zaptel.c
trunk/zaptel.h
Propchange: trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 16 20:04:30 2005
@@ -18,3 +18,6 @@
*.mod.c
.*.cmd
.tmp_versions
+*.so
+*.a
+version.h
Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 16 20:04:30 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-859
+/branches/1.2:1-865
Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=866&r1=865&r2=866&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Dec 16 20:04:30 2005
@@ -95,6 +95,21 @@
CHKCONFIG:=:
endif
+ifneq ($(wildcard .version),)
+ ZAPTELVERSION:=$(shell cat .version)
+endif
+
+# CVS mirrors of SVN have .svnrevision files showing
+# which SVN revision they are based on, and .svnbranch
+# showing the branch they are made from
+ifneq ($(wildcard .svnrevision),)
+ ZAPTELVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
+else
+ ifneq ($(wildcard .svn),)
+ ZAPTELVERSION=SVN-$(shell build_tools/make_svn_branch_name)
+ endif
+endif
+
TZOBJS:=zonedata.lo tonezone.lo
LIBTONEZONE_SO:=libtonezone.so
LIBTONEZONE_SO_MAJOR_VER:=1
@@ -137,13 +152,20 @@
MOD_DESTDIR:=zaptel
+version.h: FORCE
+ ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
+ if cmp -s $@.tmp $@ ; then echo; else \
+ mv $@.tmp $@ ; \
+ fi
+ rm -f $@.tmp
+
devel: tor2ee
tests: patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
tor2.o: tor2-hw.h tor2fw.h zaptel.h
-zaptel.o: zaptel.h digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
+zaptel.o: zaptel.h digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h version.h
torisa.o: zaptel.h torisa.h
@@ -206,7 +228,7 @@
zaptel.c: tones.h
-prereq: tones.h tor2fw.h radfw.h
+prereq: tones.h tor2fw.h radfw.h version.h
zttool.o: zttool.c zaptel.h
@@ -400,12 +422,24 @@
update:
@if [ -d .svn ]; then \
echo "Updating from Subversion..." ; \
- svn update -q; \
+ svn update | tee update.out; \
+ rm -f .version; \
+ if [ `grep -c ^C update.out` -gt 0 ]; then \
+ echo ; echo "The following files have conflicts:" ; \
+ grep ^C update.out | cut -b4- ; \
+ fi ; \
+ rm -f update.out; \
elif [ -d CVS ]; then \
echo "Updating from CVS..." ; \
- cvs -q -z3 update -Pd; \
+ cvs -q -z3 update -Pd | tee update.out; \
+ rm -f .version; \
+ if [ `grep -c ^C update.out` -gt 0 ]; then \
+ echo ; echo "The following files have conflicts:" ; \
+ grep ^C update.out | cut -d' ' -f2- ; \
+ fi ; \
+ rm -f update.out; \
else \
- echo "Not under version control"; \
+ echo "Not under version control"; \
fi
clean:
@@ -421,3 +455,5 @@
rm -f fxotune
rm -f core
rm -f ztcfg-shared fxstest
+
+FORCE:
Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?rev=866&r1=865&r2=866&view=diff
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Fri Dec 16 20:04:30 2005
@@ -38,6 +38,7 @@
#include "zconfig.h"
+#include "version.h"
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -6422,6 +6423,9 @@
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
#endif
+#ifdef MODULE_VERSION
+MODULE_VERSION(ZAPTEL_VERSION);
+#endif
#ifdef LINUX26
module_param(debug, int, 0600);
@@ -6540,6 +6544,8 @@
#endif /* CONFIG_DEVFS_FS */
printk(KERN_INFO "Zapata Telephony Interface Registered on major %d\n", ZT_MAJOR);
+ printk(KERN_INFO "Zaptel Version: %s Echo Canceller: %s\n", ZAPTEL_VERSION,
+ ZAPTEL_ECHO_CANCELLER ZAPTEL_ECHO_AGGRESSIVE);
zt_conv_init();
tone_zone_init();
fasthdlc_precalc();
Modified: trunk/zaptel.h
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.h?rev=866&r1=865&r2=866&view=diff
==============================================================================
--- trunk/zaptel.h (original)
+++ trunk/zaptel.h Fri Dec 16 20:04:30 2005
@@ -151,21 +151,34 @@
#define RING_DEBOUNCE_TIME 2000 /* 2000 ms ring debounce time */
+#ifdef AGGRESSIVE_SUPPRESSOR
+#define ZAPTEL_ECHO_AGGRESSIVE " (aggressive)"
+#else
+#define ZAPTEL_ECHO_AGGRESSIVE
+#endif
+
#ifdef __KERNEL__
/* Echo cancellation */
#if defined(ECHO_CAN_STEVE)
+#define ZAPTEL_ECHO_CANCELLER "STEVE"
#include "sec.h"
#elif defined(ECHO_CAN_STEVE2)
+#define ZAPTEL_ECHO_CANCELLER "STEVE2"
#include "sec-2.h"
#elif defined(ECHO_CAN_MARK)
+#define ZAPTEL_ECHO_CANCELLER "MARK"
#include "mec.h"
#elif defined(ECHO_CAN_MARK2)
+#define ZAPTEL_ECHO_CANCELLER "MARK2"
#include "mec2.h"
#elif defined(ECHO_CAN_KB1)
+#define ZAPTEL_ECHO_CANCELLER "KB1"
#include "kb1ec.h"
#elif defined(ECHO_CAN_MG2)
+#define ZAPTEL_ECHO_CANCELLER "MG2"
#include "mg2ec.h"
#else
+#define ZAPTEL_ECHO_CANCELLER "MARK3"
#include "mec3.h"
#endif
#endif
More information about the svn-commits
mailing list