From 7e2fd687eb0f6a42f213f750c12e5acc7d626b8b Mon Sep 17 00:00:00 2001 From: Octasic Inc Date: Tue, 12 Apr 2011 15:48:28 +0300 Subject: importing OCT612x-01.04.05 --- .../oct6100api/oct6100_api/oct6100_adpcm_chan.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_channel.c | 18 ++++++++++++++---- .../oct6100api/oct6100_api/oct6100_chip_open.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_chip_stats.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_conf_bridge.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_debug.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_events.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_interrupts.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_memory.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_miscellaneous.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_mixer.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_phasing_tsst.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_playout_buf.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_remote_debug.c | 4 ++-- .../octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_tone_detection.c | 4 ++-- .../oct6100api/oct6100_api/oct6100_tsi_cnct.c | 4 ++-- .../octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c | 4 ++-- .../octdeviceapi/oct6100api/oct6100_api/oct6100_user.c | 4 ++-- 19 files changed, 50 insertions(+), 40 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 129edc2..8a41cea 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 edeae2a..79801dc 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ -$Octasic_Revision: 523 $ +$Octasic_Revision: 524 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -8150,7 +8150,17 @@ UINT32 Oct6100ApiCheckVqeConfig( if ( f_pVqeConfig->lAecDefaultErlDb != 0 && pImageInfo->fAecDefaultErl == FALSE ) return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_AEC_DEFAULT_ERL; - if ( f_pVqeConfig->lAecDefaultErlDb != 0 && f_pVqeConfig->lAecDefaultErlDb != -3 && f_pVqeConfig->lAecDefaultErlDb != -6 ) + if ( ( f_pVqeConfig->lAecDefaultErlDb != 0 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -3 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -6 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -9 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -12 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -15 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -18 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -21 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -24 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -27 ) && + ( f_pVqeConfig->lAecDefaultErlDb != -30 ) ) return cOCT6100_ERR_CHANNEL_AEC_DEFAULT_ERL; /* Validate the non-linearity A parameter.*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c index 32208ba..3a88233 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ $Octasic_Revision: 388 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c index 0272c35..349a3be 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ $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 f4c2f15..a7a27d6 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ $Octasic_Revision: 149 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c index e6157c2..b1ae4a3 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ $Octasic_Revision: 83 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c index 36f1b2c..2095057 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 113ab82..5f8f255 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ $Octasic_Revision: 103 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c index fe84696..e716b4c 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 e5c26c5..66b87e9 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 8d76d78..b48b65f 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ $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 dc9355a..ca86709 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 8d115e3..433c87c 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ $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 673a973..678cbcb 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 4d22691..f08a695 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 63d3a17..f23aefc 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 544247d..6361cf3 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 57fe716..798cf74 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.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 b41dc2e..c7f355b 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-2010 Octasic Inc. + Copyright (c) 2001-2011 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.04.04 $ +$Octasic_Release: OCT612xAPI-01.04.05 $ $Octasic_Revision: 31 $ -- cgit v1.2.3