diff options
Diffstat (limited to 'software/octdeviceapi/oct6100api')
39 files changed, 97 insertions, 176 deletions
diff --git a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h index 479d43e..dc043ab 100644 --- a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h @@ -2,7 +2,7 @@ File: oct6100_adpcm_chan_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 7 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c index ec778d0..c27318f 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c @@ -2,7 +2,7 @@ File: oct6100_adpcm_chan.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 16 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c index 1a0f9a1..ef97dd8 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c @@ -2,7 +2,7 @@ File: oct6100_channel.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 516 $ +$Octasic_Revision: 521 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -145,7 +145,11 @@ UINT32 Oct6100ChannelOpenDef( f_pChannelOpen->VqeConfig.fRoutNoiseReduction = FALSE; f_pChannelOpen->VqeConfig.lRoutNoiseReductionLevelGainDb = -18; f_pChannelOpen->VqeConfig.fEnablePlayout = TRUE; +#ifdef cOCT6100_ADD_HUAWEI_CODE + f_pChannelOpen->VqeConfig.lAnrSnrEnhancementDb = -12; +#else f_pChannelOpen->VqeConfig.lAnrSnrEnhancementDb = -18; +#endif /* cOCT6100_ADD_HUAWEI_CODE */ f_pChannelOpen->VqeConfig.ulAnrVoiceNoiseSegregation = 6; f_pChannelOpen->VqeConfig.ulToneDisablerVqeActivationDelay = 300; f_pChannelOpen->VqeConfig.fEnableMusicProtection = FALSE; @@ -2503,7 +2507,6 @@ UINT32 Oct6100ApiUpdateChannelEntry( /* Update num active channel stats. */ if ( f_pChannelOpen->ulEchoOperationMode != cOCT6100_ECHO_OP_MODE_POWER_DOWN ) { - f_pApiInstance->pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; f_pApiInstance->pSharedInfo->MiscVars.ulNumActiveChannels++; } /*=======================================================================*/ @@ -3288,7 +3291,6 @@ UINT32 Oct6100ApiReleaseChannelResources( /* Update num active channel stats. */ if ( pChanEntry->byEchoOperationMode != cOCT6100_ECHO_OP_MODE_POWER_DOWN ) { - f_pApiInstance->pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; f_pApiInstance->pSharedInfo->MiscVars.ulNumActiveChannels--; } /*=======================================================================*/ @@ -5817,12 +5819,10 @@ UINT32 Oct6100ApiModifyChannelEntry( { if ( pChanEntry->byEchoOperationMode == cOCT6100_ECHO_OP_MODE_POWER_DOWN ) { - f_pApiInstance->pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; f_pApiInstance->pSharedInfo->MiscVars.ulNumActiveChannels++; } else if ( byOpenEchoMode == cOCT6100_ECHO_OP_MODE_POWER_DOWN ) - { - f_pApiInstance->pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; + { f_pApiInstance->pSharedInfo->MiscVars.ulNumActiveChannels--; } } @@ -8109,8 +8109,13 @@ UINT32 Oct6100ApiCheckVqeConfig( return cOCT6100_ERR_CHANNEL_ROUT_NOISE_REDUCTION_GAIN; /* Check if ANR SNRE is supported. */ +#ifdef cOCT6100_ADD_HUAWEI_CODE + if ( ( f_pVqeConfig->lAnrSnrEnhancementDb != -12 ) && ( pImageInfo->fAnrSnrEnhancement == FALSE ) ) + return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ANR_SNR_ENHANCEMENT; +#else if ( ( f_pVqeConfig->lAnrSnrEnhancementDb != -18 ) && ( pImageInfo->fAnrSnrEnhancement == FALSE ) ) return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ANR_SNR_ENHANCEMENT; +#endif cOCT6100_ADD_HUAWEI_CODE /* Validate Sout ANR SNR enhancement. */ if ( ( f_pVqeConfig->lAnrSnrEnhancementDb != -9 ) diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c index d47ea80..5a47ad6 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c @@ -2,7 +2,7 @@ File: oct6100_chip_open.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 374 $ +$Octasic_Revision: 381 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -1485,8 +1485,6 @@ UINT32 Oct6100ApiInitializeMiscellaneousVariables( pSharedInfo->DebugInfo.fIsIsrCalledField = FALSE; pSharedInfo->MiscVars.ulNumActiveChannels = 0; - pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; - /* Initialize the image info parameters */ pSharedInfo->ImageInfo.fAdaptiveNoiseReduction = FALSE; diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c index 088bb88..c576812 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c @@ -2,7 +2,7 @@ File: oct6100_chip_stats.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 98 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c index 48134bf..1a1bc24 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c @@ -2,7 +2,7 @@ File: oct6100_conf_bridge.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -25,9 +25,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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 146 $ +$Octasic_Revision: 148 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c index 9e3f3da..8857c8e 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c @@ -2,7 +2,7 @@ File: oct6100_debug.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 77 $ +$Octasic_Revision: 81 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c index 71d933d..1742f17 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c @@ -2,7 +2,7 @@ File: oct6100_events.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 83 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c index e28d340..b391037 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c @@ -2,7 +2,7 @@ File: oct6100_interrupts.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 97 $ +$Octasic_Revision: 98 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -1828,7 +1828,6 @@ UINT32 Oct6100ApiCheckProcessorState( UINT32 ulNlpTimestamp; UINT32 ulAfTimestamp; UINT32 ulTimestampDiff; - UINT32 ulMafWPnt; UINT32 ulResult; UINT32 i; UINT16 usReadData; @@ -1943,40 +1942,6 @@ UINT32 Oct6100ApiCheckProcessorState( /*-----------------------------------------------------------------------*/ - /* Reading the NLP number of MAF events. */ - - for ( i = 0; i < cOCT6100_MAX_LOOP; i++ ) - { - /* Read the timestamp. */ - ReadBurstParams.ulReadAddress = 0x08000004; - ReadBurstParams.ulReadLength = 2; - - mOCT6100_DRIVER_READ_BURST_API( ReadBurstParams, ulResult ) - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; - - /* Read the high part again to make sure it didn't wrap. */ - ReadParams.ulReadAddress = 0x08000004; - - mOCT6100_DRIVER_READ_API( ReadParams, ulResult ) - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; - - /* Check if the low part wrapped. */ - if ( ausReadData[ 0 ] == usReadData ) - break; - } - - if ( i == cOCT6100_MAX_LOOP ) - return cOCT6100_ERR_INTRPTS_NLP_TIMESTAMP_READ_TIMEOUT; - - /* save the Maf pointer */ - ulMafWPnt = (ausReadData[ 0 ] << 16) | ausReadData[ 1 ]; - - /*-----------------------------------------------------------------------*/ - - - /*-----------------------------------------------------------------------*/ /* Check the validity of the timestamp. */ if ( ulAfTimestamp > ulNlpTimestamp ) @@ -2032,53 +1997,6 @@ UINT32 Oct6100ApiCheckProcessorState( /*-----------------------------------------------------------------------*/ - - /*-----------------------------------------------------------------------*/ - /* Check on number of MAF events since last ISR call. */ - - if ( pSharedInfo->MiscVars.fActiveChannelsChange == FALSE ) - { - UINT32 ulMafEventDelta; - UINT32 ulNlpTimestampDelta; - - ulNlpTimestampDelta = ulNlpTimestamp - pSharedInfo->MiscVars.aulNlpTimestamps[0]; - - if ( ulNlpTimestampDelta > 4200 ) - { - UINT32 ulExpected; - - pSharedInfo->MiscVars.aulNumMafEvents[1] = pSharedInfo->MiscVars.aulNumMafEvents[0]; - pSharedInfo->MiscVars.aulNumMafEvents[0] = ulMafWPnt; - - pSharedInfo->MiscVars.aulNlpTimestamps[1] = pSharedInfo->MiscVars.aulNlpTimestamps[0]; - pSharedInfo->MiscVars.aulNlpTimestamps[0] = ulNlpTimestamp; - - ulMafEventDelta = pSharedInfo->MiscVars.aulNumMafEvents[0] - pSharedInfo->MiscVars.aulNumMafEvents[1]; - ulNlpTimestampDelta = pSharedInfo->MiscVars.aulNlpTimestamps[0] - pSharedInfo->MiscVars.aulNlpTimestamps[1]; - - ulExpected = (ulNlpTimestampDelta * 2 * pSharedInfo->MiscVars.ulNumActiveChannels) / 6500; - if ( ulMafEventDelta < ulExpected ) - { - f_pIntFlags->ulFatalGeneralFlags |= cOCT6100_FATAL_GENERAL_ERROR_TYPE_10; - f_pIntFlags->fFatalGeneral = TRUE; - pSharedInfo->ErrorStats.fFatalChipError = TRUE; - } - } - } - else - { - pSharedInfo->MiscVars.aulNumMafEvents[1] = pSharedInfo->MiscVars.aulNumMafEvents[0]; - pSharedInfo->MiscVars.aulNumMafEvents[0] = ulMafWPnt; - - pSharedInfo->MiscVars.aulNlpTimestamps[1] = pSharedInfo->MiscVars.aulNlpTimestamps[0]; - pSharedInfo->MiscVars.aulNlpTimestamps[0] = ulNlpTimestamp; - - pSharedInfo->MiscVars.fActiveChannelsChange = FALSE; - } - - /*-----------------------------------------------------------------------*/ - - return cOCT6100_ERR_OK; diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c index 747448d..3e0f92e 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c @@ -2,7 +2,7 @@ File: oct6100_memory.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 42 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c index e6f18db..1ce2613 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c @@ -2,7 +2,7 @@ File: oct6100_miscellaneous.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 36 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c index 3d146a8..f57f90a 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c @@ -2,7 +2,7 @@ File: oct6100_mixer.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 42 $ +$Octasic_Revision: 44 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c index 60417be..072cf09 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c @@ -2,7 +2,7 @@ File: oct6100_phasing_tsst.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 46 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c index 55b3ae2..f04fc4a 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c @@ -2,7 +2,7 @@ File: oct6100_playout_buf.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $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 e4a06c6..070e73e 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c @@ -2,7 +2,7 @@ File: oct6100_remote_debug.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 35 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c index 112b263..4aea3c6 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c @@ -2,7 +2,7 @@ File: oct6100_tlv.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 120 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c index 1c66116..ab4b59a 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c @@ -2,7 +2,7 @@ File: oct6100_tone_detection.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 51 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c index a937fac..5bd2d4d 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c @@ -2,7 +2,7 @@ File: oct6100_tsi_cnct.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 38 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c index a412245..0e061b1 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c @@ -2,7 +2,7 @@ File: oct6100_tsst.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 40 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c index d01e23f..f5c8863 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c @@ -2,7 +2,7 @@ File: oct6100_user.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 31 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c index 6b2cbe8..802bd29 100644 --- a/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c +++ b/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c @@ -2,7 +2,7 @@ File: oct6100_mask_interrupts.c - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 8 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h b/software/octdeviceapi/oct6100api/oct6100_channel_priv.h index ccef95f..0a3a6ba 100644 --- a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_channel_priv.h @@ -2,7 +2,7 @@ File: oct6100_channel_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -25,9 +25,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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 62 $ +$Octasic_Revision: 64 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h index be722c3..cd6384e 100644 --- a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h @@ -2,7 +2,7 @@ File: oct6100_chip_open_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 63 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h index 0ef81a9..1294cc4 100644 --- a/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h @@ -2,7 +2,7 @@ File: oct6100_chip_stats_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 8 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h index 965e96e..58fa74d 100644 --- a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h @@ -2,7 +2,7 @@ File: oct6100_conf_bridge_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 30 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_debug_priv.h index b58dd08..31988d4 100644 --- a/software/octdeviceapi/oct6100api/oct6100_debug_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_debug_priv.h @@ -2,7 +2,7 @@ File: oct6100_debug_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 14 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_events_priv.h b/software/octdeviceapi/oct6100api/oct6100_events_priv.h index 2e1cf05..f0f12bf 100644 --- a/software/octdeviceapi/oct6100api/oct6100_events_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_events_priv.h @@ -2,7 +2,7 @@ File: oct6100_events_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 14 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h b/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h index 38b8ccc..fa73989 100644 --- a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h @@ -2,7 +2,7 @@ File: oct6100_interrupts_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 13 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h index 73515b3..16f5686 100644 --- a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h @@ -2,7 +2,7 @@ File: oct6100_memory_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 17 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h b/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h index cc08c90..c7dd200 100644 --- a/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h @@ -2,7 +2,7 @@ File: oct6100_miscellaneous_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 20 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h index a72c147..0edb9df 100644 --- a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h @@ -2,7 +2,7 @@ File: oct6100_mixer_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 18 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h index c337bcd..d68aba9 100644 --- a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h @@ -2,7 +2,7 @@ File: oct6100_phasing_tsst_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 12 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h index 308644c..221a277 100644 --- a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h @@ -2,7 +2,7 @@ File: oct6100_playout_buf_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 22 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h index ee73601..cec3b9f 100644 --- a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h @@ -2,7 +2,7 @@ File: oct6100_remote_debug_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 13 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h b/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h index 3e984ac..05b55c5 100644 --- a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h @@ -2,7 +2,7 @@ File: oct6100_tlv_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 60 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h b/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h index 594d091..3572f3d 100644 --- a/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h @@ -2,7 +2,7 @@ File: oct6100_tone_detection_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 14 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h index d7d3864..d3f3140 100644 --- a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h @@ -2,7 +2,7 @@ File: oct6100_tsi_cnct_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 14 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h index 0b91776..df9c7a7 100644 --- a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h @@ -2,7 +2,7 @@ File: oct6100_tsst_priv.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ $Octasic_Revision: 15 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_version.h b/software/octdeviceapi/oct6100api/oct6100_version.h index 1fbf4a1..08fdf63 100644 --- a/software/octdeviceapi/oct6100api/oct6100_version.h +++ b/software/octdeviceapi/oct6100api/oct6100_version.h @@ -2,7 +2,7 @@ File: oct6100_version.h - Copyright (c) 2001-2009 Octasic Inc. + Copyright (c) 2001-2010 Octasic Inc. Description: @@ -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.03.04 $ +$Octasic_Release: OCT612xAPI-01.03.05 $ -$Octasic_Revision: 68 $ +$Octasic_Revision: 70 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -34,6 +34,6 @@ $Octasic_Revision: 68 $ /* String version of the OCT6100 API.*/ -#define cOCT6100_API_VERSION "OCT6100API-01.03.04" +#define cOCT6100_API_VERSION "OCT6100API-01.03.05" #endif /* __OCT6100_VERSION_H__ */ |