diff options
| author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-04 16:21:06 +0000 |
|---|---|---|
| committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-04 16:21:06 +0000 |
| commit | ab4993d00aefc1d32cd268b3e2e87fdb8adbbd91 (patch) | |
| tree | 7ae3ac204523161da33c4aa66d32a6ab8d0a6073 /kernel/wctdm24xxp/GpakApi.c | |
| parent | ca7930bbeccd49e5361e83a4f838a552df834e72 (diff) | |
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4134 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/wctdm24xxp/GpakApi.c')
| -rw-r--r-- | kernel/wctdm24xxp/GpakApi.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/kernel/wctdm24xxp/GpakApi.c b/kernel/wctdm24xxp/GpakApi.c index 70d6b35..9997b07 100644 --- a/kernel/wctdm24xxp/GpakApi.c +++ b/kernel/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; }; |