diff options
author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-04 15:59:39 +0000 |
---|---|---|
committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-04 15:59:39 +0000 |
commit | a4fe9246698c4dd4b060236cfed88c1fc01db02a (patch) | |
tree | af6c75e293d602295da6f8fe06da56ad42d25709 /wcte12xp | |
parent | a39b7271370a81fb32864c2de52f3c9aabfc6d8d (diff) |
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4133 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcte12xp')
-rw-r--r-- | wcte12xp/GpakApi.c | 16 | ||||
-rw-r--r-- | wcte12xp/GpakApi.h | 3 | ||||
-rw-r--r-- | wcte12xp/GpakErrs.h | 3 | ||||
-rw-r--r-- | wcte12xp/GpakHpi.h | 4 | ||||
-rw-r--r-- | wcte12xp/VPMADT032.bin | bin | 61370 -> 60980 bytes | |||
-rw-r--r-- | wcte12xp/gpakenum.h | 5 | ||||
-rw-r--r-- | wcte12xp/vpmadt032.c | 4 |
7 files changed, 9 insertions, 26 deletions
diff --git a/wcte12xp/GpakApi.c b/wcte12xp/GpakApi.c index 8e280a4..944c327 100644 --- a/wcte12xp/GpakApi.c +++ b/wcte12xp/GpakApi.c @@ -562,7 +562,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) | @@ -674,7 +674,7 @@ gpakConfigChanStatus_t gpakConfigureChannel( ((pChanConfig->SoftwareCompand & 3) << 2) | (pChanConfig->EcanEnableB << 1) | (pChanConfig->EcanEnableA & 1) - ); + ); MsgBuffer[7] = (DSP_WORD) pChanConfig->EcanParametersA.EcanTapLength; @@ -734,16 +734,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; diff --git a/wcte12xp/GpakApi.h b/wcte12xp/GpakApi.h index bd50926..e676b32 100644 --- a/wcte12xp/GpakApi.h +++ b/wcte12xp/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/wcte12xp/GpakErrs.h b/wcte12xp/GpakErrs.h index 3f0c8ae..3413f97 100644 --- a/wcte12xp/GpakErrs.h +++ b/wcte12xp/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; diff --git a/wcte12xp/GpakHpi.h b/wcte12xp/GpakHpi.h index 49e4ef9..790bb3c 100644 --- a/wcte12xp/GpakHpi.h +++ b/wcte12xp/GpakHpi.h @@ -75,6 +75,6 @@ #define MSG_READ_DSP_MEMORY 49 /* read small section of DSP's memory */ #define MSG_READ_DSP_MEMORY_REPLY 50 /* read memory reply */ -#define MSG_ACCESSGPIO 51 -#define MSG_ACCESSGPIO_REPLY 52 +#define MSG_ACCESSGPIO 51 +#define MSG_ACCESSGPIO_REPLY 52 #endif /* prevent multiple inclusion */ diff --git a/wcte12xp/VPMADT032.bin b/wcte12xp/VPMADT032.bin Binary files differindex e578521..e882060 100644 --- a/wcte12xp/VPMADT032.bin +++ b/wcte12xp/VPMADT032.bin diff --git a/wcte12xp/gpakenum.h b/wcte12xp/gpakenum.h index 91e4311..ed14a1a 100644 --- a/wcte12xp/gpakenum.h +++ b/wcte12xp/gpakenum.h @@ -114,7 +114,7 @@ typedef enum EnableMuLawSwCompanding = 6,// Enable Mu-law Software companding EnableALawSwCompanding = 7, // Enable Mu-law Software companding - BypassSwCompanding = 8, // Bypass Software companding + BypassSwCompanding = 8, // Bypass Software companding EnableDTMFMuteA = 9, // Mute A side Dtmf digit after tone detected DisableDTMFMuteA = 10, // Do not mute A side Dtmf digit once tone detected EnableDTMFMuteB = 11, // Mute B side Dtmf digit after tone detected @@ -174,7 +174,7 @@ typedef enum DtmfDigitPnd = 14, // DTMF Digit # DtmfDigitD = 15, // DTMF Digit D - FaxCngDigit = 90, // Fax Calling Tone (1100 Hz) + FaxCngDigit = 90, // Fax Calling Tone (1100 Hz) EndofMFDigit = 100, // End of MF digit EndofCngDigit = 101 // End of Cng Digit @@ -188,5 +188,4 @@ typedef enum GPIO_DIR = 2 } GpakGPIOCotrol_t; - #endif // end multiple inclusion diff --git a/wcte12xp/vpmadt032.c b/wcte12xp/vpmadt032.c index cdd8e00..24dffbb 100644 --- a/wcte12xp/vpmadt032.c +++ b/wcte12xp/vpmadt032.c @@ -1248,8 +1248,6 @@ int vpm150m_config_hw(struct t1 *wc) 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; @@ -1265,8 +1263,6 @@ int vpm150m_config_hw(struct t1 *wc) 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))) { module_printk("Unable to configure channel (%d)\n", res); |