[zaptel-commits] mattf: branch mattf/zaptel-1.2-vpmadt032fwupdate r4026 - in /team/mattf/zapte...

[SVN commits to the Zaptel project]

Author: mattf
Date: Wed Mar 19 14:39:53 2008
New Revision: 4026

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4026
Log:
Merged revisions 3988,4012,4025 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3988 | mattf | 2008-03-14 11:32:55 -0500 (Fri, 14 Mar 2008) | 1 line

Update wctdm24xxp's VPMADT032 firmware to version 1.16
........
r4012 | tzafrir | 2008-03-18 18:51:15 -0500 (Tue, 18 Mar 2008) | 4 lines

* We need to silence the echo-canceller buffers as well.
* But no need to cancel echo on channels without PCM.
* Switch to FXS hardware DTMF detection again.

........
r4025 | mattf | 2008-03-19 13:51:44 -0500 (Wed, 19 Mar 2008) | 1 line

Make sure this check is made in 1.2 as well
........

Modified:
    team/mattf/zaptel-1.2-vpmadt032fwupdate/   (props changed)
    team/mattf/zaptel-1.2-vpmadt032fwupdate/wctdm24xxp/base.c
    team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/card_fxs.c
    team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/xbus-pcm.c

Propchange: team/mattf/zaptel-1.2-vpmadt032fwupdate/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 19 14:39:53 2008
@@ -1,1 +1,1 @@
-/branches/1.2:1-3986
+/branches/1.2:1-4025

Modified: team/mattf/zaptel-1.2-vpmadt032fwupdate/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.2-vpmadt032fwupdate/wctdm24xxp/base.c?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- team/mattf/zaptel-1.2-vpmadt032fwupdate/wctdm24xxp/base.c (original)
+++ team/mattf/zaptel-1.2-vpmadt032fwupdate/wctdm24xxp/base.c Wed Mar 19 14:39:53 2008
@@ -2673,6 +2673,10 @@
 				continue;
 			}
 
+			if (res == RefNoEventAvail) {
+				continue;
+			}
+
 			if (eventcode == EventToneDetect) {
 				GpakToneCodes_t tone = eventdata.toneEvent.ToneCode;
 				int duration = eventdata.toneEvent.ToneDuration;

Modified: team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/card_fxs.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/card_fxs.c?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/card_fxs.c (original)
+++ team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/card_fxs.c Wed Mar 19 14:39:53 2008
@@ -36,7 +36,7 @@
 DEF_PARM(int, print_dbg, 0, 0644, "Print DBG statements");	/* must be before zap_debug.h */
 DEF_PARM_BOOL(reversepolarity, 0, 0644, "Reverse Line Polarity");
 DEF_PARM_BOOL(vmwineon, 0, 0644, "Indicate voicemail to a neon lamp");
-DEF_PARM_BOOL(dtmf_detection, 0, 0644, "Do DTMF detection in hardware");
+DEF_PARM_BOOL(dtmf_detection, 1, 0644, "Do DTMF detection in hardware");
 #ifdef	POLL_DIGITAL_INPUTS
 DEF_PARM(uint, poll_digital_inputs, 1000, 0644, "Poll Digital Inputs");
 #endif

Modified: team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/xbus-pcm.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/xbus-pcm.c?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/xbus-pcm.c (original)
+++ team/mattf/zaptel-1.2-vpmadt032fwupdate/xpp/xbus-pcm.c Wed Mar 19 14:39:53 2008
@@ -675,6 +675,8 @@
 	for (i = 0;i < xpd->span.channels; i++) {
 		if(unlikely(IS_SET(xpd->digital_signalling, i)))	/* Don't echo cancel BRI D-chans */
 			continue;
+		if(!IS_SET(xpd->wanted_pcm_mask, i))			/* No ec for unwanted PCM */
+			continue;
 #ifdef XPP_EC_CHUNK 
 		/* even if defined, parameterr xpp_ec can override at run-time */
 		if (xpp_ec)
@@ -860,8 +862,11 @@
 		volatile u_char	*r = xpd->span.chans[i].readchunk;
 
 		if(!IS_SET(xpd->wanted_pcm_mask, i)) {
-			if(IS_SET(xpd->silence_pcm, i))
+			if(IS_SET(xpd->silence_pcm, i)) {
 				memset((u_char *)r, 0x7F, ZT_CHUNKSIZE);	// SILENCE
+				memset(xpd->ec_chunk2[i], 0x7F, ZT_CHUNKSIZE);
+				memset(xpd->ec_chunk1[i], 0x7F, ZT_CHUNKSIZE);
+			}
 			continue;
 		}
 		pcm_mask &= ~xpd->mute_dtmf;