diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/wctdm24xxp/GpakApi.c | 29 | ||||
-rw-r--r-- | kernel/wctdm24xxp/GpakApi.h | 3 | ||||
-rw-r--r-- | kernel/wctdm24xxp/base.c | 10 | ||||
-rw-r--r-- | kernel/wcte12xp/GpakApi.c | 16 | ||||
-rw-r--r-- | kernel/wcte12xp/GpakApi.h | 3 | ||||
-rw-r--r-- | kernel/wcte12xp/GpakErrs.h | 3 | ||||
-rw-r--r-- | kernel/wcte12xp/GpakHpi.h | 4 | ||||
-rw-r--r-- | kernel/wcte12xp/gpakenum.h | 5 | ||||
-rw-r--r-- | kernel/wcte12xp/vpmadt032.c | 4 |
9 files changed, 28 insertions, 49 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) diff --git a/kernel/wcte12xp/GpakApi.c b/kernel/wcte12xp/GpakApi.c index 8e280a4..944c327 100644 --- a/kernel/wcte12xp/GpakApi.c +++ b/kernel/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/kernel/wcte12xp/GpakApi.h b/kernel/wcte12xp/GpakApi.h index bd50926..e676b32 100644 --- a/kernel/wcte12xp/GpakApi.h +++ b/kernel/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/kernel/wcte12xp/GpakErrs.h b/kernel/wcte12xp/GpakErrs.h index 3f0c8ae..3413f97 100644 --- a/kernel/wcte12xp/GpakErrs.h +++ b/kernel/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/kernel/wcte12xp/GpakHpi.h b/kernel/wcte12xp/GpakHpi.h index 49e4ef9..790bb3c 100644 --- a/kernel/wcte12xp/GpakHpi.h +++ b/kernel/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/kernel/wcte12xp/gpakenum.h b/kernel/wcte12xp/gpakenum.h index 91e4311..ed14a1a 100644 --- a/kernel/wcte12xp/gpakenum.h +++ b/kernel/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/kernel/wcte12xp/vpmadt032.c b/kernel/wcte12xp/vpmadt032.c index f118fd1..141b000 100644 --- a/kernel/wcte12xp/vpmadt032.c +++ b/kernel/wcte12xp/vpmadt032.c @@ -1253,8 +1253,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; @@ -1270,8 +1268,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); |