summaryrefslogtreecommitdiff
path: root/software/octdeviceapi/oct6100api/oct6100_api
diff options
context:
space:
mode:
Diffstat (limited to 'software/octdeviceapi/oct6100api/oct6100_api')
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c43
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c38
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c9
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c24
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c6
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c2
-rw-r--r--software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c2
19 files changed, 89 insertions, 59 deletions
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
index e9c9962..10ab644 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 15 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
index 7710154..53bbd67 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
@@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
-$Octasic_Revision: 460 $
+$Octasic_Revision: 464 $
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -183,7 +183,7 @@ UINT32 Oct6100ChannelOpenDef(
f_pChannelOpen->CodecConfig.fEnableSilenceSuppression = FALSE;
f_pChannelOpen->CodecConfig.ulPhasingTsstHndl = cOCT6100_INVALID_HANDLE;
- f_pChannelOpen->CodecConfig.ulPhase = 0;
+ f_pChannelOpen->CodecConfig.ulPhase = 1;
f_pChannelOpen->CodecConfig.ulPhasingType = cOCT6100_NO_PHASING;
@@ -1353,6 +1353,15 @@ UINT32 Oct6100ApiCheckChannelParams(
if ( ( f_pChannelOpen->ulEchoOperationMode == cOCT6100_ECHO_OP_MODE_NO_ECHO )
&& ( pVqeConfig->fEnableNlp == FALSE ) )
return cOCT6100_ERR_CHANNEL_ECHO_OP_MODE_NLP_REQUIRED;
+
+ if ( ( f_pChannelOpen->ulEchoOperationMode == cOCT6100_ECHO_OP_MODE_SPEECH_RECOGNITION )
+ && ( pVqeConfig->fEnableNlp == FALSE ) )
+ return cOCT6100_ERR_CHANNEL_ECHO_OP_MODE_NLP_REQUIRED;
+
+ /* Comfort noise must be activated for speech recognition mode to work. */
+ if ( ( f_pChannelOpen->ulEchoOperationMode == cOCT6100_ECHO_OP_MODE_SPEECH_RECOGNITION )
+ && ( pVqeConfig->ulComfortNoiseMode == cOCT6100_COMFORT_NOISE_OFF ) )
+ return cOCT6100_ERR_CHANNEL_COMFORT_NOISE_REQUIRED;
/*==============================================================================*/
@@ -3840,6 +3849,15 @@ UINT32 Oct6100ApiCheckChannelModify(
if ( ( f_pTempChanOpen->ulEchoOperationMode == cOCT6100_ECHO_OP_MODE_NO_ECHO )
&& ( f_pTempChanOpen->VqeConfig.fEnableNlp == FALSE ) )
return cOCT6100_ERR_CHANNEL_ECHO_OP_MODE_NLP_REQUIRED;
+
+ if ( ( f_pTempChanOpen->ulEchoOperationMode == cOCT6100_ECHO_OP_MODE_SPEECH_RECOGNITION )
+ && ( f_pTempChanOpen->VqeConfig.fEnableNlp == FALSE ) )
+ return cOCT6100_ERR_CHANNEL_ECHO_OP_MODE_NLP_REQUIRED;
+
+ /* Comfort noise must be activated for speech recognition mode to work. */
+ if ( ( f_pTempChanOpen->ulEchoOperationMode == cOCT6100_ECHO_OP_MODE_SPEECH_RECOGNITION )
+ && ( f_pTempChanOpen->VqeConfig.ulComfortNoiseMode == cOCT6100_COMFORT_NOISE_OFF ) )
+ return cOCT6100_ERR_CHANNEL_COMFORT_NOISE_REQUIRED;
/* Check the Codec config.*/
if ( f_pChannelModify->fCodecConfigModified == TRUE )
@@ -7937,11 +7955,6 @@ UINT32 Oct6100ApiCheckVqeConfig(
|| ( ( ( f_pVqeConfig->ulToneDisablerVqeActivationDelay - 300 ) % 512 ) != 0 ) )
return cOCT6100_ERR_CHANNEL_TONE_DISABLER_ACTIVATION_DELAY;
- /* Check if the tone disabler is activated when the user requests a different activation delay. */
- if ( ( f_pVqeConfig->ulToneDisablerVqeActivationDelay != 300 )
- && ( f_fEnableToneDisabler == FALSE ) )
- return cOCT6100_ERR_CHANNEL_MUST_ENABLE_TONE_DISABLER;
-
/* Check the enable music protection flag. */
if ( ( f_pVqeConfig->fEnableMusicProtection != TRUE ) && ( f_pVqeConfig->fEnableMusicProtection != FALSE ) )
return cOCT6100_ERR_CHANNEL_ENABLE_MUSIC_PROTECTION;
@@ -8124,7 +8137,8 @@ UINT32 Oct6100ApiCheckCodecConfig(
return cOCT6100_ERR_CHANNEL_INVALID_PHASING_HANDLE;
/* Check the specified phase value against the phasing length of the phasing TSST.*/
- if ( f_pCodecConfig->ulPhase >= pPhasingEntry->usPhasingLength )
+ if ( ( f_pCodecConfig->ulPhase == 0 )
+ || ( f_pCodecConfig->ulPhase >= pPhasingEntry->usPhasingLength ) )
return cOCT6100_ERR_CHANNEL_PHASING_INVALID_PHASE;
}
else
@@ -8848,7 +8862,8 @@ UINT32 Oct6100ApiWriteVqeNlpMemory(
/* Check if the configuration has been changed. */
if ( ( f_fModifyOnly == FALSE )
|| ( ( f_fModifyOnly == TRUE )
- && ( f_pVqeConfig->ulToneDisablerVqeActivationDelay != pChanEntry->VqeConfig.usToneDisablerVqeActivationDelay ) ) )
+ && ( ( f_pVqeConfig->ulToneDisablerVqeActivationDelay != pChanEntry->VqeConfig.usToneDisablerVqeActivationDelay )
+ || ( f_pChannelOpen->fEnableToneDisabler != pChanEntry->fEnableToneDisabler ) ) ) )
{
ulFeatureBytesOffset = pSharedInfo->MemoryMap.ToneDisablerVqeActivationDelayOfst.usDwordOffset * 4;
ulFeatureBitOffset = pSharedInfo->MemoryMap.ToneDisablerVqeActivationDelayOfst.byBitOffset;
@@ -8867,8 +8882,12 @@ UINT32 Oct6100ApiWriteVqeNlpMemory(
ulTempData &= (~ulMask);
- /* Set the tone disabler VQE activation delay. */
- ulTempData |= ( ( (UINT32)( ( f_pVqeConfig->ulToneDisablerVqeActivationDelay - 300 ) / 512 ) ) << ulFeatureBitOffset );
+ /* Set the tone disabler VQE activation delay. The VQE activation delay */
+ /* is only set if the tone disabler is activated. */
+ if ( f_pChannelOpen->fEnableToneDisabler == TRUE )
+ ulTempData |= ( ( (UINT32)( ( f_pVqeConfig->ulToneDisablerVqeActivationDelay - 300 ) / 512 ) ) << ulFeatureBitOffset );
+ else
+ ulTempData |= ( 0 ) << ulFeatureBitOffset;
/* Write the new DWORD where the field is located. */
mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance,
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index 59c05a1..dd54e2c 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
-$Octasic_Revision: 308 $
+$Octasic_Revision: 310 $
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -861,8 +861,7 @@ UINT32 Oct6100ApiCheckChipConfiguration(
return cOCT6100_ERR_OPEN_MAX_RW_ACCESSES;
/* Check the clocks. */
- if ( f_pChipOpen->ulUpclkFreq != cOCT6100_UPCLK_FREQ_33_33_MHZ &&
- f_pChipOpen->ulUpclkFreq != cOCT6100_UPCLK_FREQ_66_67_MHZ )
+ if ( f_pChipOpen->ulUpclkFreq != cOCT6100_UPCLK_FREQ_33_33_MHZ )
return cOCT6100_ERR_OPEN_UP_CLK_FREQ;
if ( f_pChipOpen->ulMemClkFreq != cOCT6100_MCLK_FREQ_133_MHZ &&
@@ -1064,6 +1063,10 @@ UINT32 Oct6100ApiCheckChipConfiguration(
if ( f_pChipOpen->ulMaxTsiCncts > cOCT6100_MAX_TSI_CNCTS )
return cOCT6100_ERR_OPEN_MAX_TSI_CNCTS;
+
+ if ( f_pChipOpen->ulMaxBiDirChannels > 255 )
+ return cOCT6100_ERR_OPEN_MAX_BIDIR_CHANNELS;
+
if ( f_pChipOpen->ulMaxBiDirChannels > (f_pChipOpen->ulMaxChannels / 2) )
return cOCT6100_ERR_OPEN_MAX_BIDIR_CHANNELS;
@@ -2298,28 +2301,11 @@ UINT32 Oct6100ApiBootFc2Pll(
/* Select upclk directly as ref source for fc2pll. */
WriteParams.ulWriteAddress = 0x134;
- if ( pChipConfig->ulUpclkFreq == cOCT6100_UPCLK_FREQ_66_67_MHZ )
- {
- WriteParams.usWriteData = 0x0002;
-
- mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
- if ( ulResult != cOCT6100_ERR_OK )
- return ulResult;
-
- /* Remove the reset */
- WriteParams.usWriteData = 0x0102;
- mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
- if ( ulResult != cOCT6100_ERR_OK )
- return ulResult;
- }
- else /* pChipConfig->ulUpclkFreq == cOCT6100_UPCLK_FREQ_33_33_MHZ */
- {
- WriteParams.usWriteData = 0x0001;
-
- mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
- if ( ulResult != cOCT6100_ERR_OK )
- return ulResult;
- }
+ WriteParams.usWriteData = 0x0001;
+
+ mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+ if ( ulResult != cOCT6100_ERR_OK )
+ return ulResult;
/* Setup fc2pll. */
WriteParams.ulWriteAddress = 0x132;
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
index e116d65..9b4ba49 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 87 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
index cbfe131..9b65b0a 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 145 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
index cc40588..45e9aee 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
-$Octasic_Revision: 58 $
+$Octasic_Revision: 59 $
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -552,6 +552,11 @@ UINT32 Oct6100DebugGetDataSer(
if ( pSharedInfo->DebugInfo.fDebugDataBeingDumped == FALSE )
{
pSharedInfo->DebugInfo.fDebugDataBeingDumped = TRUE;
+
+ /* Check that the channel is not in POWER_DOWN. When the channel is in POWER_DOWN, */
+ /* the debug events are not recorded correctly in external memory. */
+ if ( pChanEntry->byEchoOperationMode == cOCT6100_ECHO_OP_MODE_POWER_DOWN )
+ return cOCT6100_ERR_DEBUG_CHANNEL_IN_POWER_DOWN;
/* Flag the hot channel that it must stop recording. The data is being transfered. */
/* This also tells the remote client not to do anything right now. */
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
index 6d6f1dc..8b755d9 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 79 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
index 21bec84..603ca6d 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
@@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
-$Octasic_Revision: 71 $
+$Octasic_Revision: 72 $
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -530,6 +530,22 @@ UINT32 Oct6100InterruptServiceRoutineSer(
ReadParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId;
ReadParams.pusReadData = &usReadData;
+
+ /* Set all the flags to default values to make sure the variables are initialized. */
+ f_pIntFlags->fFatalGeneral = FALSE;
+ f_pIntFlags->ulFatalGeneralFlags = 0x0;
+ f_pIntFlags->fFatalReadTimeout = FALSE;
+
+ f_pIntFlags->fErrorRefreshTooLate = FALSE;
+ f_pIntFlags->fErrorPllJitter = FALSE;
+
+ f_pIntFlags->fErrorH100OutOfSync = FALSE;
+ f_pIntFlags->fErrorH100ClkA = FALSE;
+ f_pIntFlags->fErrorH100ClkB = FALSE;
+ f_pIntFlags->fErrorH100FrameA = FALSE;
+ f_pIntFlags->fApiSynch = FALSE;
+
+ f_pIntFlags->fErrorOverflowToneEvents = FALSE;
/* Start by reading registers 210h to determine if any modules have flagged an interrupt. */
ReadParams.ulReadAddress = 0x210;
@@ -588,6 +604,10 @@ UINT32 Oct6100InterruptServiceRoutineSer(
/* Set the buffer playout events pending flag. */
f_pIntFlags->fBufferPlayoutEventsPending = pSharedInfo->IntrptManage.fBufferPlayoutEventsPending;
}
+ else
+ {
+ f_pIntFlags->fBufferPlayoutEventsPending = FALSE;
+ }
/* Update the states of each interrupt group. */
ulResult = Oct6100ApiUpdateIntrptStates( f_pApiInstance, f_pIntFlags );
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
index 6848f31..dd19920 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 42 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
index 9db15cb..65f43d3 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 34 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
index fc5cec1..73e5136 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 42 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
index c6297ac..751548e 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
-$Octasic_Revision: 42 $
+$Octasic_Revision: 43 $
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -370,7 +370,7 @@ UINT32 Oct6100ApiCheckPhasingParams(
/* Check the phasing length. */
if ( f_pPhasingTsstOpen->ulPhasingLength > 240 ||
- f_pPhasingTsstOpen->ulPhasingLength == 0 )
+ f_pPhasingTsstOpen->ulPhasingLength < 2 )
return cOCT6100_ERR_PHASING_TSST_PHASING_LENGTH;
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
index 2d359d5..07bad06 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 109 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c
index 77e32bd..d7bcb66 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 35 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
index e973b42..cacef6f 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 111 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
index 85a37fc..61dec3a 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 49 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
index 8d28d6f..a36e8de 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 37 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
index 74072b6..0653903 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 39 $
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
index 0b33933..e6e7b29 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
along with the OCT6100 GPL API; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Octasic_Release: OCT612xAPI-01.00-PR39 $
+$Octasic_Release: OCT612xAPI-01.00-PR40 $
$Octasic_Revision: 27 $