diff options
Diffstat (limited to 'kernel/wctdm24xxp')
-rw-r--r-- | kernel/wctdm24xxp/GpakApi.c | 29 | ||||
-rw-r--r-- | kernel/wctdm24xxp/GpakApi.h | 3 | ||||
-rw-r--r-- | kernel/wctdm24xxp/base.c | 10 |
3 files changed, 19 insertions, 23 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; }; diff --git a/kernel/wctdm24xxp/GpakApi.h b/kernel/wctdm24xxp/GpakApi.h index a435db3..df57c09 100644 --- a/kernel/wctdm24xxp/GpakApi.h +++ b/kernel/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/kernel/wctdm24xxp/base.c b/kernel/wctdm24xxp/base.c index ca53fa9..f942f26 100644 --- a/kernel/wctdm24xxp/base.c +++ b/kernel/wctdm24xxp/base.c @@ -206,7 +206,7 @@ static int dtmfthreshold = VPM_DEFAULT_DTMFTHRESHOLD; * 4 : Suppression NLP - In order to use this, you must set the vpmnlpmaxsupp parameter to * some value in order to give the amount of dB to suppress to the suppressor */ -static int vpmnlptype = 3; +static int vpmnlptype = 1; /* This is the threshold (in dB) for enabling and disabling of the NLP */ static int vpmnlpthresh = 24; /* See vpmnlptype = 4 for more info */ @@ -2944,15 +2944,13 @@ void vpm150m_set_chanconfig_from_state(struct adt_lec_params * parms, int channu chanconfig->EcanParametersA.EcanDblTalkThresh = 6; chanconfig->EcanParametersA.EcanNlpThreshold = parms->nlp_threshold; chanconfig->EcanParametersA.EcanNlpConv = 0; - chanconfig->EcanParametersA.EcanNlpUnConv = 12; + chanconfig->EcanParametersA.EcanNlpUnConv = 0; chanconfig->EcanParametersA.EcanNlpMaxSuppress = parms->nlp_max_suppress; 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 = parms->nlp_type; @@ -2961,15 +2959,13 @@ void vpm150m_set_chanconfig_from_state(struct adt_lec_params * parms, int channu chanconfig->EcanParametersB.EcanDblTalkThresh = 6; chanconfig->EcanParametersB.EcanNlpThreshold = parms->nlp_threshold; chanconfig->EcanParametersB.EcanNlpConv = 0; - chanconfig->EcanParametersB.EcanNlpUnConv = 12; + chanconfig->EcanParametersB.EcanNlpUnConv = 0; chanconfig->EcanParametersB.EcanNlpMaxSuppress = parms->nlp_max_suppress; 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 LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) |