[zaptel-commits] mspiceland: branch mspiceland/zaptel-1.2-adtapiupdatefor117 r4419 - in /team/...

[SVN commits to the Zaptel project]

Author: mspiceland
Date: Thu Jul 17 17:52:06 2008
New Revision: 4419

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4419
Log:
Apply Matt F's patch from VPMADT032 which should configure the ADT firmware 
to match HPEC.

Modified:
    team/mspiceland/zaptel-1.2-adtapiupdatefor117/wctdm24xxp/base.c
    team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/base.c
    team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/vpmadt032.c

Modified: team/mspiceland/zaptel-1.2-adtapiupdatefor117/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mspiceland/zaptel-1.2-adtapiupdatefor117/wctdm24xxp/base.c?view=diff&rev=4419&r1=4418&r2=4419
==============================================================================
--- team/mspiceland/zaptel-1.2-adtapiupdatefor117/wctdm24xxp/base.c (original)
+++ team/mspiceland/zaptel-1.2-adtapiupdatefor117/wctdm24xxp/base.c Thu Jul 17 17:52:06 2008
@@ -184,7 +184,7 @@
 static int vpmdtmfsupport = 0;
 #define VPM_DEFAULT_DTMFTHRESHOLD 1250
 static int dtmfthreshold = VPM_DEFAULT_DTMFTHRESHOLD;
-static int vpmnlptype = 1;
+static int vpmnlptype = 3; /* Hoth noise */
 static int vpmnlpthresh = 24;
 static int vpmnlpmaxsupp = 0;
 #endif
@@ -2531,7 +2531,7 @@
 		chanconfig.EcanParametersA.EcanMaxDoubleTalkThres = 40;
 		chanconfig.EcanParametersA.EcanNlpThreshold = vpmnlpthresh;
 		chanconfig.EcanParametersA.EcanNlpConv = 0;
-		chanconfig.EcanParametersA.EcanNlpUnConv = 0;
+		chanconfig.EcanParametersA.EcanNlpUnConv = 12;
 		chanconfig.EcanParametersA.EcanNlpMaxSuppress = vpmnlpmaxsupp;
 		chanconfig.EcanParametersA.EcanCngThreshold = 43;
 		chanconfig.EcanParametersA.EcanAdaptLimit = 50;
@@ -2539,6 +2539,8 @@
 		chanconfig.EcanParametersA.EcanNumFirSegments = 3;
 		chanconfig.EcanParametersA.EcanFirSegmentLen = 48;
 		chanconfig.EcanParametersA.EcanReconvergenceCheckEnable = 1;
+		chanconfig.EcanParametersA.EcanTandemOperationEnable = 1;
+		chanconfig.EcanParametersA.EcanMixedFourWireMode = 1;
 	
 		chanconfig.EcanParametersB.EcanTapLength = 1024;
 		chanconfig.EcanParametersB.EcanNlpType = vpmnlptype;
@@ -2548,7 +2550,7 @@
 		chanconfig.EcanParametersB.EcanMaxDoubleTalkThres = 40;
 		chanconfig.EcanParametersB.EcanNlpThreshold = vpmnlpthresh;
 		chanconfig.EcanParametersB.EcanNlpConv = 0;
-		chanconfig.EcanParametersB.EcanNlpUnConv = 0;
+		chanconfig.EcanParametersB.EcanNlpUnConv = 12;
 		chanconfig.EcanParametersB.EcanNlpMaxSuppress = vpmnlpmaxsupp;
 		chanconfig.EcanParametersB.EcanCngThreshold = 43;
 		chanconfig.EcanParametersB.EcanAdaptLimit = 50;
@@ -2556,6 +2558,8 @@
 		chanconfig.EcanParametersB.EcanNumFirSegments = 3;
 		chanconfig.EcanParametersB.EcanFirSegmentLen = 48;
 		chanconfig.EcanParametersB.EcanReconvergenceCheckEnable = 1;
