[svn-commits] mspiceland: branch linux/mspiceland/dahdi-trunk-adtapiupdatefor117 r4616 - in...

[SVN commits to the Digium repositories]

Author: mspiceland
Date: Thu Jul 17 20:32:28 2008
New Revision: 4616

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


Modified:
    linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c
    linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/base.c
    linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c

Modified: linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=4616&r1=4615&r2=4616
==============================================================================
--- linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c Thu Jul 17 20:32:28 2008
@@ -206,7 +206,7 @@
  * 4 : Suppression NLP - In order to use this, you must set the vpmnlpmaxsupp parameter to
  * 	some value in order to give the amount of dB to suppress to the suppressor
  */
-static int vpmnlptype = 1;
+static int vpmnlptype = 3; /* Hoth noise */
 /* This is the threshold (in dB) for enabling and disabling of the NLP */
 static int vpmnlpthresh = 24;
 /* See vpmnlptype = 4 for more info */
@@ -2937,7 +2937,7 @@
 	chanconfig->EcanParametersA.EcanMaxDoubleTalkThres = 40;
 	chanconfig->EcanParametersA.EcanNlpThreshold = parms->nlp_threshold;
 	chanconfig->EcanParametersA.EcanNlpConv = 0;
-	chanconfig->EcanParametersA.EcanNlpUnConv = 0;
+	chanconfig->EcanParametersA.EcanNlpUnConv = 12;
 	chanconfig->EcanParametersA.EcanNlpMaxSuppress = parms->nlp_max_suppress;
 	chanconfig->EcanParametersA.EcanCngThreshold = 43;
 	chanconfig->EcanParametersA.EcanAdaptLimit = 50;
@@ -2945,6 +2945,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 = parms->nlp_type;
@@ -2954,7 +2956,7 @@
 	chanconfig->EcanParametersB.EcanMaxDoubleTalkThres = 40;
 	chanconfig->EcanParametersB.EcanNlpThreshold = parms->nlp_threshold;
 	chanconfig->EcanParametersB.EcanNlpConv = 0;
-	chanconfig->EcanParametersB.EcanNlpUnConv = 0;
+	chanconfig->EcanParametersB.EcanNlpUnConv = 12;
 	chanconfig->EcanParametersB.EcanNlpMaxSuppress = parms->nlp_max_suppress;
 	chanconfig->EcanParametersB.EcanCngThreshold = 43;
 	chanconfig->EcanParametersB.EcanAdaptLimit = 50;
@@ -2962,6 +2964,8 @@
 	chanconfig->EcanParametersB.EcanNumFirSegments = 3;
 	chanconfig->EcanParametersB.EcanFirSegmentLen = 48;
 	chanconfig->EcanParametersB.EcanReconvergenceCheckEnable = 1;
+	chanconfig->EcanParametersB.EcanTandemOperationEnable = 1;
+	chanconfig->EcanParametersB.EcanMixedFourWireMode = 1;
 }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)

Modified: linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/base.c
URL: http://svn.digium.com/view/dahdi/linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/base.c?view=diff&rev=4616&r1=4615&r2=4616
==============================================================================
--- linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/base.c Thu Jul 17 20:32:28 2008
@@ -93,7 +93,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: linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/dahdi/linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c?view=diff&rev=4616&r1=4615&r2=4616
==============================================================================
--- linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c (original)
+++ linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c Thu Jul 17 20:32:28 2008
@@ -1254,7 +1254,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;
@@ -1262,6 +1262,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;
@@ -1271,7 +1273,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;
@@ -1279,6 +1281,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);