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_channel.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c') 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.*/ -- cgit v1.2.3