summaryrefslogtreecommitdiff
path: root/wcte12xp/GpakApi.c
diff options
context:
space:
mode:
authormattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-03-19 19:58:37 +0000
committermattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-03-19 19:58:37 +0000
commit0ade252776e951a78e836ad3f4b126934c637bc1 (patch)
tree70d432cfae30bb1dd44f421d64a9b0a43a181a00 /wcte12xp/GpakApi.c
parente397098a1c390b5098627bb1ef417224b635f77e (diff)
Add support for new VPMADT032 fw for the TE120
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4028 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcte12xp/GpakApi.c')
-rw-r--r--wcte12xp/GpakApi.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/wcte12xp/GpakApi.c b/wcte12xp/GpakApi.c
index 43b844a..8582350 100644
--- a/wcte12xp/GpakApi.c
+++ b/wcte12xp/GpakApi.c
@@ -128,10 +128,10 @@ static int CheckDspReset(
DSP_ADDRESS IfBlockPntr; /* Interface Block pointer */
DSP_WORD DspStatus; /* DSP Status */
DSP_WORD DspChannels; /* number of DSP channels */
- //DSP_WORD DspConfs; /* number of DSP conferences */
- //DSP_ADDRESS PktBufrMem; /* address of Packet Buffer */
+ DSP_WORD DspConfs; /* number of DSP conferences */
+ DSP_ADDRESS PktBufrMem; /* address of Packet Buffer */
DSP_WORD Temp[2];
- //unsigned short int i; /* loop index / counter */
+ unsigned short int i; /* loop index / counter */
/* Read the pointer to the Interface Block. */
gpakReadDspMemory(DspId, DSP_IFBLK_ADDRESS, 2, Temp);
@@ -560,7 +560,7 @@ gpakConfigPortStatus_t gpakConfigurePorts(
((pPortConfig->RxFrameSyncPolarity2 << 4) & 0x0010) |
((pPortConfig->TxFrameSyncPolarity2 << 3) & 0x0008) |
((pPortConfig->CompandingMode2 << 1) & 0x0006) |
- (pPortConfig->SerialWordSize1 & 0x0001));
+ (pPortConfig->SerialWordSize2 & 0x0001));
MsgBuffer[12] = (DSP_WORD)
(((pPortConfig->DxDelay3 << 11) & 0x0800) |
@@ -672,7 +672,7 @@ gpakConfigChanStatus_t gpakConfigureChannel(
((pChanConfig->SoftwareCompand & 3) << 2) |
(pChanConfig->EcanEnableB << 1) |
(pChanConfig->EcanEnableA & 1)
- );
+ );
MsgBuffer[7] = (DSP_WORD)
pChanConfig->EcanParametersA.EcanTapLength;
@@ -732,8 +732,16 @@ gpakConfigChanStatus_t gpakConfigureChannel(
pChanConfig->EcanParametersB.EcanNumFirSegments;
MsgBuffer[34] = (DSP_WORD)
pChanConfig->EcanParametersB.EcanFirSegmentLen;
-
- MsgLength = 70; // byte number == 35*2
+ 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
break;
@@ -889,7 +897,7 @@ gpakReadEventFIFOMessageStat_t gpakReadEventFIFOMessage(
DSP_WORD TakeIndex; /* event fifo take index */
DSP_WORD WordsReady; /* number words ready for read out of event fifo */
DSP_WORD EventError; /* flag indicating error with event fifo msg */
- //DSP_WORD *pDebugData; /* debug data buffer pointer in event data struct */
+ DSP_WORD *pDebugData; /* debug data buffer pointer in event data struct */
/* Make sure the DSP Id is valid. */
if (DspId >= MAX_DSP_CORES)