[zaptel-commits] mattf: branch 1.4 r4134 - in /branches/1.4: firmware/ kernel/wctdm24xxp/ kern...
SVN commits to the Zaptel project
zaptel-commits at lists.digium.com
Fri Apr 4 11:21:07 CDT 2008
Author: mattf
Date: Fri Apr 4 11:21:06 2008
New Revision: 4134
URL: http://svn.digium.com/view/zaptel?view=rev&rev=4134
Log: (empty)
Modified:
branches/1.4/firmware/Makefile
branches/1.4/kernel/wctdm24xxp/GpakApi.c
branches/1.4/kernel/wctdm24xxp/GpakApi.h
branches/1.4/kernel/wctdm24xxp/base.c
branches/1.4/kernel/wcte12xp/GpakApi.c
branches/1.4/kernel/wcte12xp/GpakApi.h
branches/1.4/kernel/wcte12xp/GpakErrs.h
branches/1.4/kernel/wcte12xp/GpakHpi.h
branches/1.4/kernel/wcte12xp/gpakenum.h
branches/1.4/kernel/wcte12xp/vpmadt032.c
Modified: branches/1.4/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/firmware/Makefile?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/firmware/Makefile (original)
+++ branches/1.4/firmware/Makefile Fri Apr 4 11:21:06 2008
@@ -20,7 +20,7 @@
OCT6114_064_VERSION:=1.05.01
OCT6114_128_VERSION:=1.05.01
TC400M_VERSION:=MR6.12
-VPMADT032_VERSION:=1.16
+VPMADT032_VERSION:=1.07
FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases
Modified: branches/1.4/kernel/wctdm24xxp/GpakApi.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/GpakApi.c?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/GpakApi.c (original)
+++ branches/1.4/kernel/wctdm24xxp/GpakApi.c Fri Apr 4 11:21:06 2008
@@ -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 @@
((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 @@
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 @@
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 @@
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;
};
Modified: branches/1.4/kernel/wctdm24xxp/GpakApi.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/GpakApi.h?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/GpakApi.h (original)
+++ branches/1.4/kernel/wctdm24xxp/GpakApi.h Fri Apr 4 11:21:06 2008
@@ -77,9 +77,6 @@
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. */
Modified: branches/1.4/kernel/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm24xxp/base.c?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wctdm24xxp/base.c (original)
+++ branches/1.4/kernel/wctdm24xxp/base.c Fri Apr 4 11:21:06 2008
@@ -206,7 +206,7 @@
* 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 @@
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 @@
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)
Modified: branches/1.4/kernel/wcte12xp/GpakApi.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/GpakApi.c?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wcte12xp/GpakApi.c (original)
+++ branches/1.4/kernel/wcte12xp/GpakApi.c Fri Apr 4 11:21:06 2008
@@ -562,7 +562,7 @@
((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 @@
((pChanConfig->SoftwareCompand & 3) << 2) |
(pChanConfig->EcanEnableB << 1) |
(pChanConfig->EcanEnableA & 1)
- );
+ );
MsgBuffer[7] = (DSP_WORD)
pChanConfig->EcanParametersA.EcanTapLength;
@@ -734,16 +734,8 @@
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;
Modified: branches/1.4/kernel/wcte12xp/GpakApi.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/GpakApi.h?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wcte12xp/GpakApi.h (original)
+++ branches/1.4/kernel/wcte12xp/GpakApi.h Fri Apr 4 11:21:06 2008
@@ -77,9 +77,6 @@
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. */
Modified: branches/1.4/kernel/wcte12xp/GpakErrs.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/GpakErrs.h?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wcte12xp/GpakErrs.h (original)
+++ branches/1.4/kernel/wcte12xp/GpakErrs.h Fri Apr 4 11:21:06 2008
@@ -99,8 +99,7 @@
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;
Modified: branches/1.4/kernel/wcte12xp/GpakHpi.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/GpakHpi.h?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wcte12xp/GpakHpi.h (original)
+++ branches/1.4/kernel/wcte12xp/GpakHpi.h Fri Apr 4 11:21:06 2008
@@ -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 */
Modified: branches/1.4/kernel/wcte12xp/gpakenum.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/gpakenum.h?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wcte12xp/gpakenum.h (original)
+++ branches/1.4/kernel/wcte12xp/gpakenum.h Fri Apr 4 11:21:06 2008
@@ -114,7 +114,7 @@
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 @@
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 @@
GPIO_DIR = 2
} GpakGPIOCotrol_t;
-
#endif // end multiple inclusion
Modified: branches/1.4/kernel/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wcte12xp/vpmadt032.c?view=diff&rev=4134&r1=4133&r2=4134
==============================================================================
--- branches/1.4/kernel/wcte12xp/vpmadt032.c (original)
+++ branches/1.4/kernel/wcte12xp/vpmadt032.c Fri Apr 4 11:21:06 2008
@@ -1253,8 +1253,6 @@
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 @@
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);
More information about the zaptel-commits
mailing list