diff options
| author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-03-19 20:05:32 +0000 |
|---|---|---|
| committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-03-19 20:05:32 +0000 |
| commit | e0c4098698e7a7b4aa911c2bd292be398e78aa82 (patch) | |
| tree | 31c8a742c5844fac65ecebb244c106390e5ea6e0 /kernel/wcte12xp/GpakApi.c | |
| parent | 52ee8861e88e54c90128c3af099190bc5d43d2c5 (diff) | |
Merging in 1.16 software for VPMADT032 on wcte12xp driver
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4031 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/wcte12xp/GpakApi.c')
| -rw-r--r-- | kernel/wcte12xp/GpakApi.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/kernel/wcte12xp/GpakApi.c b/kernel/wcte12xp/GpakApi.c index 43b844a..8582350 100644 --- a/kernel/wcte12xp/GpakApi.c +++ b/kernel/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) |