git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4133 5390a7c7-147a-4af0-8ec9-7488f05a26cb

5 files changed, 20 insertions, 25 deletions

diff --git a/wctdm24xxp/GpakApi.c b/wctdm24xxp/GpakApi.c
index 70d6b35..9997b07 100644
--- a/wctdm24xxp/GpakApi.c
+++ b/wctdm24xxp/GpakApi.c
@@ -32,9 +32,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  */
- 
+
 #include <linux/version.h>
 #include <asm/semaphore.h>
+
 #include "zaptel.h"
 
 #include "GpakHpi.h"
@@ -562,7 +563,7 @@ gpakConfigPortStatus_t gpakConfigurePorts(
                     ((pPortConfig->RxFrameSyncPolarity2 << 4) & 0x0010) |
                     ((pPortConfig->TxFrameSyncPolarity2 << 3) & 0x0008) |
                     ((pPortConfig->CompandingMode2 << 1) & 0x0006) |
-                    (pPortConfig->SerialWordSize2 & 0x0001));
+                    (pPortConfig->SerialWordSize1 & 0x0001));
 
     MsgBuffer[12] = (DSP_WORD)
                    (((pPortConfig->DxDelay3 << 11) & 0x0800) |
@@ -734,16 +735,8 @@ gpakConfigChanStatus_t gpakConfigureChannel(
                          pChanConfig->EcanParametersB.EcanNumFirSegments;  
         MsgBuffer[34]  = (DSP_WORD)
                          pChanConfig->EcanParametersB.EcanFirSegmentLen;   
-        MsgBuffer[35]  = (DSP_WORD)
-                         pChanConfig->EcanParametersA.EcanTandemOperationEnable;  
-        MsgBuffer[36]  = (DSP_WORD)
-                         pChanConfig->EcanParametersA.EcanMixedFourWireMode;   
-        MsgBuffer[37]  = (DSP_WORD)
-                         pChanConfig->EcanParametersB.EcanTandemOperationEnable;  
-        MsgBuffer[38]  = (DSP_WORD)
-                         pChanConfig->EcanParametersB.EcanMixedFourWireMode;   
-
-        MsgLength = 78; // byte number == 39*2 
+
+        MsgLength = 70; // byte number == 35*2 
         break;
 
 
@@ -956,6 +949,9 @@ gpakReadEventFIFOMessageStat_t gpakReadEventFIFOMessage(
             if (EventDataLength > WORD_BUFFER_SIZE)
             {
                 gpakUnlockAccess(DspId);
+#if 0
+		printk("EventDataLength > WORD_BUFFER_SIZE (%d)\n", EventDataLength);
+#endif
                 return (RefInvalidEvent);
             }
             ReadCircBuffer(DspId, BufrBaseAddress, BufrLastAddress, &TakeAddress,
@@ -968,11 +964,18 @@ gpakReadEventFIFOMessageStat_t gpakReadEventFIFOMessage(
             TakeIndex += EventDataLength;
             if (TakeIndex >= BufrSize)
                 TakeIndex -= BufrSize;
-            if (EventDataLength != 4)
+            if (EventDataLength != 4) {
+#if 0
+		    printk("EventDataLength != 4 it's %d\n", EventDataLength);
+#endif
                 EventError = 1;
+	    }
             break;
 
         default:
+#if 0
+	    printk("Event Code not in switch\n");
+#endif
             EventError = 1;
             break;
     };
diff --git a/wctdm24xxp/GpakApi.h b/wctdm24xxp/GpakApi.h
index a435db3..df57c09 100644
--- a/wctdm24xxp/GpakApi.h
+++ b/wctdm24xxp/GpakApi.h
@@ -77,9 +77,6 @@ typedef struct
     short int EcanCrossCorrLimit;  // Echo Can Cross Correlation limit 
     short int EcanNumFirSegments;  // Echo Can Num FIR Segments 
     short int EcanFirSegmentLen;   // Echo Can FIR Segment Length 
-    short int EcanTandemOperationEnable;   //Enable tandem operation 
-    short int EcanMixedFourWireMode; 	// Handle possible 4-wire (echo-free) lines
-
 } GpakEcanParms_t;
 
 /* Definition of a Channel Configuration information structure. */
diff --git a/wctdm24xxp/VPMADT032.bin b/wctdm24xxp/VPMADT032.bin
index e578521..e882060 100644
--- a/wctdm24xxp/VPMADT032.bin
+++ b/wctdm24xxp/VPMADT032.bin
diff --git a/wctdm24xxp/base.c b/wctdm24xxp/base.c
index 0ac60aa..4ad5baf 100644
--- a/wctdm24xxp/base.c
+++ b/wctdm24xxp/base.c
@@ -183,7 +183,7 @@ static int vpmsupport = 1;
 static int vpmdtmfsupport = 0;
 #define VPM_DEFAULT_DTMFTHRESHOLD 1250
 static int dtmfthreshold = VPM_DEFAULT_DTMFTHRESHOLD;
-static int vpmnlptype = 3;
+static int vpmnlptype = 1;
 static int vpmnlpthresh = 24;
 static int vpmnlpmaxsupp = 0;
 #endif
@@ -2529,15 +2529,13 @@ static int vpm150m_config_hw(struct wctdm *wc)
 		chanconfig.EcanParametersA.EcanDblTalkThresh = 6;
 		chanconfig.EcanParametersA.EcanNlpThreshold = vpmnlpthresh;
 		chanconfig.EcanParametersA.EcanNlpConv = 0;
-		chanconfig.EcanParametersA.EcanNlpUnConv = 12;
+		chanconfig.EcanParametersA.EcanNlpUnConv = 0;
 		chanconfig.EcanParametersA.EcanNlpMaxSuppress = vpmnlpmaxsupp;
 		chanconfig.EcanParametersA.EcanCngThreshold = 43;
 		chanconfig.EcanParametersA.EcanAdaptLimit = 50;
 		chanconfig.EcanParametersA.EcanCrossCorrLimit = 15;
 		chanconfig.EcanParametersA.EcanNumFirSegments = 3;
 		chanconfig.EcanParametersA.EcanFirSegmentLen = 64;
-		chanconfig.EcanParametersA.EcanTandemOperationEnable = 1;
-		chanconfig.EcanParametersA.EcanMixedFourWireMode = 1;
 	
 		chanconfig.EcanParametersB.EcanTapLength = 1024;
 		chanconfig.EcanParametersB.EcanNlpType = vpmnlptype;
@@ -2546,15 +2544,13 @@ static int vpm150m_config_hw(struct wctdm *wc)
 		chanconfig.EcanParametersB.EcanDblTalkThresh = 6;
 		chanconfig.EcanParametersB.EcanNlpThreshold = vpmnlpthresh;
 		chanconfig.EcanParametersB.EcanNlpConv = 0;
-		chanconfig.EcanParametersB.EcanNlpUnConv = 12;
+		chanconfig.EcanParametersB.EcanNlpUnConv = 0;
 		chanconfig.EcanParametersB.EcanNlpMaxSuppress = vpmnlpmaxsupp;
 		chanconfig.EcanParametersB.EcanCngThreshold = 43;
 		chanconfig.EcanParametersB.EcanAdaptLimit = 50;
 		chanconfig.EcanParametersB.EcanCrossCorrLimit = 15;
 		chanconfig.EcanParametersB.EcanNumFirSegments = 3;
 		chanconfig.EcanParametersB.EcanFirSegmentLen = 64;
-		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);
diff --git a/wctdm24xxp/gpakErrs.h b/wctdm24xxp/gpakErrs.h
index 3f0c8ae..3413f97 100644
--- a/wctdm24xxp/gpakErrs.h
+++ b/wctdm24xxp/gpakErrs.h
@@ -99,8 +99,7 @@ typedef enum
 
 	Cc_InvalidMuteToneA = 51,        /* invalid MuteToneA set, no detector */
 	Cc_InvalidMuteToneB = 52,         /* invalid MuteToneB set, no detector */
-    Cc_InsuffFaxCngDetResources = 53,     /* insufficient tdm block resources avail. */
-	Cc_PortDmaNotStarted = 54,     /* SerialPort not ready  */
+    Cc_InsuffFaxCngDetResources = 53     /* insufficient tdm block resources avail. */
 
 } GPAK_ChannelConfigStat_t;