From 543281d15d1c725f1e7be06b4bd542f3ff368f1c Mon Sep 17 00:00:00 2001 From: Octasic Inc Date: Fri, 20 May 2011 10:56:30 +0300 Subject: importing OCT612x-01.04.06 --- .../oct6100api/oct6100_api/oct6100_adpcm_chan.c | 2 +- .../oct6100api/oct6100_api/oct6100_channel.c | 76 +++++++++++++++------- .../oct6100api/oct6100_api/oct6100_chip_open.c | 4 +- .../oct6100api/oct6100_api/oct6100_chip_stats.c | 2 +- .../oct6100api/oct6100_api/oct6100_conf_bridge.c | 2 +- .../oct6100api/oct6100_api/oct6100_debug.c | 2 +- .../oct6100api/oct6100_api/oct6100_events.c | 2 +- .../oct6100api/oct6100_api/oct6100_interrupts.c | 2 +- .../oct6100api/oct6100_api/oct6100_memory.c | 2 +- .../oct6100api/oct6100_api/oct6100_miscellaneous.c | 2 +- .../oct6100api/oct6100_api/oct6100_mixer.c | 2 +- .../oct6100api/oct6100_api/oct6100_phasing_tsst.c | 2 +- .../oct6100api/oct6100_api/oct6100_playout_buf.c | 2 +- .../oct6100api/oct6100_api/oct6100_remote_debug.c | 2 +- .../oct6100api/oct6100_api/oct6100_tlv.c | 2 +- .../oct6100_api/oct6100_tone_detection.c | 2 +- .../oct6100api/oct6100_api/oct6100_tsi_cnct.c | 2 +- .../oct6100api/oct6100_api/oct6100_tsst.c | 2 +- .../oct6100api/oct6100_api/oct6100_user.c | 2 +- 19 files changed, 71 insertions(+), 43 deletions(-) (limited to 'software/octdeviceapi/oct6100api/oct6100_api') diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c index 8a41cea..5282571 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 16 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c index 79801dc..a037aa5 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ -$Octasic_Revision: 524 $ +$Octasic_Revision: 526 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -8143,7 +8143,13 @@ UINT32 Oct6100ApiCheckVqeConfig( ( f_pVqeConfig->lDefaultErlDb != -3 ) && ( f_pVqeConfig->lDefaultErlDb != -6 ) && ( f_pVqeConfig->lDefaultErlDb != -9 ) && - ( f_pVqeConfig->lDefaultErlDb != -12 ) ) + ( f_pVqeConfig->lDefaultErlDb != -12 ) && + ( f_pVqeConfig->lDefaultErlDb != -15 ) && + ( f_pVqeConfig->lDefaultErlDb != -18 ) && + ( f_pVqeConfig->lDefaultErlDb != -21 ) && + ( f_pVqeConfig->lDefaultErlDb != -24 ) && + ( f_pVqeConfig->lDefaultErlDb != -27 ) && + ( f_pVqeConfig->lDefaultErlDb != -30 ) ) return cOCT6100_ERR_CHANNEL_DEFAULT_ERL; /* Validate the Default AEC ERL parameter.*/ @@ -12725,7 +12731,11 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( tPOCT6100_SHARED_INFO pSharedInfo; tOCT6100_WRITE_PARAMS WriteParams; tOCT6100_WRITE_SMEAR_PARAMS SmearParams; - UINT32 ulResult; + tPOCT6100_API_CHANNEL pChanEntry; + UINT32 ulResult; + UINT32 ulTempData; + UINT32 ulBaseAddress; + UINT32 ulOffset; pSharedInfo = f_pApiInstance->pSharedInfo; @@ -12747,6 +12757,9 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( /* We let through even though this could already be disabled.. */ if ( pSharedInfo->DebugInfo.fRecordChanUp == TRUE ) { + /* Obtain a pointer to the new buffer's list entry. */ + mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pChanEntry, pSharedInfo->DebugInfo.usRecordChanIndex ); + /*------------------------------------------------------------------------------*/ /* Deactivate the ECHO control memory entry.*/ @@ -12769,13 +12782,17 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( /*------------------------------------------------------------------------------*/ /* Clear the VQE memory. */ - - SmearParams.ulWriteAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pSharedInfo->DebugInfo.usRecordChanIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x20; - SmearParams.usWriteData = 0x0000; - SmearParams.ulWriteLength = 2; - - mOCT6100_DRIVER_WRITE_SMEAR_API( SmearParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) + + ulBaseAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pSharedInfo->DebugInfo.usRecordChanIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x20; + ulTempData = 0x0000; + + /* Save the new DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) return ulResult; /*------------------------------------------------------------------------------*/ @@ -12783,12 +12800,16 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( /*------------------------------------------------------------------------------*/ /* Clear the NLP memory. */ - SmearParams.ulWriteAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pSharedInfo->DebugInfo.usRecordChanIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x28; - SmearParams.usWriteData = 0x0000; - SmearParams.ulWriteLength = 2; - - mOCT6100_DRIVER_WRITE_SMEAR_API( SmearParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) + ulBaseAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pSharedInfo->DebugInfo.usRecordChanIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x28; + ulTempData = 0x0000; + + /* Save the new DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) return ulResult; /*------------------------------------------------------------------------------*/ @@ -12796,13 +12817,20 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( /*------------------------------------------------------------------------------*/ /* Clear the AF information memory. */ - SmearParams.ulWriteAddress = pSharedInfo->MemoryMap.ulChanMainMemBase + ( pSharedInfo->DebugInfo.usRecordChanIndex * f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainMemSize ) + f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainIoMemOfst; - SmearParams.usWriteData = 0x0000; - SmearParams.ulWriteLength = 12; - - mOCT6100_DRIVER_WRITE_SMEAR_API( SmearParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + ulBaseAddress = pSharedInfo->MemoryMap.ulChanMainMemBase + ( pSharedInfo->DebugInfo.usRecordChanIndex * f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainMemSize ) + f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainIoMemOfst; + ulTempData = 0x0000; + + for(ulOffset=0; ulOffset<=0x14; ulOffset+=4) + { + /* Save the new DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulOffset, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } /*------------------------------------------------------------------------------*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c index 3a88233..bbe5a67 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ -$Octasic_Revision: 388 $ +$Octasic_Revision: 390 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c index 349a3be..02f1d96 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 101 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c index a7a27d6..e19a110 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 149 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c index b1ae4a3..49672fc 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 83 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c index 2095057..0ff687d 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 83 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c index 5f8f255..6361bc6 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 103 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c index e716b4c..802823f 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 42 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c index 66b87e9..597d3cf 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 36 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c index b48b65f..422903e 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 45 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c index ca86709..6e0fa13 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $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 433c87c..6bf2491 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 110 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c index 678cbcb..ac74ec1 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 35 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c index f08a695..9483513 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $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 f23aefc..6b65c9d 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $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 6361cf3..a44ae46 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 38 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c index 798cf74..278014e 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 40 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c index c7f355b..58201a3 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 31 $ -- cgit v1.2.3