+		chanconfig.EcanParametersB.EcanTandemOperationEnable = 1;
+		chanconfig.EcanParametersB.EcanMixedFourWireMode = 1;
 	
 		if ((res = gpakConfigureChannel(vpm150m->dspid, i, tdmToTdm, &chanconfig, &cstatus))) {
 			printk("Unable to configure channel (%d)\n", res);

Modified: team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/base.c
URL: http://svn.digium.com/view/zaptel/team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/base.c?view=diff&rev=4419&r1=4418&r2=4419
==============================================================================
--- team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/base.c (original)
+++ team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/base.c Thu Jul 17 17:52:06 2008
@@ -92,7 +92,7 @@
 int vpmsupport = 1;
 int vpmdtmfsupport = 0;
 int vpmtsisupport = 0;
-int vpmnlptype = 1;
+int vpmnlptype = 3; /* Hoth noise */
 int vpmnlpthresh = 24;
 int vpmnlpmaxsupp = 0;
 #endif

Modified: team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/vpmadt032.c?view=diff&rev=4419&r1=4418&r2=4419
==============================================================================
--- team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/vpmadt032.c (original)
+++ team/mspiceland/zaptel-1.2-adtapiupdatefor117/wcte12xp/vpmadt032.c Thu Jul 17 17:52:06 2008
@@ -1247,7 +1247,7 @@
 		chanconfig.EcanParametersA.EcanMaxDoubleTalkThres = 40;
 		chanconfig.EcanParametersA.EcanNlpThreshold = vpmnlpthresh;
 		chanconfig.EcanParametersA.EcanNlpConv = 0;
-		chanconfig.EcanParametersA.EcanNlpUnConv = 0;
+		chanconfig.EcanParametersA.EcanNlpUnConv = 12;
 		chanconfig.EcanParametersA.EcanNlpMaxSuppress = vpmnlpmaxsupp;
 		chanconfig.EcanParametersA.EcanCngThreshold = 43;
 		chanconfig.EcanParametersA.EcanAdaptLimit = 50;
@@ -1255,6 +1255,8 @@
 		chanconfig.EcanParametersA.EcanNumFirSegments = 3;
 		chanconfig.EcanParametersA.EcanFirSegmentLen = 48;
 		chanconfig.EcanParametersA.EcanReconvergenceCheckEnable = 1;
+		chanconfig.EcanParametersA.EcanTandemOperationEnable = 1;
+		chanconfig.EcanParametersA.EcanMixedFourWireMode = 1;
 	
 		chanconfig.EcanParametersB.EcanTapLength = 1024;
 		chanconfig.EcanParametersB.EcanNlpType = vpmnlptype;
@@ -1264,7 +1266,7 @@
 		chanconfig.EcanParametersB.EcanMaxDoubleTalkThres = 40;
 		chanconfig.EcanParametersB.EcanNlpThreshold = vpmnlpthresh;
 		chanconfig.EcanParametersB.EcanNlpConv = 0;
-		chanconfig.EcanParametersB.EcanNlpUnConv = 0;
+		chanconfig.EcanParametersB.EcanNlpUnConv = 12;
 		chanconfig.EcanParametersB.EcanNlpMaxSuppress = vpmnlpmaxsupp;
 		chanconfig.EcanParametersB.EcanCngThreshold = 43;
 		chanconfig.EcanParametersB.EcanAdaptLimit = 50;
@@ -1272,6 +1274,8 @@
 		chanconfig.EcanParametersB.EcanNumFirSegments = 3;
 		chanconfig.EcanParametersB.EcanFirSegmentLen = 48;
 		chanconfig.EcanParametersB.EcanReconvergenceCheckEnable = 1;
+		chanconfig.EcanParametersB.EcanTandemOperationEnable = 1;
+		chanconfig.EcanParametersB.EcanMixedFourWireMode = 1;
 	
 		if ((res = gpakConfigureChannel(vpm150m->dspid, i, tdmToTdm, &chanconfig, &cstatus))) {
 			module_printk("Unable to configure channel (%d)\n", res);