diff options
| author | Octasic Inc <support@octasic.com> | 2006-02-10 13:40:24 +0200 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2011-02-27 21:07:41 +0200 |
| commit | a823b320b1baa1440e10793b9042a6f5c4138748 (patch) | |
| tree | dfdb5aee3bc820d0e516e8f0493af051e48848fb | |
| parent | 3d61697e688c99ff9265238b2eab474f7f1bcfc8 (diff) | |
importing OCT612x-01.00-PR39
94 files changed, 935 insertions, 406 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index eba0f32..62dd9e0 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -3,6 +3,70 @@ RELEASE NOTES +Version: OCT6100API-01.00-PR39 + +Date: February 08, 2006 + +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + +1.0 BACKWARD COMPATIBILITY NOTICE + + 1.1 ALL PRODUCTS + Modified function: Oct6100ChipGetImageInfo + Added parameters: fAlcNoiseBleedOutTime + fResetAlcOnTones + + Modified functions: Oct6100ChannelOpen + Oct6100ChannelModify + Oct6100ChannelGetStats + Added parameters: fResetRinAlcOnTones + fResetSoutAlcOnTones + ulAlcNoiseBleedOutTime + + +New features AlcNoiseBleedOutTime and ResetAlcOnTones require firmware +version 01.06.00 and higher. + +------------------------------------------------------------------------------- + +2.0 MODIFICATIONS DONE SINCE LAST RELEASE + +PR-3888 : Add 2 new parameters: fResetSinAlcOnTones, fResetRinAlcOnTones +PR-3889 : New parameter: ulAlcNoiseBleedoutTime + + +------------------------------------------------------------------------------- + +3.0 BUGS FIXED IN THIS RELEASE + +PR-4111 : fIdleCodeDetection not backward compatible +PR-4156 : Channel stays muted when cOCT6100_CHANNEL_MUTE_PORT_SIN_WITH_FEATURES + mute mode is used. +PR-4181 : Certain SDR memories may not boot correctly with standard + initialization sequence + +------------------------------------------------------------------------------- + +4.0 KNOWN BUGS PRESENT IN THIS RELEASE + +PR-3004 : OCT6100 API does not support 64-bit operating systems + +------------------------------------------------------------------------------- + +5.0 KNOWN ISSUES PRESENT IN THIS RELEASE + +PR-2379 : Problem with the cOCT6100_MIXING_0_DB mode + +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + + +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + + RELEASE NOTES + Version: OCT6100API-01.00-PR38 Date: November 21, 2005 @@ -18,8 +82,8 @@ Date: November 21, 2005 2.0 MODIFICATIONS DONE SINCE LAST RELEASE -PR-3848 : Fixed all comments + formatting for GPL release. -PR-3758 : ulToneDisablerVqeActivationDelay check must be added +PR-3848 : Changed several comments. +PR-3758 : ulToneDisablerVqeActivationDelay check must be added. PR-3750 : Oct6100ApiInitToneInfo is too slow because of StrStr seach. ------------------------------------------------------------------------------- diff --git a/doc/oct612Xas5000-029.pdf b/doc/oct612Xas5000-029.pdf Binary files differdeleted file mode 100644 index 34c28bf..0000000 --- a/doc/oct612Xas5000-029.pdf +++ /dev/null diff --git a/doc/oct612Xas5000-030.pdf b/doc/oct612Xas5000-030.pdf Binary files differnew file mode 100644 index 0000000..9f1f2f7 --- /dev/null +++ b/doc/oct612Xas5000-030.pdf diff --git a/software/apilib/bt/octapi_bt0.c b/software/apilib/bt/octapi_bt0.c index 600eaac..b5c40c8 100644 --- a/software/apilib/bt/octapi_bt0.c +++ b/software/apilib/bt/octapi_bt0.c @@ -2,7 +2,7 @@ File: octapi_bt0.c - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 18 $ diff --git a/software/apilib/bt/octapi_bt0_private.h b/software/apilib/bt/octapi_bt0_private.h index feabb8e..1356d4d 100644 --- a/software/apilib/bt/octapi_bt0_private.h +++ b/software/apilib/bt/octapi_bt0_private.h @@ -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-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 11 $ diff --git a/software/apilib/largmath/octapi_largmath.c b/software/apilib/largmath/octapi_largmath.c index c2823a3..bf22f93 100644 --- a/software/apilib/largmath/octapi_largmath.c +++ b/software/apilib/largmath/octapi_largmath.c @@ -2,7 +2,7 @@ File: octapi_largmath.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 10 $ diff --git a/software/apilib/llman/octapi_llman.c b/software/apilib/llman/octapi_llman.c index 13c68eb..015d23e 100644 --- a/software/apilib/llman/octapi_llman.c +++ b/software/apilib/llman/octapi_llman.c @@ -2,7 +2,7 @@ File: octapi_llman.c - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 21 $ diff --git a/software/apilib/llman/octapi_llman_private.h b/software/apilib/llman/octapi_llman_private.h index f182cf1..2566889 100644 --- a/software/apilib/llman/octapi_llman_private.h +++ b/software/apilib/llman/octapi_llman_private.h @@ -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-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 13 $ diff --git a/software/include/apilib/octapi_bt0.h b/software/include/apilib/octapi_bt0.h index d130c8b..b6aef86 100644 --- a/software/include/apilib/octapi_bt0.h +++ b/software/include/apilib/octapi_bt0.h @@ -2,7 +2,7 @@ File: octapi_bt0.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 11 $ diff --git a/software/include/apilib/octapi_largmath.h b/software/include/apilib/octapi_largmath.h index cbbfc12..9f250af 100644 --- a/software/include/apilib/octapi_largmath.h +++ b/software/include/apilib/octapi_largmath.h @@ -2,7 +2,7 @@ File: octapi_largmath.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 6 $ diff --git a/software/include/apilib/octapi_llman.h b/software/include/apilib/octapi_llman.h index 131281c..2ce2486 100644 --- a/software/include/apilib/octapi_llman.h +++ b/software/include/apilib/octapi_llman.h @@ -2,7 +2,7 @@ File: octapi_llman.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 8 $ diff --git a/software/include/oct6100api/oct6100_adpcm_chan_inst.h b/software/include/oct6100api/oct6100_adpcm_chan_inst.h index b74ce9e..090da43 100644 --- a/software/include/oct6100api/oct6100_adpcm_chan_inst.h +++ b/software/include/oct6100api/oct6100_adpcm_chan_inst.h @@ -2,7 +2,7 @@ File: oct6100_adpcm_chan_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 5 $ diff --git a/software/include/oct6100api/oct6100_adpcm_chan_pub.h b/software/include/oct6100api/oct6100_adpcm_chan_pub.h index f0c32d9..81ee07e 100644 --- a/software/include/oct6100api/oct6100_adpcm_chan_pub.h +++ b/software/include/oct6100api/oct6100_adpcm_chan_pub.h @@ -2,7 +2,7 @@ File: oct6100_adpcm_chan_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 4 $ diff --git a/software/include/oct6100api/oct6100_api.h b/software/include/oct6100api/oct6100_api.h index 5652375..8b70424 100644 --- a/software/include/oct6100api/oct6100_api.h +++ b/software/include/oct6100api/oct6100_api.h @@ -2,7 +2,7 @@ File: oct6100_api.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 22 $ diff --git a/software/include/oct6100api/oct6100_api_inst.h b/software/include/oct6100api/oct6100_api_inst.h index 679d9e6..7a015a4 100644 --- a/software/include/oct6100api/oct6100_api_inst.h +++ b/software/include/oct6100api/oct6100_api_inst.h @@ -2,7 +2,7 @@ File: oct6100_api_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 39 $ diff --git a/software/include/oct6100api/oct6100_apimi.h b/software/include/oct6100api/oct6100_apimi.h index abcad76..3cb9f8f 100644 --- a/software/include/oct6100api/oct6100_apimi.h +++ b/software/include/oct6100api/oct6100_apimi.h @@ -2,7 +2,7 @@ File: oct6100_apimi.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -27,7 +27,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-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 5 $ diff --git a/software/include/oct6100api/oct6100_apiud.h b/software/include/oct6100api/oct6100_apiud.h index 053a36c..8a10fb3 100644 --- a/software/include/oct6100api/oct6100_apiud.h +++ b/software/include/oct6100api/oct6100_apiud.h @@ -2,7 +2,7 @@ File: oct6100_apiud.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 15 $ diff --git a/software/include/oct6100api/oct6100_channel_inst.h b/software/include/oct6100api/oct6100_channel_inst.h index 8480c98..578fbeb 100644 --- a/software/include/oct6100api/oct6100_channel_inst.h +++ b/software/include/oct6100api/oct6100_channel_inst.h @@ -2,7 +2,7 @@ File: oct6100_channel_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 84 $ +$Octasic_Revision: 87 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -130,6 +130,11 @@ typedef struct _OCT6100_API_CHANNEL_VQE_ UINT8 byDoubleTalkBehavior; UINT8 fSoutNoiseBleaching; + UINT8 fResetRinAlcOnTones; + UINT8 fResetSoutAlcOnTones; + + UINT16 usAlcNoiseBleedOutTime; + UINT8 fSoutConferencingNoiseReduction; @@ -374,13 +379,15 @@ typedef struct _OCT6100_API_BIDIR_CHANNEL_ { UINT16 usFirstChanIndex; UINT16 usSecondChanIndex; - + /* Flag specifying whether the entry is used or not. */ UINT8 fReserved; /* Count used to manage entry handles allocated to user. */ UINT8 byEntryOpenCnt; + + } tOCT6100_API_BIDIR_CHANNEL, *tPOCT6100_API_BIDIR_CHANNEL; #endif /* __OCT6100_CHANNEL_INST_H__ */ diff --git a/software/include/oct6100api/oct6100_channel_pub.h b/software/include/oct6100api/oct6100_channel_pub.h index 792edcd..04b0c3b 100644 --- a/software/include/oct6100api/oct6100_channel_pub.h +++ b/software/include/oct6100api/oct6100_channel_pub.h @@ -2,7 +2,7 @@ File: oct6100_channel_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 79 $ +$Octasic_Revision: 82 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -80,7 +80,9 @@ typedef struct _OCT6100_CHANNEL_OPEN_VQE_ BOOL fRinLevelControl; BOOL fSoutLevelControl; BOOL fRinAutomaticLevelControl; + BOOL fResetRinAlcOnTones; BOOL fSoutAutomaticLevelControl; + BOOL fResetSoutAlcOnTones; BOOL fRinHighLevelCompensation; BOOL fAcousticEcho; BOOL fSoutAdaptiveNoiseReduction; @@ -97,6 +99,7 @@ typedef struct _OCT6100_CHANNEL_OPEN_VQE_ INT32 lSoutLevelControlGainDb; INT32 lRinAutomaticLevelControlTargetDb; INT32 lSoutAutomaticLevelControlTargetDb; + UINT32 ulAlcNoiseBleedOutTime; INT32 lRinHighLevelCompensationThresholdDb; INT32 lDefaultErlDb; INT32 lAecDefaultErlDb; @@ -198,7 +201,9 @@ typedef struct _OCT6100_CHANNEL_MODIFY_VQE_ BOOL fRinLevelControl; BOOL fSoutLevelControl; BOOL fRinAutomaticLevelControl; + BOOL fResetRinAlcOnTones; BOOL fSoutAutomaticLevelControl; + BOOL fResetSoutAlcOnTones; BOOL fRinHighLevelCompensation; BOOL fAcousticEcho; BOOL fSoutAdaptiveNoiseReduction; @@ -215,6 +220,7 @@ typedef struct _OCT6100_CHANNEL_MODIFY_VQE_ INT32 lSoutLevelControlGainDb; INT32 lRinAutomaticLevelControlTargetDb; INT32 lSoutAutomaticLevelControlTargetDb; + UINT32 ulAlcNoiseBleedOutTime; INT32 lRinHighLevelCompensationThresholdDb; INT32 lDefaultErlDb; INT32 lAecDefaultErlDb; @@ -349,7 +355,9 @@ typedef struct _OCT6100_CHANNEL_STATS_VQE_ BOOL fRinLevelControl; BOOL fSoutLevelControl; BOOL fRinAutomaticLevelControl; + BOOL fResetRinAlcOnTones; BOOL fSoutAutomaticLevelControl; + BOOL fResetSoutAlcOnTones; BOOL fRinHighLevelCompensation; BOOL fAcousticEcho; BOOL fSoutAdaptiveNoiseReduction; @@ -366,6 +374,7 @@ typedef struct _OCT6100_CHANNEL_STATS_VQE_ INT32 lSoutLevelControlGainDb; INT32 lRinAutomaticLevelControlTargetDb; INT32 lSoutAutomaticLevelControlTargetDb; + UINT32 ulAlcNoiseBleedOutTime; INT32 lRinHighLevelCompensationThresholdDb; INT32 lDefaultErlDb; INT32 lAecDefaultErlDb; @@ -452,6 +461,8 @@ typedef struct _OCT6100_CHANNEL_CREATE_BIDIR_ UINT32 ulFirstChannelHndl; UINT32 ulSecondChannelHndl; + + } tOCT6100_CHANNEL_CREATE_BIDIR, *tPOCT6100_CHANNEL_CREATE_BIDIR; diff --git a/software/include/oct6100api/oct6100_chip_open_inst.h b/software/include/oct6100api/oct6100_chip_open_inst.h index f1ee150..11eddef 100644 --- a/software/include/oct6100api/oct6100_chip_open_inst.h +++ b/software/include/oct6100api/oct6100_chip_open_inst.h @@ -2,7 +2,7 @@ File: oct6100_chip_open_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 116 $ +$Octasic_Revision: 118 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -336,6 +336,15 @@ typedef struct _OCT6100_API_MEMORY_MAP_ /* Idle code detection field offset. */ tOCT6100_TLV_OFFSET IdleCodeDetectionFieldOfst; + /* Reset Rin ALC on tones field offset. */ + tOCT6100_TLV_OFFSET ResetRinAlcOnTonesFieldOfst; + + /* Reset Sout ALC on tones field offset. */ + tOCT6100_TLV_OFFSET ResetSoutAlcOnTonesFieldOfst; + + /* ALC noise bleed out time field offset. */ + tOCT6100_TLV_OFFSET AlcNoiseBleedOutTimeFieldOfst; + /* TSI memory mapping information.*/ UINT32 ulNumTsiEntries; @@ -458,8 +467,12 @@ typedef struct _OCT6100_API_IMAGE_INFO_ UINT8 fIdleCodeDetection; UINT8 fIdleCodeDetectionConfiguration; + + UINT8 fResetRinAlcOnTones; + UINT8 fResetSoutAlcOnTones; UINT8 fSinLevel; + UINT8 fAlcNoiseBleedOutTime; diff --git a/software/include/oct6100api/oct6100_chip_open_pub.h b/software/include/oct6100api/oct6100_chip_open_pub.h index 4554ccc..36c2043 100644 --- a/software/include/oct6100api/oct6100_chip_open_pub.h +++ b/software/include/oct6100api/oct6100_chip_open_pub.h @@ -2,7 +2,7 @@ File: oct6100_chip_open_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 48 $ diff --git a/software/include/oct6100api/oct6100_chip_stats_inst.h b/software/include/oct6100api/oct6100_chip_stats_inst.h index 1c4156b..26037c4 100644 --- a/software/include/oct6100api/oct6100_chip_stats_inst.h +++ b/software/include/oct6100api/oct6100_chip_stats_inst.h @@ -2,7 +2,7 @@ File: oct6100_chip_stats_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 21 $ diff --git a/software/include/oct6100api/oct6100_chip_stats_pub.h b/software/include/oct6100api/oct6100_chip_stats_pub.h index 57add0e..d1928b9 100644 --- a/software/include/oct6100api/oct6100_chip_stats_pub.h +++ b/software/include/oct6100api/oct6100_chip_stats_pub.h @@ -2,7 +2,7 @@ File: oct6100_chip_stats_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 55 $ +$Octasic_Revision: 57 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -85,6 +85,8 @@ typedef struct _OCT6100_CHIP_IMAGE_INFO_ BOOL fAdaptiveNoiseReduction; BOOL fSoutNoiseBleaching; BOOL fAutoLevelControl; + BOOL fAlcNoiseBleedOutTime; + BOOL fResetAlcOnTones; BOOL fHighLevelCompensation; BOOL fSilenceSuppression; diff --git a/software/include/oct6100api/oct6100_conf_bridge_inst.h b/software/include/oct6100api/oct6100_conf_bridge_inst.h index ebe2da3..28010a7 100644 --- a/software/include/oct6100api/oct6100_conf_bridge_inst.h +++ b/software/include/oct6100api/oct6100_conf_bridge_inst.h @@ -2,7 +2,7 @@ File: oct6100_conf_bridge_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 19 $ diff --git a/software/include/oct6100api/oct6100_conf_bridge_pub.h b/software/include/oct6100api/oct6100_conf_bridge_pub.h index a751cd3..3da8dea 100644 --- a/software/include/oct6100api/oct6100_conf_bridge_pub.h +++ b/software/include/oct6100api/oct6100_conf_bridge_pub.h @@ -2,7 +2,7 @@ File: oct6100_conf_bridge_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 22 $ diff --git a/software/include/oct6100api/oct6100_debug_inst.h b/software/include/oct6100api/oct6100_debug_inst.h index 7635411..f98d591 100644 --- a/software/include/oct6100api/oct6100_debug_inst.h +++ b/software/include/oct6100api/oct6100_debug_inst.h @@ -2,7 +2,7 @@ File: oct6100_debug_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 9 $ diff --git a/software/include/oct6100api/oct6100_debug_pub.h b/software/include/oct6100api/oct6100_debug_pub.h index fe61a5f..3855cc8 100644 --- a/software/include/oct6100api/oct6100_debug_pub.h +++ b/software/include/oct6100api/oct6100_debug_pub.h @@ -2,7 +2,7 @@ File: oct6100_debug_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 13 $ diff --git a/software/include/oct6100api/oct6100_defines.h b/software/include/oct6100api/oct6100_defines.h index 67e8d2e..caa45cb 100644 --- a/software/include/oct6100api/oct6100_defines.h +++ b/software/include/oct6100api/oct6100_defines.h @@ -2,7 +2,7 @@ File: oct6100_defines.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.7 -$Octasic_Release: OCT612xAPI-01.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 164 $ diff --git a/software/include/oct6100api/oct6100_errors.h b/software/include/oct6100api/oct6100_errors.h index 787965c..a9aa029 100644 --- a/software/include/oct6100api/oct6100_errors.h +++ b/software/include/oct6100api/oct6100_errors.h @@ -2,7 +2,7 @@ File: oct6100_errors.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 189 $ +$Octasic_Revision: 192 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -82,6 +82,9 @@ $Octasic_Revision: 189 $ #define cOCT6100_ERR_NOT_SUPPORTED_DOUBLE_TALK_BEHAVIOR_MODE (0x00024 + cOCT6100_NOT_SUPPORTED_BASE) #define cOCT6100_ERR_NOT_SUPPORTED_IDLE_CODE_DETECTION (0x00025 + cOCT6100_NOT_SUPPORTED_BASE) #define cOCT6100_ERR_NOT_SUPPORTED_IDLE_CODE_DETECTION_CONFIG (0x00026 + cOCT6100_NOT_SUPPORTED_BASE) +#define cOCT6100_ERR_NOT_SUPPORTED_RESET_RIN_ALC_ON_TONES (0x00027 + cOCT6100_NOT_SUPPORTED_BASE) +#define cOCT6100_ERR_NOT_SUPPORTED_RESET_SOUT_ALC_ON_TONES (0x00028 + cOCT6100_NOT_SUPPORTED_BASE) +#define cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ALC_NOISE_BLEED_OUT_TIME (0x00029 + cOCT6100_NOT_SUPPORTED_BASE) #define cOCT6100_ERR_NOT_SUPPORTED_BUFFER_PLAYOUT (0x00100 + cOCT6100_NOT_SUPPORTED_BASE) #define cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_CNR (0x00101 + cOCT6100_NOT_SUPPORTED_BASE) @@ -398,6 +401,13 @@ $Octasic_Revision: 189 $ #define cOCT6100_ERR_CHANNEL_ANR_CNR_SIMULTANEOUSLY (0x070C0 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_CHANNEL_IDLE_CODE_DETECTION (0x070C1 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_CHANNEL_MUST_ENABLE_TONE_DISABLER (0x070C2 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_RESET_RIN_ALC_ON_TONES (0x070C3 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_RESET_SOUT_ALC_ON_TONES (0x070C4 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_RIN_AUTO_LEVEL_CONTROL_REQUIRED (0x070C5 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_SOUT_AUTO_LEVEL_CONTROL_REQUIRED (0x070C6 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_ALC_NOISE_BLEED_OUT_TIME (0x070C7 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_CHANNEL_AUTO_LEVEL_CONTROL_REQUIRED (0x070C8 + cOCT6100_ERR_BASE) + #define cOCT6100_ERR_PHASING_TSST_ALL_ENTRIES_ARE_OPENED (0x08000 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_PHASING_TSST_DISABLED (0x08001 + cOCT6100_ERR_BASE) diff --git a/software/include/oct6100api/oct6100_events_inst.h b/software/include/oct6100api/oct6100_events_inst.h index 8d0a049..8bc8843 100644 --- a/software/include/oct6100api/oct6100_events_inst.h +++ b/software/include/oct6100api/oct6100_events_inst.h @@ -3,7 +3,7 @@ File: oct6100_events_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -26,7 +26,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-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 11 $ diff --git a/software/include/oct6100api/oct6100_events_pub.h b/software/include/oct6100api/oct6100_events_pub.h index 837df71..e1330f4 100644 --- a/software/include/oct6100api/oct6100_events_pub.h +++ b/software/include/oct6100api/oct6100_events_pub.h @@ -3,7 +3,7 @@ File: oct6100_events_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -26,7 +26,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-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 13 $ diff --git a/software/include/oct6100api/oct6100_interrupts_inst.h b/software/include/oct6100api/oct6100_interrupts_inst.h index 00bfd4c..2c54088 100644 --- a/software/include/oct6100api/oct6100_interrupts_inst.h +++ b/software/include/oct6100api/oct6100_interrupts_inst.h @@ -2,7 +2,7 @@ File: oct6100_interrupts_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 16 $ diff --git a/software/include/oct6100api/oct6100_interrupts_pub.h b/software/include/oct6100api/oct6100_interrupts_pub.h index 620d0fc..542b615 100644 --- a/software/include/oct6100api/oct6100_interrupts_pub.h +++ b/software/include/oct6100api/oct6100_interrupts_pub.h @@ -2,7 +2,7 @@ File: oct6100_interrupts_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 23 $ diff --git a/software/include/oct6100api/oct6100_mixer_inst.h b/software/include/oct6100api/oct6100_mixer_inst.h index 2c7707f..29fe958 100644 --- a/software/include/oct6100api/oct6100_mixer_inst.h +++ b/software/include/oct6100api/oct6100_mixer_inst.h @@ -2,7 +2,7 @@ File: oct6100_mixer_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 13 $ diff --git a/software/include/oct6100api/oct6100_mixer_pub.h b/software/include/oct6100api/oct6100_mixer_pub.h index 004d1e5..ca3da3a 100644 --- a/software/include/oct6100api/oct6100_mixer_pub.h +++ b/software/include/oct6100api/oct6100_mixer_pub.h @@ -2,7 +2,7 @@ File: oct6100_mixer_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 7 $ diff --git a/software/include/oct6100api/oct6100_phasing_tsst_inst.h b/software/include/oct6100api/oct6100_phasing_tsst_inst.h index 5624238..16e60e4 100644 --- a/software/include/oct6100api/oct6100_phasing_tsst_inst.h +++ b/software/include/oct6100api/oct6100_phasing_tsst_inst.h @@ -2,7 +2,7 @@ File: oct6100_phasing_tsst_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 9 $ diff --git a/software/include/oct6100api/oct6100_phasing_tsst_pub.h b/software/include/oct6100api/oct6100_phasing_tsst_pub.h index b5f5e8e..c85923a 100644 --- a/software/include/oct6100api/oct6100_phasing_tsst_pub.h +++ b/software/include/oct6100api/oct6100_phasing_tsst_pub.h @@ -2,7 +2,7 @@ File: oct6100_phasing_tsst_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 9 $ diff --git a/software/include/oct6100api/oct6100_playout_buf_inst.h b/software/include/oct6100api/oct6100_playout_buf_inst.h index 4dce9cb..2e854c8 100644 --- a/software/include/oct6100api/oct6100_playout_buf_inst.h +++ b/software/include/oct6100api/oct6100_playout_buf_inst.h @@ -2,7 +2,7 @@ File: oct6100_playout_buf_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 9 $ diff --git a/software/include/oct6100api/oct6100_playout_buf_pub.h b/software/include/oct6100api/oct6100_playout_buf_pub.h index 88abaca..6952f65 100644 --- a/software/include/oct6100api/oct6100_playout_buf_pub.h +++ b/software/include/oct6100api/oct6100_playout_buf_pub.h @@ -2,7 +2,7 @@ File: oct6100_playout_buf_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 21 $ diff --git a/software/include/oct6100api/oct6100_remote_debug_inst.h b/software/include/oct6100api/oct6100_remote_debug_inst.h index d12415a..9157ee8 100644 --- a/software/include/oct6100api/oct6100_remote_debug_inst.h +++ b/software/include/oct6100api/oct6100_remote_debug_inst.h @@ -2,7 +2,7 @@ File: oct6100_remote_debug_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 6 $ diff --git a/software/include/oct6100api/oct6100_remote_debug_pub.h b/software/include/oct6100api/oct6100_remote_debug_pub.h index 967011d..035b61e 100644 --- a/software/include/oct6100api/oct6100_remote_debug_pub.h +++ b/software/include/oct6100api/oct6100_remote_debug_pub.h @@ -2,7 +2,7 @@ File: oct6100_remote_debug_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 6 $ diff --git a/software/include/oct6100api/oct6100_tlv_inst.h b/software/include/oct6100api/oct6100_tlv_inst.h index d4d670b..2c3263d 100644 --- a/software/include/oct6100api/oct6100_tlv_inst.h +++ b/software/include/oct6100api/oct6100_tlv_inst.h @@ -2,7 +2,7 @@ File: oct6100_tlv_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 7 $ diff --git a/software/include/oct6100api/oct6100_tone_detection_inst.h b/software/include/oct6100api/oct6100_tone_detection_inst.h index 3e1b72e..eed2c06 100644 --- a/software/include/oct6100api/oct6100_tone_detection_inst.h +++ b/software/include/oct6100api/oct6100_tone_detection_inst.h @@ -2,7 +2,7 @@ File: oct6100_tone_detection_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 8 $ diff --git a/software/include/oct6100api/oct6100_tone_detection_pub.h b/software/include/oct6100api/oct6100_tone_detection_pub.h index 5d49579..ae84873 100644 --- a/software/include/oct6100api/oct6100_tone_detection_pub.h +++ b/software/include/oct6100api/oct6100_tone_detection_pub.h @@ -2,7 +2,7 @@ File: oct6100_tone_detection_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 10 $ diff --git a/software/include/oct6100api/oct6100_tsi_cnct_inst.h b/software/include/oct6100api/oct6100_tsi_cnct_inst.h index 31f9be3..238e52d 100644 --- a/software/include/oct6100api/oct6100_tsi_cnct_inst.h +++ b/software/include/oct6100api/oct6100_tsi_cnct_inst.h @@ -2,7 +2,7 @@ File: oct6100_tsi_cnct_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 8 $ diff --git a/software/include/oct6100api/oct6100_tsi_cnct_pub.h b/software/include/oct6100api/oct6100_tsi_cnct_pub.h index 9a8ae50..7b4ef70 100644 --- a/software/include/oct6100api/oct6100_tsi_cnct_pub.h +++ b/software/include/oct6100api/oct6100_tsi_cnct_pub.h @@ -2,7 +2,7 @@ File: oct6100_tsi_cnct_pub.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 10 $ diff --git a/software/include/oct6100api/oct6100_tsst_inst.h b/software/include/oct6100api/oct6100_tsst_inst.h index 34bb022..7cdf42e 100644 --- a/software/include/oct6100api/oct6100_tsst_inst.h +++ b/software/include/oct6100api/oct6100_tsst_inst.h @@ -2,7 +2,7 @@ File: oct6100_tsst_inst.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 5 $ diff --git a/software/include/octdef.h b/software/include/octdef.h index 3330048..3156393 100644 --- a/software/include/octdef.h +++ b/software/include/octdef.h @@ -2,7 +2,7 @@ File: octdef.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 12 $ diff --git a/software/include/octmac.h b/software/include/octmac.h index 53804c7..7057bf9 100644 --- a/software/include/octmac.h +++ b/software/include/octmac.h @@ -2,7 +2,7 @@ File: octmac.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 14 $ diff --git a/software/include/octosdependant.h b/software/include/octosdependant.h index c3982a8..e767775 100644 --- a/software/include/octosdependant.h +++ b/software/include/octosdependant.h @@ -2,7 +2,7 @@ File: octosdependant.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 16 $ diff --git a/software/include/octrpc/oct6100_rpc_protocol.h b/software/include/octrpc/oct6100_rpc_protocol.h index d8f9ce9..966d595 100644 --- a/software/include/octrpc/oct6100_rpc_protocol.h +++ b/software/include/octrpc/oct6100_rpc_protocol.h @@ -2,7 +2,7 @@ File: oct6100_rpc_protocol.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 6 $ diff --git a/software/include/octrpc/rpc_protocol.h b/software/include/octrpc/rpc_protocol.h index 52a66f1..679e30e 100644 --- a/software/include/octrpc/rpc_protocol.h +++ b/software/include/octrpc/rpc_protocol.h @@ -2,7 +2,7 @@ File: rpc_protocol.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 23 $ diff --git a/software/include/octtype.h b/software/include/octtype.h index 0d8f4c5..055cdae 100644 --- a/software/include/octtype.h +++ b/software/include/octtype.h @@ -2,7 +2,7 @@ File: octtype.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 16 $ diff --git a/software/include/octtypevx.h b/software/include/octtypevx.h index 4efec81..7942dcd 100644 --- a/software/include/octtypevx.h +++ b/software/include/octtypevx.h @@ -2,7 +2,7 @@ File: octtypevx.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 6 $ diff --git a/software/include/octtypewin.h b/software/include/octtypewin.h index afe3cd3..2f0c3cb 100644 --- a/software/include/octtypewin.h +++ b/software/include/octtypewin.h @@ -2,7 +2,7 @@ File: octtypewin.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 13 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h index 47c9403..818b715 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 5 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c index ab39a52..e9c9962 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 15 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c index b51ebfd..7710154 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 449 $ +$Octasic_Revision: 460 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -117,6 +117,7 @@ UINT32 Oct6100ChannelOpenDef( f_pChannelOpen->VqeConfig.lRinAutomaticLevelControlTargetDb = -20; f_pChannelOpen->VqeConfig.fSoutAutomaticLevelControl = FALSE; f_pChannelOpen->VqeConfig.lSoutAutomaticLevelControlTargetDb = -20; + f_pChannelOpen->VqeConfig.ulAlcNoiseBleedOutTime = 0; f_pChannelOpen->VqeConfig.fRinHighLevelCompensation = FALSE; f_pChannelOpen->VqeConfig.lRinHighLevelCompensationThresholdDb = -10; f_pChannelOpen->VqeConfig.fSoutAdaptiveNoiseReduction = FALSE; @@ -147,6 +148,8 @@ UINT32 Oct6100ChannelOpenDef( f_pChannelOpen->VqeConfig.fEnableMusicProtection = FALSE; /* Older images have idle code detection hard-coded to enabled. */ f_pChannelOpen->VqeConfig.fIdleCodeDetection = TRUE; + f_pChannelOpen->VqeConfig.fResetRinAlcOnTones = FALSE; + f_pChannelOpen->VqeConfig.fResetSoutAlcOnTones = FALSE; /* TDM configuration.*/ f_pChannelOpen->TdmConfig.ulRinNumTssts = 1; @@ -341,6 +344,7 @@ UINT32 Oct6100ChannelModifyDef( f_pChannelModify->VqeConfig.lRinAutomaticLevelControlTargetDb = (INT32)cOCT6100_KEEP_PREVIOUS_SETTING; f_pChannelModify->VqeConfig.fSoutAutomaticLevelControl = cOCT6100_KEEP_PREVIOUS_SETTING; f_pChannelModify->VqeConfig.lSoutAutomaticLevelControlTargetDb = (INT32)cOCT6100_KEEP_PREVIOUS_SETTING; + f_pChannelModify->VqeConfig.ulAlcNoiseBleedOutTime = cOCT6100_KEEP_PREVIOUS_SETTING; f_pChannelModify->VqeConfig.fRinHighLevelCompensation = cOCT6100_KEEP_PREVIOUS_SETTING; f_pChannelModify->VqeConfig.lRinHighLevelCompensationThresholdDb = (INT32)cOCT6100_KEEP_PREVIOUS_SETTING; f_pChannelModify->VqeConfig.fSoutAdaptiveNoiseReduction = cOCT6100_KEEP_PREVIOUS_SETTING; @@ -369,6 +373,8 @@ UINT32 Oct6100ChannelModifyDef( f_pChannelModify->VqeConfig.ulToneDisablerVqeActivationDelay = cOCT6100_KEEP_PREVIOUS_SETTING; f_pChannelModify->VqeConfig.fEnableMusicProtection = cOCT6100_KEEP_PREVIOUS_SETTING; f_pChannelModify->VqeConfig.fIdleCodeDetection = cOCT6100_KEEP_PREVIOUS_SETTING; + f_pChannelModify->VqeConfig.fResetRinAlcOnTones = cOCT6100_KEEP_PREVIOUS_SETTING; + f_pChannelModify->VqeConfig.fResetSoutAlcOnTones = cOCT6100_KEEP_PREVIOUS_SETTING; /* TDM config. */ f_pChannelModify->TdmConfig.ulRinNumTssts = cOCT6100_KEEP_PREVIOUS_SETTING; @@ -504,6 +510,7 @@ UINT32 Oct6100ChannelCreateBiDirDef( f_pChannelCreateBiDir->ulFirstChannelHndl = cOCT6100_INVALID_HANDLE; f_pChannelCreateBiDir->ulSecondChannelHndl = cOCT6100_INVALID_HANDLE; + return cOCT6100_ERR_OK; } @@ -796,6 +803,7 @@ UINT32 Oct6100ChannelGetStatsDef( f_pChannelStats->VqeConfig.fSoutLevelControl = FALSE; f_pChannelStats->VqeConfig.fRinAutomaticLevelControl = FALSE; f_pChannelStats->VqeConfig.fSoutAutomaticLevelControl = FALSE; + f_pChannelStats->VqeConfig.ulAlcNoiseBleedOutTime = cOCT6100_INVALID_STAT; f_pChannelStats->VqeConfig.fRinHighLevelCompensation = FALSE; f_pChannelStats->VqeConfig.fAcousticEcho = FALSE; f_pChannelStats->VqeConfig.fSoutAdaptiveNoiseReduction = FALSE; @@ -825,6 +833,8 @@ UINT32 Oct6100ChannelGetStatsDef( f_pChannelStats->VqeConfig.ulToneDisablerVqeActivationDelay = cOCT6100_INVALID_STAT; f_pChannelStats->VqeConfig.fEnableMusicProtection = FALSE; f_pChannelStats->VqeConfig.fIdleCodeDetection = FALSE; + f_pChannelStats->VqeConfig.fResetRinAlcOnTones = FALSE; + f_pChannelStats->VqeConfig.fResetSoutAlcOnTones = FALSE; @@ -2479,6 +2489,7 @@ UINT32 Oct6100ApiUpdateChannelEntry( pChanEntry->VqeConfig.fRinAutomaticLevelControl = (UINT8)( pVqeConfig->fRinAutomaticLevelControl & 0xFF ); pChanEntry->VqeConfig.chRinAutomaticLevelControlTargetDb = (INT8)( pVqeConfig->lRinAutomaticLevelControlTargetDb & 0xFF ); pChanEntry->VqeConfig.fSoutAutomaticLevelControl = (UINT8)( pVqeConfig->fSoutAutomaticLevelControl & 0xFF ); + pChanEntry->VqeConfig.usAlcNoiseBleedOutTime = (UINT16)( pVqeConfig->ulAlcNoiseBleedOutTime & 0xFFFF ); pChanEntry->VqeConfig.chSoutAutomaticLevelControlTargetDb = (INT8)( pVqeConfig->lSoutAutomaticLevelControlTargetDb & 0xFF ); pChanEntry->VqeConfig.fRinHighLevelCompensation = (UINT8)( pVqeConfig->fRinHighLevelCompensation & 0xFF ); pChanEntry->VqeConfig.chRinHighLevelCompensationThresholdDb = (INT8)( pVqeConfig->lRinHighLevelCompensationThresholdDb & 0xFF ); @@ -2506,6 +2517,8 @@ UINT32 Oct6100ApiUpdateChannelEntry( pChanEntry->VqeConfig.fRoutNoiseReduction = (UINT8)( pVqeConfig->fRoutNoiseReduction & 0xFF ); pChanEntry->VqeConfig.fEnableMusicProtection = (UINT8)( pVqeConfig->fEnableMusicProtection & 0xFF ); pChanEntry->VqeConfig.fIdleCodeDetection = (UINT8)( pVqeConfig->fIdleCodeDetection & 0xFF ); + pChanEntry->VqeConfig.fResetRinAlcOnTones = (UINT8)( pVqeConfig->fResetRinAlcOnTones & 0xFF ); + pChanEntry->VqeConfig.fResetSoutAlcOnTones = (UINT8)( pVqeConfig->fResetSoutAlcOnTones & 0xFF ); /* Save the codec information.*/ pChanEntry->CodecConfig.byAdpcmNibblePosition = (UINT8)( pCodecConfig->ulAdpcmNibblePosition & 0xFF ); @@ -3119,6 +3132,18 @@ UINT32 Oct6100ApiInvalidateChannelStructs( /*------------------------------------------------------------------------------*/ /*------------------------------------------------------------------------------*/ + /* Clear the mute with feature bit. */ + + if ( ( pChanEntry->usMutedPorts & cOCT6100_CHANNEL_MUTE_PORT_SIN_WITH_FEATURES ) != 0x0 ) + { + ulResult = Oct6100ApiMuteSinWithFeatures( f_pApiInstance, f_usChanIndex, FALSE ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } + + /*------------------------------------------------------------------------------*/ + + /*------------------------------------------------------------------------------*/ /* Clear the VQE memory. */ SmearParams.ulWriteAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pChanEntry->usEchoMemIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x20; @@ -3130,7 +3155,7 @@ UINT32 Oct6100ApiInvalidateChannelStructs( return ulResult; /*------------------------------------------------------------------------------*/ - + /*------------------------------------------------------------------------------*/ /* Clear the AF information memory. */ @@ -5683,6 +5708,7 @@ UINT32 Oct6100ApiModifyChannelEntry( pApiVqeConf->fSoutLevelControl = (UINT8)( f_pChannelOpen->VqeConfig.fSoutLevelControl & 0xFF ); pApiVqeConf->fRinAutomaticLevelControl = (UINT8)( f_pChannelOpen->VqeConfig.fRinAutomaticLevelControl & 0xFF ); pApiVqeConf->fSoutAutomaticLevelControl = (UINT8)( f_pChannelOpen->VqeConfig.fSoutAutomaticLevelControl & 0xFF ); + pApiVqeConf->usAlcNoiseBleedOutTime = (UINT16)( f_pChannelOpen->VqeConfig.ulAlcNoiseBleedOutTime & 0xFFFF ); pApiVqeConf->fRinHighLevelCompensation = (UINT8)( f_pChannelOpen->VqeConfig.fRinHighLevelCompensation & 0xFF ); pApiVqeConf->fSoutAdaptiveNoiseReduction = (UINT8)( f_pChannelOpen->VqeConfig.fSoutAdaptiveNoiseReduction & 0xFF ); @@ -5714,6 +5740,8 @@ UINT32 Oct6100ApiModifyChannelEntry( pApiVqeConf->fRoutNoiseReduction = (UINT8)( f_pChannelOpen->VqeConfig.fRoutNoiseReduction & 0xFF ); pApiVqeConf->fEnableMusicProtection = (UINT8)( f_pChannelOpen->VqeConfig.fEnableMusicProtection & 0xFF ); pApiVqeConf->fIdleCodeDetection = (UINT8)( f_pChannelOpen->VqeConfig.fIdleCodeDetection & 0xFF ); + pApiVqeConf->fResetRinAlcOnTones = (UINT8)( f_pChannelOpen->VqeConfig.fResetRinAlcOnTones & 0xFF ); + pApiVqeConf->fResetSoutAlcOnTones = (UINT8)( f_pChannelOpen->VqeConfig.fResetSoutAlcOnTones & 0xFF ); } /*=======================================================================*/ @@ -6745,6 +6773,7 @@ UINT32 Oct6100ApiChannelGetStatsSer( f_pChannelStats->VqeConfig.fSoutLevelControl = pChanEntry->VqeConfig.fSoutLevelControl; f_pChannelStats->VqeConfig.fRinAutomaticLevelControl = pChanEntry->VqeConfig.fRinAutomaticLevelControl; f_pChannelStats->VqeConfig.fSoutAutomaticLevelControl = pChanEntry->VqeConfig.fSoutAutomaticLevelControl; + f_pChannelStats->VqeConfig.ulAlcNoiseBleedOutTime = pChanEntry->VqeConfig.usAlcNoiseBleedOutTime; f_pChannelStats->VqeConfig.fRinHighLevelCompensation = pChanEntry->VqeConfig.fRinHighLevelCompensation; f_pChannelStats->VqeConfig.fSoutAdaptiveNoiseReduction = pChanEntry->VqeConfig.fSoutAdaptiveNoiseReduction; f_pChannelStats->VqeConfig.fSoutNoiseBleaching = pChanEntry->VqeConfig.fSoutNoiseBleaching; @@ -6772,6 +6801,8 @@ UINT32 Oct6100ApiChannelGetStatsSer( f_pChannelStats->VqeConfig.fRoutNoiseReduction = pChanEntry->VqeConfig.fRoutNoiseReduction; f_pChannelStats->VqeConfig.fEnableMusicProtection = pChanEntry->VqeConfig.fEnableMusicProtection; f_pChannelStats->VqeConfig.fIdleCodeDetection = pChanEntry->VqeConfig.fIdleCodeDetection; + f_pChannelStats->VqeConfig.fResetRinAlcOnTones = pChanEntry->VqeConfig.fResetRinAlcOnTones; + f_pChannelStats->VqeConfig.fResetSoutAlcOnTones = pChanEntry->VqeConfig.fResetSoutAlcOnTones; /* Copy the CODEC configuration.*/ f_pChannelStats->CodecConfig.ulAdpcmNibblePosition = pChanEntry->CodecConfig.byAdpcmNibblePosition; @@ -7580,9 +7611,23 @@ UINT32 Oct6100ApiCheckVqeConfig( if ( ( f_pVqeConfig->fRinAutomaticLevelControl == TRUE ) && ( pImageInfo->fRinAutoLevelControl == FALSE ) ) return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_RIN_AUTO_LC; + if ( f_pVqeConfig->ulAlcNoiseBleedOutTime > 63750 ) + return cOCT6100_ERR_CHANNEL_ALC_NOISE_BLEED_OUT_TIME; + + if ( ( f_pVqeConfig->ulAlcNoiseBleedOutTime != 0 ) && ( pImageInfo->fAlcNoiseBleedOutTime == FALSE ) ) + return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ALC_NOISE_BLEED_OUT_TIME; + if ( ( f_pVqeConfig->fRinHighLevelCompensation == TRUE ) && ( pImageInfo->fRinHighLevelCompensation == FALSE ) ) return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_RIN_HIGH_LEVEL_COMP; + /* Check the enable reset Rin ALC on tone detection flag. */ + if ( ( f_pVqeConfig->fResetRinAlcOnTones != TRUE ) && ( f_pVqeConfig->fResetRinAlcOnTones != FALSE ) ) + return cOCT6100_ERR_CHANNEL_RESET_RIN_ALC_ON_TONES; + + /* The reset Rin ALC on tone detection can be activated if the image supports it. */ + if ( ( f_pVqeConfig->fResetRinAlcOnTones == TRUE ) && ( pImageInfo->fResetRinAlcOnTones == FALSE ) ) + return cOCT6100_ERR_NOT_SUPPORTED_RESET_RIN_ALC_ON_TONES; + if ( f_pVqeConfig->fRinAutomaticLevelControl == TRUE ) { if ( f_pVqeConfig->fRinLevelControl == TRUE ) @@ -7594,6 +7639,12 @@ UINT32 Oct6100ApiCheckVqeConfig( if ( ( f_pVqeConfig->lRinAutomaticLevelControlTargetDb < -40 || f_pVqeConfig->lRinAutomaticLevelControlTargetDb > 0 ) ) return cOCT6100_ERR_CHANNEL_RIN_AUTO_LEVEL_CONTROL_TARGET; } + else /* if ( f_pVqeConfig->fRinAutomaticLevelControl != TRUE ) */ + { + /* Reset Rin ALC on tones can only be activated in Rin ALC is requested. */ + if ( f_pVqeConfig->fResetRinAlcOnTones == TRUE ) + return cOCT6100_ERR_CHANNEL_RIN_AUTO_LEVEL_CONTROL_REQUIRED; + } if ( f_pVqeConfig->fRinHighLevelCompensation == TRUE ) { @@ -7610,6 +7661,14 @@ UINT32 Oct6100ApiCheckVqeConfig( if ( ( f_pVqeConfig->fSoutAutomaticLevelControl == TRUE ) && ( pImageInfo->fSoutAutoLevelControl == FALSE ) ) return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_SOUT_AUTO_LC; + /* Check the enable reset Sout ALC on tone detection flag. */ + if ( ( f_pVqeConfig->fResetSoutAlcOnTones != TRUE ) && ( f_pVqeConfig->fResetSoutAlcOnTones != FALSE ) ) + return cOCT6100_ERR_CHANNEL_RESET_SOUT_ALC_ON_TONES; + + /* The reset Sout ALC on tone detection can be activated if the image supports it. */ + if ( ( f_pVqeConfig->fResetSoutAlcOnTones == TRUE ) && ( pImageInfo->fResetSoutAlcOnTones == FALSE ) ) + return cOCT6100_ERR_NOT_SUPPORTED_RESET_SOUT_ALC_ON_TONES; + if ( f_pVqeConfig->fSoutAutomaticLevelControl == TRUE ) { if ( f_pVqeConfig->fSoutLevelControl == TRUE ) @@ -7618,6 +7677,21 @@ UINT32 Oct6100ApiCheckVqeConfig( if ( ( f_pVqeConfig->lSoutAutomaticLevelControlTargetDb < -40 || f_pVqeConfig->lSoutAutomaticLevelControlTargetDb > 0 ) ) return cOCT6100_ERR_CHANNEL_SOUT_AUTO_LEVEL_CONTROL_TARGET; } + else /* if ( f_pVqeConfig->fSoutAutomaticLevelControl != TRUE ) */ + { + /* Reset Sout ALC on tones can only be activated if Sout ALC is requested. */ + if ( f_pVqeConfig->fResetSoutAlcOnTones == TRUE ) + return cOCT6100_ERR_CHANNEL_SOUT_AUTO_LEVEL_CONTROL_REQUIRED; + } + + /* ALC noise bleed out can only be configured if ALC is requested. */ + if ( f_pVqeConfig->ulAlcNoiseBleedOutTime != 0 ) + { + /* If both ports ALC is disabled, let the user know. */ + if ( ( f_pVqeConfig->fRinAutomaticLevelControl == FALSE ) + && ( f_pVqeConfig->fSoutAutomaticLevelControl == FALSE ) ) + return cOCT6100_ERR_CHANNEL_AUTO_LEVEL_CONTROL_REQUIRED; + } if ( f_pVqeConfig->fSoutAdaptiveNoiseReduction != TRUE && f_pVqeConfig->fSoutAdaptiveNoiseReduction != FALSE ) @@ -7887,8 +7961,11 @@ UINT32 Oct6100ApiCheckVqeConfig( /* The idle code detection module can be disabled only if idle code detection configuration */ /* is supported in the image. */ - if ( ( f_pVqeConfig->fIdleCodeDetection == FALSE ) && ( pImageInfo->fIdleCodeDetectionConfiguration == FALSE ) ) - return cOCT6100_ERR_NOT_SUPPORTED_IDLE_CODE_DETECTION_CONFIG; + if ( pImageInfo->fIdleCodeDetection == TRUE ) + { + if ( ( f_pVqeConfig->fIdleCodeDetection == FALSE ) && ( pImageInfo->fIdleCodeDetectionConfiguration == FALSE ) ) + return cOCT6100_ERR_NOT_SUPPORTED_IDLE_CODE_DETECTION_CONFIG; + } return cOCT6100_ERR_OK; } @@ -10203,6 +10280,18 @@ UINT32 Oct6100ApiUpdateOpenStruct( f_pChanOpen->VqeConfig.fRinAutomaticLevelControl = f_pChanModify->VqeConfig.fRinAutomaticLevelControl; + if ( f_pChanModify->VqeConfig.fResetRinAlcOnTones == cOCT6100_KEEP_PREVIOUS_SETTING ) + f_pChanOpen->VqeConfig.fResetRinAlcOnTones = f_pChanEntry->VqeConfig.fResetRinAlcOnTones; + else + f_pChanOpen->VqeConfig.fResetRinAlcOnTones = f_pChanModify->VqeConfig.fResetRinAlcOnTones; + + + if ( f_pChanModify->VqeConfig.ulAlcNoiseBleedOutTime == cOCT6100_KEEP_PREVIOUS_SETTING ) + f_pChanOpen->VqeConfig.ulAlcNoiseBleedOutTime = f_pChanEntry->VqeConfig.usAlcNoiseBleedOutTime; + else + f_pChanOpen->VqeConfig.ulAlcNoiseBleedOutTime = f_pChanModify->VqeConfig.ulAlcNoiseBleedOutTime; + + if ( f_pChanModify->VqeConfig.fRinHighLevelCompensation == cOCT6100_KEEP_PREVIOUS_SETTING ) f_pChanOpen->VqeConfig.fRinHighLevelCompensation = f_pChanEntry->VqeConfig.fRinHighLevelCompensation; else @@ -10249,6 +10338,12 @@ UINT32 Oct6100ApiUpdateOpenStruct( f_pChanOpen->VqeConfig.fSoutAutomaticLevelControl = f_pChanEntry->VqeConfig.fSoutAutomaticLevelControl; else f_pChanOpen->VqeConfig.fSoutAutomaticLevelControl = f_pChanModify->VqeConfig.fSoutAutomaticLevelControl; + + + if ( f_pChanModify->VqeConfig.fResetSoutAlcOnTones == cOCT6100_KEEP_PREVIOUS_SETTING ) + f_pChanOpen->VqeConfig.fResetSoutAlcOnTones = f_pChanEntry->VqeConfig.fResetSoutAlcOnTones; + else + f_pChanOpen->VqeConfig.fResetSoutAlcOnTones = f_pChanModify->VqeConfig.fResetSoutAlcOnTones; if ( f_pChanModify->VqeConfig.lRinLevelControlGainDb == ( (INT32)cOCT6100_KEEP_PREVIOUS_SETTING ) ) @@ -10605,6 +10700,7 @@ UINT32 Oct6100ChannelCreateBiDirSer( UINT16 usBiDirChanIndex; UINT32 ulResult; + /* Check the user's configuration of the bidir channel for errors. */ ulResult = Oct6100ApiCheckChannelCreateBiDirParams( f_pApiInstance, f_pChannelCreateBiDir, @@ -10613,12 +10709,15 @@ UINT32 Oct6100ChannelCreateBiDirSer( &usFirstChanSinCopyEventIndex, &usSecondChanIndex, &usSecondChanExtraTsiIndex, - &usSecondChanSinCopyEventIndex ); + &usSecondChanSinCopyEventIndex + + ); if ( ulResult != cOCT6100_ERR_OK ) return ulResult; /* Reserve all resources needed by the bidir channel. */ ulResult = Oct6100ApiReserveChannelCreateBiDirResources(f_pApiInstance, + &usBiDirChanIndex, &usFirstChanExtraTsiIndex, &usFirstChanSinCopyEventIndex, @@ -10631,6 +10730,7 @@ UINT32 Oct6100ChannelCreateBiDirSer( /* Write all necessary structures to activate the echo cancellation channel. */ ulResult = Oct6100ApiWriteChannelCreateBiDirStructs( f_pApiInstance, + usFirstChanIndex, usFirstChanExtraTsiIndex, usFirstChanSinCopyEventIndex, @@ -10693,12 +10793,15 @@ UINT32 Oct6100ApiCheckChannelCreateBiDirParams( OUT PUINT16 f_pusFirstChanSinCopyEventIndex, OUT PUINT16 f_pusSecondChanIndex, OUT PUINT16 f_pusSecondChanExtraTsiIndex, - OUT PUINT16 f_pusSecondChanSinCopyEventIndex ) + OUT PUINT16 f_pusSecondChanSinCopyEventIndex + + ) { tPOCT6100_SHARED_INFO pSharedInfo; tPOCT6100_API_CHANNEL pFirstChanEntry; tPOCT6100_API_CHANNEL pSecondChanEntry; - UINT32 ulEntryOpenCnt; + UINT32 ulEntryOpenCnt; + BOOL fCheckTssts = TRUE; /* Obtain shared resources pointer.*/ pSharedInfo = f_pApiInstance->pSharedInfo; @@ -10706,6 +10809,8 @@ UINT32 Oct6100ApiCheckChannelCreateBiDirParams( /* validate the bidirectional channel handle memory.*/ if ( f_pChannelCreateBiDir->pulBiDirChannelHndl == NULL ) return cOCT6100_ERR_CHANNEL_BIDIR_CHANNEL_HANDLE; + + /* Check if bi-dir channels are activated. */ if ( f_pApiInstance->pSharedInfo->ChipConfig.usMaxBiDirChannels == 0 ) @@ -10742,10 +10847,13 @@ UINT32 Oct6100ApiCheckChannelCreateBiDirParams( if ( pFirstChanEntry->usBridgeIndex != cOCT6100_INVALID_INDEX ) return cOCT6100_ERR_CHANNEL_FIRST_CHAN_IN_CONFERENCE; - if ( pFirstChanEntry->usSoutTsstIndex != cOCT6100_INVALID_INDEX ) - return cOCT6100_ERR_CHANNEL_FIRST_CHAN_SOUT_PORT; - if ( pFirstChanEntry->usRinTsstIndex != cOCT6100_INVALID_INDEX ) - return cOCT6100_ERR_CHANNEL_FIRST_CHAN_RIN_PORT; + if ( fCheckTssts == TRUE ) + { + if ( pFirstChanEntry->usSoutTsstIndex != cOCT6100_INVALID_INDEX ) + return cOCT6100_ERR_CHANNEL_FIRST_CHAN_SOUT_PORT; + if ( pFirstChanEntry->usRinTsstIndex != cOCT6100_INVALID_INDEX ) + return cOCT6100_ERR_CHANNEL_FIRST_CHAN_RIN_PORT; + } /* Return the desired info.*/ *f_pusFirstChanExtraTsiIndex = pFirstChanEntry->usExtraSinTsiMemIndex; @@ -10780,10 +10888,13 @@ UINT32 Oct6100ApiCheckChannelCreateBiDirParams( if ( pSecondChanEntry->fBiDirChannel == TRUE ) return cOCT6100_ERR_CHANNEL_ALREADY_BIDIR; - if ( pSecondChanEntry->usSoutTsstIndex != cOCT6100_INVALID_INDEX ) - return cOCT6100_ERR_CHANNEL_SECOND_CHAN_SOUT_PORT; - if ( pSecondChanEntry->usRinTsstIndex != cOCT6100_INVALID_INDEX ) - return cOCT6100_ERR_CHANNEL_SECOND_CHAN_RIN_PORT; + if ( fCheckTssts == TRUE ) + { + if ( pSecondChanEntry->usSoutTsstIndex != cOCT6100_INVALID_INDEX ) + return cOCT6100_ERR_CHANNEL_SECOND_CHAN_SOUT_PORT; + if ( pSecondChanEntry->usRinTsstIndex != cOCT6100_INVALID_INDEX ) + return cOCT6100_ERR_CHANNEL_SECOND_CHAN_RIN_PORT; + } if ( pSecondChanEntry->usBridgeIndex != cOCT6100_INVALID_INDEX ) return cOCT6100_ERR_CHANNEL_SECOND_CHAN_IN_CONFERENCE; @@ -10797,7 +10908,6 @@ UINT32 Oct6100ApiCheckChannelCreateBiDirParams( if ( pFirstChanEntry->TdmConfig.bySoutPcmLaw != pSecondChanEntry->TdmConfig.byRinPcmLaw || pFirstChanEntry->TdmConfig.byRinPcmLaw != pSecondChanEntry->TdmConfig.bySoutPcmLaw ) return cOCT6100_ERR_CHANNEL_BIDIR_PCM_LAW; - return cOCT6100_ERR_OK; } @@ -10825,6 +10935,7 @@ f_pusSecondChanSoutCopyEventIndex Pointer to the second channel Sout copy event \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ UINT32 Oct6100ApiReserveChannelCreateBiDirResources( IN tPOCT6100_INSTANCE_API f_pApiInstance, + OUT PUINT16 f_pusBiDirChanIndex, IN OUT PUINT16 f_pusFirstChanExtraTsiIndex, IN OUT PUINT16 f_pusFirstChanSinCopyEventIndex, @@ -10850,22 +10961,25 @@ UINT32 Oct6100ApiReserveChannelCreateBiDirResources( /*===============================================================================*/ /* Verify and reserve the resources that might already by allocated. */ - if ( *f_pusFirstChanExtraTsiIndex == cOCT6100_INVALID_INDEX ) - { - /* Reserve the first Extra TSI memory entry */ - ulResult = Oct6100ApiReserveTsiMemEntry( f_pApiInstance, - f_pusFirstChanExtraTsiIndex ); - if ( ulResult == cOCT6100_ERR_OK ) - fFirstExtraTsi = TRUE; - } - if ( *f_pusFirstChanSinCopyEventIndex == cOCT6100_INVALID_INDEX && ulResult == cOCT6100_ERR_OK ) { - /* Reserve the Sin copy event for the first channel.*/ - ulResult = Oct6100ApiReserveMixerEventEntry ( f_pApiInstance, - f_pusFirstChanSinCopyEventIndex ); - if ( ulResult == cOCT6100_ERR_OK ) - fFirstSinCopyEvent = TRUE; + if ( *f_pusFirstChanExtraTsiIndex == cOCT6100_INVALID_INDEX ) + { + /* Reserve the first Extra TSI memory entry */ + ulResult = Oct6100ApiReserveTsiMemEntry( f_pApiInstance, + f_pusFirstChanExtraTsiIndex ); + if ( ulResult == cOCT6100_ERR_OK ) + fFirstExtraTsi = TRUE; + } + + if ( *f_pusFirstChanSinCopyEventIndex == cOCT6100_INVALID_INDEX && ulResult == cOCT6100_ERR_OK ) + { + /* Reserve the Sin copy event for the first channel.*/ + ulResult = Oct6100ApiReserveMixerEventEntry ( f_pApiInstance, + f_pusFirstChanSinCopyEventIndex ); + if ( ulResult == cOCT6100_ERR_OK ) + fFirstSinCopyEvent = TRUE; + } } if ( *f_pusSecondChanExtraTsiIndex == cOCT6100_INVALID_INDEX && ulResult == cOCT6100_ERR_OK ) @@ -10899,9 +11013,14 @@ UINT32 Oct6100ApiReserveChannelCreateBiDirResources( { fBiDirChanIndex = TRUE; - /* Reserve the first channel Sout copy mixer event.*/ - ulResult = Oct6100ApiReserveMixerEventEntry ( f_pApiInstance, - f_pusFirstChanSoutCopyEventIndex ); + + { + + /* Reserve the first channel Sout copy mixer event.*/ + ulResult = Oct6100ApiReserveMixerEventEntry ( f_pApiInstance, + f_pusFirstChanSoutCopyEventIndex ); + } + if ( ulResult == cOCT6100_ERR_OK ) { fFirstSoutCopyEvent = TRUE; @@ -10962,7 +11081,9 @@ UINT32 Oct6100ApiReserveChannelCreateBiDirResources( return ulTempVar; } - if ( fFirstSoutCopyEvent == TRUE ) + if ( ( fFirstSoutCopyEvent == TRUE ) + + ) { ulTempVar = Oct6100ApiReleaseMixerEventEntry( f_pApiInstance, *f_pusFirstChanSoutCopyEventIndex ); @@ -11004,6 +11125,7 @@ f_usSecondChanSoutCopyEventIndex Pointer to the second channel Sout copy event i \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ UINT32 Oct6100ApiWriteChannelCreateBiDirStructs( IN tPOCT6100_INSTANCE_API f_pApiInstance, + IN UINT16 f_usFirstChanIndex, IN UINT16 f_usFirstChanExtraTsiIndex, IN UINT16 f_usFirstChanSinCopyEventIndex, @@ -11034,50 +11156,55 @@ UINT32 Oct6100ApiWriteChannelCreateBiDirStructs( mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pFirstChanEntry, f_usFirstChanIndex ); mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pSecondChanEntry, f_usSecondChanIndex ); - /*==============================================================================*/ - /* Configure the Tsst control memory and add the Sin copy event if necessary.*/ - - /*=======================================================================*/ - /* Program the Sin Copy event.*/ - WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( f_usFirstChanSinCopyEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE ); - - WriteParams.usWriteData = cOCT6100_MIXER_CONTROL_MEM_COPY; - WriteParams.usWriteData |= f_usFirstChanExtraTsiIndex; - WriteParams.usWriteData |= pFirstChanEntry->TdmConfig.bySinPcmLaw << cOCT6100_MIXER_CONTROL_MEM_LAW_OFFSET; - mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; - WriteParams.ulWriteAddress += 2; - WriteParams.usWriteData = (UINT16)( pFirstChanEntry->usSinSoutTsiMemIndex ); - mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + { + /*==============================================================================*/ + /* Configure the Tsst control memory and add the Sin copy event if necessary. */ + + /*=======================================================================*/ + /* Program the Sin Copy event.*/ + WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( f_usFirstChanSinCopyEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE ); + + WriteParams.usWriteData = cOCT6100_MIXER_CONTROL_MEM_COPY; + WriteParams.usWriteData |= f_usFirstChanExtraTsiIndex; + WriteParams.usWriteData |= pFirstChanEntry->TdmConfig.bySinPcmLaw << cOCT6100_MIXER_CONTROL_MEM_LAW_OFFSET; - /*=======================================================================*/ + mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; - /* Configure the TSST memory.*/ - if ( pFirstChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX ) - { - ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance, - pFirstChanEntry->usSinTsstIndex, - f_usFirstChanExtraTsiIndex, - pFirstChanEntry->TdmConfig.bySinPcmLaw ); - if ( ulResult != cOCT6100_ERR_OK ) + WriteParams.ulWriteAddress += 2; + WriteParams.usWriteData = (UINT16)( pFirstChanEntry->usSinSoutTsiMemIndex ); + + mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) return ulResult; - } - /* Now insert the event into the event list.*/ - ulResult = Oct6100ApiMixerEventAdd( f_pApiInstance, - f_usFirstChanSinCopyEventIndex, - cOCT6100_EVENT_TYPE_SIN_COPY, - f_usFirstChanIndex ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + /*=======================================================================*/ - /*==============================================================================*/ + /* Configure the TSST memory.*/ + if ( pFirstChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX ) + { + ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance, + pFirstChanEntry->usSinTsstIndex, + f_usFirstChanExtraTsiIndex, + pFirstChanEntry->TdmConfig.bySinPcmLaw ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } + + /* Now insert the event into the event list.*/ + ulResult = Oct6100ApiMixerEventAdd( f_pApiInstance, + f_usFirstChanSinCopyEventIndex, + cOCT6100_EVENT_TYPE_SIN_COPY, + f_usFirstChanIndex ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + + /*==============================================================================*/ + } @@ -11108,10 +11235,13 @@ UINT32 Oct6100ApiWriteChannelCreateBiDirStructs( /* Configure the TSST memory.*/ if ( pSecondChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX ) { - ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance, - pSecondChanEntry->usSinTsstIndex, - f_usSecondChanExtraTsiIndex, - pSecondChanEntry->TdmConfig.bySinPcmLaw ); + + { + ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance, + pSecondChanEntry->usSinTsstIndex, + f_usSecondChanExtraTsiIndex, + pSecondChanEntry->TdmConfig.bySinPcmLaw ); + } if ( ulResult != cOCT6100_ERR_OK ) return ulResult; } @@ -11131,30 +11261,31 @@ UINT32 Oct6100ApiWriteChannelCreateBiDirStructs( /*==============================================================================*/ /* Now, let's configure the two Sout copy events.*/ - /* First event.*/ - WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( f_usFirstChanSoutCopyEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE ); - - WriteParams.usWriteData = cOCT6100_MIXER_CONTROL_MEM_COPY; - WriteParams.usWriteData |= pFirstChanEntry->usSinSoutTsiMemIndex; - WriteParams.usWriteData |= pFirstChanEntry->TdmConfig.bySoutPcmLaw << cOCT6100_MIXER_CONTROL_MEM_LAW_OFFSET; - mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + /* First event.*/ + WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( f_usFirstChanSoutCopyEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE ); + + WriteParams.usWriteData = cOCT6100_MIXER_CONTROL_MEM_COPY; + WriteParams.usWriteData |= pFirstChanEntry->usSinSoutTsiMemIndex; + WriteParams.usWriteData |= pFirstChanEntry->TdmConfig.bySoutPcmLaw << cOCT6100_MIXER_CONTROL_MEM_LAW_OFFSET; - WriteParams.ulWriteAddress += 2; - WriteParams.usWriteData = pSecondChanEntry->usRinRoutTsiMemIndex; + mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; - mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + WriteParams.ulWriteAddress += 2; + WriteParams.usWriteData = pSecondChanEntry->usRinRoutTsiMemIndex; - ulResult = Oct6100ApiMixerEventAdd( f_pApiInstance, - f_usFirstChanSoutCopyEventIndex, - cOCT6100_EVENT_TYPE_SOUT_COPY, - f_usFirstChanIndex ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + + ulResult = Oct6100ApiMixerEventAdd( f_pApiInstance, + f_usFirstChanSoutCopyEventIndex, + cOCT6100_EVENT_TYPE_SOUT_COPY, + f_usFirstChanIndex ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; /* Second event.*/ @@ -11205,7 +11336,9 @@ UINT32 Oct6100ApiWriteChannelCreateBiDirStructs( pFirstChanEntry->usRinSilenceEventIndex = cOCT6100_INVALID_INDEX; } - if ( pSecondChanEntry->usRinSilenceEventIndex != cOCT6100_INVALID_INDEX ) + if ( ( pSecondChanEntry->usRinSilenceEventIndex != cOCT6100_INVALID_INDEX ) + + ) { /* Remove the event from the list.*/ ulResult = Oct6100ApiMixerEventRemove( f_pApiInstance, @@ -11282,8 +11415,11 @@ UINT32 Oct6100ApiUpdateBiDirChannelEntry( pBiDirChanEntry->usFirstChanIndex = f_usFirstChanIndex; pBiDirChanEntry->usSecondChanIndex = f_usSecondChanIndex; + + /* Increment the extra TSI memory dependency count.*/ - pFirstChanEntry->usExtraSinTsiDependencyCnt++; + + pFirstChanEntry->usExtraSinTsiDependencyCnt++; pSecondChanEntry->usExtraSinTsiDependencyCnt++; /* Set the bidir flag in the channel structure.*/ @@ -11333,12 +11469,14 @@ UINT32 Oct6100ChannelDestroyBiDirSer( UINT16 usFirstChanIndex; UINT16 usSecondChanIndex; + UINT32 ulResult; /* Verify that all the parameters given match the state of the API. */ ulResult = Oct6100ApiAssertDestroyBiDirChanParams( f_pApiInstance, f_pChannelDestroyBiDir, &usBiDirChanIndex, + &usFirstChanIndex, &usSecondChanIndex ); if ( ulResult != cOCT6100_ERR_OK ) @@ -11346,6 +11484,7 @@ UINT32 Oct6100ChannelDestroyBiDirSer( /* Release all resources associated to the echo cancellation channel. */ ulResult = Oct6100ApiInvalidateBiDirChannelStructs( f_pApiInstance, + usFirstChanIndex, usSecondChanIndex ); if ( ulResult != cOCT6100_ERR_OK ) @@ -11354,6 +11493,7 @@ UINT32 Oct6100ChannelDestroyBiDirSer( /* Release all resources associated to the echo cancellation channel. */ ulResult = Oct6100ApiReleaseBiDirChannelResources( f_pApiInstance, usBiDirChanIndex, + usFirstChanIndex, usSecondChanIndex ); if ( ulResult != cOCT6100_ERR_OK ) @@ -11388,6 +11528,7 @@ UINT32 Oct6100ApiAssertDestroyBiDirChanParams( IN tPOCT6100_INSTANCE_API f_pApiInstance, IN tPOCT6100_CHANNEL_DESTROY_BIDIR f_pChannelDestroyBiDir, IN OUT PUINT16 f_pusBiDirChanIndex, + IN OUT PUINT16 f_pusFirstChanIndex, IN OUT PUINT16 f_pusSecondChanIndex ) { @@ -11426,6 +11567,8 @@ UINT32 Oct6100ApiAssertDestroyBiDirChanParams( *f_pusFirstChanIndex = pBiDirChanEntry->usFirstChanIndex; *f_pusSecondChanIndex = pBiDirChanEntry->usSecondChanIndex; + + return cOCT6100_ERR_OK; } @@ -11444,6 +11587,7 @@ f_pApiInstance Pointer to API instance. This memory is used to keep the \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ UINT32 Oct6100ApiInvalidateBiDirChannelStructs( IN tPOCT6100_INSTANCE_API f_pApiInstance, + IN UINT16 f_usFirstChanIndex, IN UINT16 f_usSecondChanIndex ) { @@ -11467,37 +11611,40 @@ UINT32 Oct6100ApiInvalidateBiDirChannelStructs( /* Clear the SIN copy event of the first channel and release the Extra TSI memory if this feature was the only one using it. */ - if ( pFirstChanEntry->usExtraSinTsiDependencyCnt == 1 ) + { - /*=======================================================================*/ - /* Clear the Sin Copy event.*/ - WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( pFirstChanEntry->usSinCopyEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE ); - WriteParams.usWriteData = cOCT6100_MIXER_CONTROL_MEM_NO_OP; + if ( pFirstChanEntry->usExtraSinTsiDependencyCnt == 1 ) + { + /*=======================================================================*/ + /* Clear the Sin Copy event.*/ + WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( pFirstChanEntry->usSinCopyEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE ); + WriteParams.usWriteData = cOCT6100_MIXER_CONTROL_MEM_NO_OP; - mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; - /*=======================================================================*/ + /*=======================================================================*/ - /* Configure the TSST memory.*/ - if ( pFirstChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX ) - { - ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance, - pFirstChanEntry->usSinTsstIndex, - pFirstChanEntry->usSinSoutTsiMemIndex, - pFirstChanEntry->TdmConfig.bySinPcmLaw ); + /* Configure the TSST memory.*/ + if ( pFirstChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX ) + { + ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance, + pFirstChanEntry->usSinTsstIndex, + pFirstChanEntry->usSinSoutTsiMemIndex, + pFirstChanEntry->TdmConfig.bySinPcmLaw ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } + + /* Remove the event from the list.*/ + ulResult = Oct6100ApiMixerEventRemove( f_pApiInstance, + pFirstChanEntry->usSinCopyEventIndex, + cOCT6100_EVENT_TYPE_SIN_COPY ); if ( ulResult != cOCT6100_ERR_OK ) return ulResult; - } - - /* Remove the event from the list.*/ - ulResult = Oct6100ApiMixerEventRemove( f_pApiInstance, - pFirstChanEntry->usSinCopyEventIndex, - cOCT6100_EVENT_TYPE_SIN_COPY ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + } } /* Clear the SIN copy event of the first channel and release the Extra TSI memory if @@ -11537,22 +11684,26 @@ UINT32 Oct6100ApiInvalidateBiDirChannelStructs( /* Now remove the sout copy of the first channel.*/ - /*=======================================================================*/ - /* Clear the Sout Copy event of the first channel.*/ - WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( pFirstChanEntry->usSoutCopyEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE ); - WriteParams.usWriteData = cOCT6100_MIXER_CONTROL_MEM_NO_OP; - mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; - /*=======================================================================*/ + { + /*=======================================================================*/ + /* Clear the Sout Copy event of the first channel.*/ + WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( pFirstChanEntry->usSoutCopyEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE ); + WriteParams.usWriteData = cOCT6100_MIXER_CONTROL_MEM_NO_OP; + + mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + /*=======================================================================*/ + + /* Remove the event from the list.*/ + ulResult = Oct6100ApiMixerEventRemove( f_pApiInstance, + pFirstChanEntry->usSoutCopyEventIndex, + cOCT6100_EVENT_TYPE_SOUT_COPY ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } - /* Remove the event from the list.*/ - ulResult = Oct6100ApiMixerEventRemove( f_pApiInstance, - pFirstChanEntry->usSoutCopyEventIndex, - cOCT6100_EVENT_TYPE_SOUT_COPY ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; /* Now remove the sout copy of the second channel.*/ @@ -11575,6 +11726,7 @@ UINT32 Oct6100ApiInvalidateBiDirChannelStructs( return ulResult; + return cOCT6100_ERR_OK; } @@ -11598,6 +11750,7 @@ f_usSecondChanIndex Index of the second channel used to create the bidir channe UINT32 Oct6100ApiReleaseBiDirChannelResources( IN tPOCT6100_INSTANCE_API f_pApiInstance, IN UINT16 f_usBiDirChanIndex, + IN UINT16 f_usFirstChanIndex, IN UINT16 f_usSecondChanIndex ) { @@ -11621,32 +11774,35 @@ UINT32 Oct6100ApiReleaseBiDirChannelResources( return cOCT6100_ERR_FATAL_AC; /* Release the Extra TSI memory and the SIN copy event if required.*/ - if ( pFirstChanEntry->usExtraSinTsiDependencyCnt == 1 ) + { - /* Release the two TSI chariot memory entries.*/ - ulResult = Oct6100ApiReleaseTsiMemEntry( f_pApiInstance, pFirstChanEntry->usExtraSinTsiMemIndex ); - if ( ulResult != cOCT6100_ERR_OK ) - return cOCT6100_ERR_FATAL_A3; + if ( pFirstChanEntry->usExtraSinTsiDependencyCnt == 1 ) + { + /* Release the two TSI chariot memory entries.*/ + ulResult = Oct6100ApiReleaseTsiMemEntry( f_pApiInstance, pFirstChanEntry->usExtraSinTsiMemIndex ); + if ( ulResult != cOCT6100_ERR_OK ) + return cOCT6100_ERR_FATAL_A3; - /* Relese the SIN copy event.*/ - ulResult = Oct6100ApiReleaseMixerEventEntry( f_pApiInstance, pFirstChanEntry->usSinCopyEventIndex ); - if ( ulResult != cOCT6100_ERR_OK ) - return cOCT6100_ERR_FATAL_A4; + /* Relese the SIN copy event.*/ + ulResult = Oct6100ApiReleaseMixerEventEntry( f_pApiInstance, pFirstChanEntry->usSinCopyEventIndex ); + if ( ulResult != cOCT6100_ERR_OK ) + return cOCT6100_ERR_FATAL_A4; - mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pTempEventEntry, pFirstChanEntry->usSinCopyEventIndex ); + mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pTempEventEntry, pFirstChanEntry->usSinCopyEventIndex ); - /* Invalidate the entry.*/ - pTempEventEntry->fReserved = FALSE; - pTempEventEntry->usEventType = cOCT6100_INVALID_EVENT; - pTempEventEntry->usNextEventPtr = cOCT6100_INVALID_INDEX; + /* Invalidate the entry.*/ + pTempEventEntry->fReserved = FALSE; + pTempEventEntry->usEventType = cOCT6100_INVALID_EVENT; + pTempEventEntry->usNextEventPtr = cOCT6100_INVALID_INDEX; - pFirstChanEntry->usExtraSinTsiDependencyCnt--; - pFirstChanEntry->usExtraSinTsiMemIndex = cOCT6100_INVALID_INDEX; - pFirstChanEntry->usSinCopyEventIndex = cOCT6100_INVALID_INDEX; - } - else - { - pFirstChanEntry->usExtraSinTsiDependencyCnt--; + pFirstChanEntry->usExtraSinTsiDependencyCnt--; + pFirstChanEntry->usExtraSinTsiMemIndex = cOCT6100_INVALID_INDEX; + pFirstChanEntry->usSinCopyEventIndex = cOCT6100_INVALID_INDEX; + } + else + { + pFirstChanEntry->usExtraSinTsiDependencyCnt--; + } } if ( pSecondChanEntry->usExtraSinTsiDependencyCnt == 1 ) @@ -11676,18 +11832,20 @@ UINT32 Oct6100ApiReleaseBiDirChannelResources( pSecondChanEntry->usExtraSinTsiDependencyCnt--; } - /* Release the SOUT copy event of the first channel.*/ - ulResult = Oct6100ApiReleaseMixerEventEntry( f_pApiInstance, pFirstChanEntry->usSoutCopyEventIndex ); - if ( ulResult != cOCT6100_ERR_OK ) - return cOCT6100_ERR_FATAL_A7; - mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pTempEventEntry, pSecondChanEntry->usSoutCopyEventIndex ); - /* Invalidate the entry.*/ - pTempEventEntry->fReserved = FALSE; - pTempEventEntry->usEventType = cOCT6100_INVALID_EVENT; - pTempEventEntry->usNextEventPtr = cOCT6100_INVALID_INDEX; + { + /* Release the SOUT copy event of the first channel.*/ + ulResult = Oct6100ApiReleaseMixerEventEntry( f_pApiInstance, pFirstChanEntry->usSoutCopyEventIndex ); + if ( ulResult != cOCT6100_ERR_OK ) + return cOCT6100_ERR_FATAL_A7; + + mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pTempEventEntry, pFirstChanEntry->usSoutCopyEventIndex ); + /* Invalidate the entry.*/ + pTempEventEntry->fReserved = FALSE; + pTempEventEntry->usEventType = cOCT6100_INVALID_EVENT; + pTempEventEntry->usNextEventPtr = cOCT6100_INVALID_INDEX; + } - /* Release the SOUT copy event of the second channel.*/ ulResult = Oct6100ApiReleaseMixerEventEntry( f_pApiInstance, pSecondChanEntry->usSoutCopyEventIndex ); if ( ulResult != cOCT6100_ERR_OK ) @@ -11713,6 +11871,7 @@ UINT32 Oct6100ApiReleaseBiDirChannelResources( /* Update the second channel's list entry. */ /* Mark the channel as closed. */ + pSecondChanEntry->usSoutCopyEventIndex = cOCT6100_INVALID_INDEX; pSecondChanEntry->fBiDirChannel = FALSE; @@ -12217,7 +12376,10 @@ UINT32 Oct6100ApiSetChannelLevelControl( || ( f_pVqeConfig->lSoutAutomaticLevelControlTargetDb != pChanEntry->VqeConfig.chSoutAutomaticLevelControlTargetDb ) || ( f_pVqeConfig->fSoutNaturalListenerEnhancement != pChanEntry->VqeConfig.fSoutNaturalListenerEnhancement ) || ( f_pVqeConfig->ulSoutAutomaticListenerEnhancementGainDb != pChanEntry->VqeConfig.bySoutAutomaticListenerEnhancementGainDb ) - || ( f_pVqeConfig->ulSoutNaturalListenerEnhancementGainDb != pChanEntry->VqeConfig.bySoutNaturalListenerEnhancementGainDb ) ) + || ( f_pVqeConfig->ulSoutNaturalListenerEnhancementGainDb != pChanEntry->VqeConfig.bySoutNaturalListenerEnhancementGainDb ) + || ( f_pVqeConfig->fResetRinAlcOnTones != pChanEntry->VqeConfig.fResetRinAlcOnTones ) + || ( f_pVqeConfig->fResetSoutAlcOnTones != pChanEntry->VqeConfig.fResetSoutAlcOnTones ) + || ( f_pVqeConfig->ulAlcNoiseBleedOutTime != pChanEntry->VqeConfig.usAlcNoiseBleedOutTime ) ) { /* Calculate base address for manual level control configuration. */ ulBaseAddress = cOCT6100_CHANNEL_ROOT_BASE + ( f_usEchoMemIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst; @@ -12331,6 +12493,49 @@ UINT32 Oct6100ApiSetChannelLevelControl( /* Calculate base address for auto level control + high level compensation configuration. */ ulBaseAddress = pSharedInfo->MemoryMap.ulChanMainMemBase + ( f_usEchoMemIndex * pSharedInfo->MemoryMap.ulChanMainMemSize ) + f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainIoMemOfst; + /* Configure the ALC bleed out time. */ + if ( pSharedInfo->ImageInfo.fAlcNoiseBleedOutTime == TRUE ) + { + ulFeatureBytesOffset = pSharedInfo->MemoryMap.AlcNoiseBleedOutTimeFieldOfst.usDwordOffset * 4; + ulFeatureBitOffset = pSharedInfo->MemoryMap.AlcNoiseBleedOutTimeFieldOfst.byBitOffset; + ulFeatureFieldLength = pSharedInfo->MemoryMap.AlcNoiseBleedOutTimeFieldOfst.byFieldSize; + + /* First read the DWORD where the field is located.*/ + mOCT6100_RETRIEVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulFeatureBytesOffset, + &ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + + /* Clear previous value set in the feature field.*/ + mOCT6100_CREATE_FEATURE_MASK( ulFeatureFieldLength, ulFeatureBitOffset, &ulMask ); + + ulTempData &= (~ulMask); + + if ( f_pVqeConfig->ulAlcNoiseBleedOutTime != 0 ) + { + /* Set ALC noise bleed out time. */ + usTempData = (UINT16)( f_pVqeConfig->ulAlcNoiseBleedOutTime / 250 ); + ulTempData |= ( usTempData << ulFeatureBitOffset ); + } + else /* if ( f_pVqeConfig->ulAlcNoiseBleedOutTime == 0 ) */ + { + /* Disable ALC noise bleed out. */ + ulTempData |= ( 0x0 << ulFeatureBitOffset ); + } + + /* Save the DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulFeatureBytesOffset, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } + /* Check which one is to be disabled first. */ if ( f_pVqeConfig->fRinAutomaticLevelControl == TRUE ) fDisableAlcFirst = FALSE; @@ -12480,6 +12685,88 @@ UINT32 Oct6100ApiSetChannelLevelControl( return ulResult; } + /* Set the reset Rin ALC on tones. */ + if ( pSharedInfo->ImageInfo.fResetRinAlcOnTones == TRUE ) + { + ulFeatureBytesOffset = pSharedInfo->MemoryMap.ResetRinAlcOnTonesFieldOfst.usDwordOffset * 4; + ulFeatureBitOffset = pSharedInfo->MemoryMap.ResetRinAlcOnTonesFieldOfst.byBitOffset; + ulFeatureFieldLength = pSharedInfo->MemoryMap.ResetRinAlcOnTonesFieldOfst.byFieldSize; + + /* First read the DWORD where the field is located.*/ + mOCT6100_RETRIEVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulFeatureBytesOffset, + &ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + + /* Clear previous value set in the feature field.*/ + mOCT6100_CREATE_FEATURE_MASK( ulFeatureFieldLength, ulFeatureBitOffset, &ulMask ); + + ulTempData &= (~ulMask); + + if ( f_pVqeConfig->fResetRinAlcOnTones == TRUE ) + { + ulTempData |= ( 1 << ulFeatureBitOffset ); + } + else /* if ( f_pVqeConfig->fResetRinAlcOnTones == FALSE ) */ + { + /* Disable ALC reset on tone detection. */ + ulTempData |= ( 0 << ulFeatureBitOffset ); + } + + /* Save the DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulFeatureBytesOffset, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } + + /* Set the reset Sout ALC on tones. */ + if ( pSharedInfo->ImageInfo.fResetSoutAlcOnTones == TRUE ) + { + ulFeatureBytesOffset = pSharedInfo->MemoryMap.ResetSoutAlcOnTonesFieldOfst.usDwordOffset * 4; + ulFeatureBitOffset = pSharedInfo->MemoryMap.ResetSoutAlcOnTonesFieldOfst.byBitOffset; + ulFeatureFieldLength = pSharedInfo->MemoryMap.ResetSoutAlcOnTonesFieldOfst.byFieldSize; + + /* First read the DWORD where the field is located.*/ + mOCT6100_RETRIEVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulFeatureBytesOffset, + &ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + + /* Clear previous value set in the feature field.*/ + mOCT6100_CREATE_FEATURE_MASK( ulFeatureFieldLength, ulFeatureBitOffset, &ulMask ); + + ulTempData &= (~ulMask); + + if ( f_pVqeConfig->fResetSoutAlcOnTones == TRUE ) + { + ulTempData |= ( 1 << ulFeatureBitOffset ); + } + else /* if ( f_pVqeConfig->fResetSoutAlcOnTones == FALSE ) */ + { + /* Disable ALC reset on tone detection. */ + ulTempData |= ( 0 << ulFeatureBitOffset ); + } + + /* Save the DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulFeatureBytesOffset, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } + /* Set the high level compensation threshold Db for the Sout port. */ if ( pSharedInfo->ImageInfo.fSoutHighLevelCompensation == TRUE ) { @@ -12516,7 +12803,9 @@ UINT32 Oct6100ApiSetChannelLevelControl( /* Check if have to clear the ALC-HLC status. */ if ( ( pSharedInfo->ImageInfo.fAlcHlcStatus == TRUE ) - && ( f_fClearAlcHlcStatusBit == TRUE ) ) + && ( ( f_fClearAlcHlcStatusBit == TRUE ) + + ) ) { ulFeatureBytesOffset = pSharedInfo->MemoryMap.AlcHlcStatusOfst.usDwordOffset * 4; ulFeatureBitOffset = pSharedInfo->MemoryMap.AlcHlcStatusOfst.byBitOffset; @@ -13177,6 +13466,91 @@ UINT32 Oct6100ApiAssertChannelUnMuteParams( return cOCT6100_ERR_OK; } + +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +Function: Oct6100ApiMuteSinWithFeatures + +Description: Mute or Unmute the sin with features port. + +------------------------------------------------------------------------------- +| Argument | Description +------------------------------------------------------------------------------- +f_pApiInstance Pointer to API instance. This memory is used to keep + the present state of the chip and all its resources. + +f_usChanIndex Resulting channel index where the muting should + be applied. +f_fEnableSinWithFeatures Whether to enable the feature or not. + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ +UINT32 Oct6100ApiMuteSinWithFeatures( + IN tPOCT6100_INSTANCE_API f_pApiInstance, + IN UINT16 f_usChanIndex, + IN BOOL f_fEnableSinWithFeatures ) +{ + tPOCT6100_SHARED_INFO pSharedInfo; + tPOCT6100_API_CHANNEL pChanEntry; + tOCT6100_WRITE_PARAMS WriteParams; + UINT32 ulResult; + + UINT32 ulTempData; + UINT32 ulBaseAddress; + UINT32 ulFeatureBytesOffset; + UINT32 ulFeatureBitOffset; + UINT32 ulFeatureFieldLength; + UINT32 ulMask; + + /* Get local pointer(s). */ + pSharedInfo = f_pApiInstance->pSharedInfo; + + WriteParams.pProcessContext = f_pApiInstance->pProcessContext; + + WriteParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId; + + /* Get a pointer to the channel's list entry. */ + mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pChanEntry, f_usChanIndex ) + + ulBaseAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pChanEntry->usEchoMemIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst; + + if ( pSharedInfo->ImageInfo.fSinMute == TRUE ) + { + ulFeatureBytesOffset = pSharedInfo->MemoryMap.SinMuteOfst.usDwordOffset * 4; + ulFeatureBitOffset = pSharedInfo->MemoryMap.SinMuteOfst.byBitOffset; + ulFeatureFieldLength = pSharedInfo->MemoryMap.SinMuteOfst.byFieldSize; + + mOCT6100_RETRIEVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulFeatureBytesOffset, + &ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + + /* Clear previous value set in the feature field.*/ + mOCT6100_CREATE_FEATURE_MASK( ulFeatureFieldLength, ulFeatureBitOffset, &ulMask ); + + /* Clear the mute flag. */ + ulTempData &= (~ulMask); + + /* Set the mute flag on the Sin port.*/ + if ( f_fEnableSinWithFeatures == TRUE ) + ulTempData |= ( 0x1 << ulFeatureBitOffset ); + + /* Write the new DWORD where the field is located. */ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulFeatureBytesOffset, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } + + return cOCT6100_ERR_OK; +} + + /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ Function: Oct6100ApiMuteChannelPorts @@ -13204,13 +13578,6 @@ UINT32 Oct6100ApiMuteChannelPorts( tPOCT6100_API_CHANNEL pChanEntry; tOCT6100_WRITE_PARAMS WriteParams; UINT32 ulResult; - - UINT32 ulTempData; - UINT32 ulBaseAddress; - UINT32 ulFeatureBytesOffset; - UINT32 ulFeatureBitOffset; - UINT32 ulFeatureFieldLength; - UINT32 ulMask; BOOL fDisableSinWithFeatures = FALSE; BOOL fEnableSinWithFeatures = FALSE; @@ -13390,41 +13757,9 @@ UINT32 Oct6100ApiMuteChannelPorts( /* Check if must enable or disable SIN mute with features. */ if ( fDisableSinWithFeatures == TRUE || fEnableSinWithFeatures == TRUE ) { - ulBaseAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pChanEntry->usEchoMemIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst; - - if ( pSharedInfo->ImageInfo.fSinMute == TRUE ) - { - ulFeatureBytesOffset = pSharedInfo->MemoryMap.SinMuteOfst.usDwordOffset * 4; - ulFeatureBitOffset = pSharedInfo->MemoryMap.SinMuteOfst.byBitOffset; - ulFeatureFieldLength = pSharedInfo->MemoryMap.SinMuteOfst.byFieldSize; - - mOCT6100_RETRIEVE_NLP_CONF_DWORD( f_pApiInstance, - pChanEntry, - ulBaseAddress + ulFeatureBytesOffset, - &ulTempData, - ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; - - /* Clear previous value set in the feature field.*/ - mOCT6100_CREATE_FEATURE_MASK( ulFeatureFieldLength, ulFeatureBitOffset, &ulMask ); - - /* Clear the mute flag. */ - ulTempData &= (~ulMask); - - /* Set the mute flag on the Sin port.*/ - if ( fEnableSinWithFeatures == TRUE ) - ulTempData |= ( 0x1 << ulFeatureBitOffset ); - - /* Write the new DWORD where the field is located. */ - mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, - pChanEntry, - ulBaseAddress + ulFeatureBytesOffset, - ulTempData, - ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; - } + ulResult = Oct6100ApiMuteSinWithFeatures( f_pApiInstance, f_usChanIndex, fEnableSinWithFeatures ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; } return cOCT6100_ERR_OK; diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c index 48987c0..59c05a1 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 305 $ +$Octasic_Revision: 308 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -1298,6 +1298,7 @@ UINT32 Oct6100ApiInitializeMiscellaneousVariables( pSharedInfo->ImageInfo.fNlpControl = FALSE; pSharedInfo->ImageInfo.fRinAutoLevelControl = FALSE; pSharedInfo->ImageInfo.fSoutAutoLevelControl = FALSE; + pSharedInfo->ImageInfo.fAlcNoiseBleedOutTime = FALSE; pSharedInfo->ImageInfo.fRinHighLevelCompensation = FALSE; pSharedInfo->ImageInfo.fSoutHighLevelCompensation = FALSE; pSharedInfo->ImageInfo.fAlcHlcStatus = FALSE; @@ -1343,6 +1344,8 @@ UINT32 Oct6100ApiInitializeMiscellaneousVariables( pSharedInfo->ImageInfo.fIdleCodeDetection = TRUE; pSharedInfo->ImageInfo.fIdleCodeDetectionConfiguration = FALSE; pSharedInfo->ImageInfo.fSinLevel = TRUE; + pSharedInfo->ImageInfo.fResetRinAlcOnTones = FALSE; + pSharedInfo->ImageInfo.fResetSoutAlcOnTones = FALSE; pSharedInfo->ImageInfo.usMaxNumberOfChannels = 0; pSharedInfo->ImageInfo.ulToneProfileNumber = cOCT6100_INVALID_VALUE; @@ -2922,6 +2925,9 @@ UINT32 Oct6100ApiBootSdram( default: return cOCT6100_ERR_FATAL_16; } + + usWriteData230 |= 0x0002; + WriteParams.ulWriteAddress = 0x230; WriteParams.usWriteData = usWriteData230; diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c index 5b606d8..e116d65 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 85 $ +$Octasic_Revision: 87 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -211,6 +211,8 @@ UINT32 Oct6100ChipGetImageInfoDef( f_pChipImageInfo->fDoubleTalkBehavior = FALSE; f_pChipImageInfo->fIdleCodeDetection = TRUE; f_pChipImageInfo->fSinLevel = TRUE; + f_pChipImageInfo->fResetAlcOnTones = FALSE; + f_pChipImageInfo->fAlcNoiseBleedOutTime = FALSE; for ( i = 0; i < cOCT6100_MAX_TONE_EVENT; i++ ) { @@ -264,11 +266,18 @@ UINT32 Oct6100ChipGetImageInfo( f_pChipImageInfo->fIdleCodeDetection = pImageInfo->fIdleCodeDetection; f_pChipImageInfo->fSinLevel = pImageInfo->fSinLevel; f_pChipImageInfo->fDoubleTalkBehavior = pImageInfo->fDoubleTalkBehavior; + f_pChipImageInfo->fHighLevelCompensation = pImageInfo->fRinHighLevelCompensation; + f_pChipImageInfo->fAlcNoiseBleedOutTime = pImageInfo->fAlcNoiseBleedOutTime; + if ( ( pImageInfo->fRinAutoLevelControl == TRUE ) && ( pImageInfo->fSoutAutoLevelControl == TRUE ) ) f_pChipImageInfo->fAutoLevelControl = TRUE; else f_pChipImageInfo->fAutoLevelControl = FALSE; - f_pChipImageInfo->fHighLevelCompensation = pImageInfo->fRinHighLevelCompensation; + + if ( ( pImageInfo->fResetRinAlcOnTones == TRUE ) || ( pImageInfo->fResetSoutAlcOnTones == TRUE ) ) + f_pChipImageInfo->fResetAlcOnTones = TRUE; + else + f_pChipImageInfo->fResetAlcOnTones = FALSE; f_pChipImageInfo->ulMaxChannels = pImageInfo->usMaxNumberOfChannels; f_pChipImageInfo->ulNumTonesAvailable = pImageInfo->byNumToneDetectors; diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c index 43e57c8..cbfe131 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 145 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c index 3573cc0..cc40588 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 58 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c index 6a672cf..6d6f1dc 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c @@ -3,7 +3,7 @@ File: oct6100_events.c - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 79 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c index c96ebcc..21bec84 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 71 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c index b2690b1..6848f31 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 42 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c index 30034c5..9db15cb 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 34 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c index 680bf7e..fc5cec1 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $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 bf70f31..c6297ac 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 42 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c index c815095..2d359d5 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $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 89d1cd0..77e32bd 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 35 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c index 759fc7d..e973b42 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 109 $ +$Octasic_Revision: 111 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -1899,6 +1899,54 @@ UINT32 Oct6100ApiInterpretTlvEntry( break; + case cOCT6100_TLV_TYPE_RESET_RIN_ALC_ON_TONES_BOFF: + + ulResult = Oct6100ApiTlvCheckLengthField( f_ulTlvFieldLength, + cOCT6100_TLV_MIN_LENGTH_RESET_RIN_ALC_ON_TONES_BOFF, + cOCT6100_TLV_MAX_LENGTH_RESET_RIN_ALC_ON_TONES_BOFF ); + if ( ulResult == cOCT6100_ERR_OK ) + { + ulResult = Oct6100ApiTlvReadBitOffsetStruct( f_pApiInstance, + f_ulTlvValueAddress, + &f_pApiInstance->pSharedInfo->MemoryMap.ResetRinAlcOnTonesFieldOfst ); + + f_pApiInstance->pSharedInfo->ImageInfo.fResetRinAlcOnTones = TRUE; + } + + break; + + case cOCT6100_TLV_TYPE_RESET_SOUT_ALC_ON_TONES_BOFF: + + ulResult = Oct6100ApiTlvCheckLengthField( f_ulTlvFieldLength, + cOCT6100_TLV_MIN_LENGTH_RESET_SOUT_ALC_ON_TONES_BOFF, + cOCT6100_TLV_MAX_LENGTH_RESET_SOUT_ALC_ON_TONES_BOFF ); + if ( ulResult == cOCT6100_ERR_OK ) + { + ulResult = Oct6100ApiTlvReadBitOffsetStruct( f_pApiInstance, + f_ulTlvValueAddress, + &f_pApiInstance->pSharedInfo->MemoryMap.ResetSoutAlcOnTonesFieldOfst ); + + f_pApiInstance->pSharedInfo->ImageInfo.fResetSoutAlcOnTones = TRUE; + } + + break; + + case cOCT6100_TLV_TYPE_ALC_NOISE_BLEED_OUT_TIME_BOFF: + + ulResult = Oct6100ApiTlvCheckLengthField( f_ulTlvFieldLength, + cOCT6100_TLV_MIN_LENGTH_ALC_NOISE_BLEED_OUT_TIME_BOFF, + cOCT6100_TLV_MAX_LENGTH_ALC_NOISE_BLEED_OUT_TIME_BOFF ); + if ( ulResult == cOCT6100_ERR_OK ) + { + ulResult = Oct6100ApiTlvReadBitOffsetStruct( f_pApiInstance, + f_ulTlvValueAddress, + &f_pApiInstance->pSharedInfo->MemoryMap.AlcNoiseBleedOutTimeFieldOfst ); + + f_pApiInstance->pSharedInfo->ImageInfo.fAlcNoiseBleedOutTime = TRUE; + } + + break; + default: /* Unknown TLV type field... check default length and nothing else. */ ulResult = Oct6100ApiTlvCheckLengthField( f_ulTlvFieldLength, diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c index fdcfd7a..85a37fc 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $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 f4887ce..8d28d6f 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 37 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c index 8804874..74072b6 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 39 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c index 24f99f9..0b33933 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 27 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c index 38caff4..e01b102 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 7 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h b/software/octdeviceapi/oct6100api/oct6100_channel_priv.h index 4ec209c..cdd025d 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 59 $ +$Octasic_Revision: 61 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -387,10 +387,13 @@ UINT32 Oct6100ApiCheckChannelCreateBiDirParams( OUT PUINT16 f_pusFirstChanSinCopyEventIndex, OUT PUINT16 f_pusSecondChanIndex, OUT PUINT16 f_pusSecondChanExtraTsiIndex, - OUT PUINT16 f_pusSecondChanSinCopyEventIndex ); + OUT PUINT16 f_pusSecondChanSinCopyEventIndex + + ); UINT32 Oct6100ApiReserveChannelCreateBiDirResources( IN OUT tPOCT6100_INSTANCE_API f_pApiInstance, + OUT PUINT16 f_pusBiDirChanIndex, IN OUT PUINT16 f_pusFirstChanExtraTsiIndex, IN OUT PUINT16 f_pusFirstChanSinCopyEventIndex, @@ -401,6 +404,7 @@ UINT32 Oct6100ApiReserveChannelCreateBiDirResources( UINT32 Oct6100ApiWriteChannelCreateBiDirStructs( IN OUT tPOCT6100_INSTANCE_API f_pApiInstance, + IN UINT16 f_usFirstChanIndex, IN UINT16 f_usFirstChanExtraTsiIndex, IN UINT16 f_usFirstChanSinCopyEventIndex, @@ -431,17 +435,20 @@ UINT32 Oct6100ApiAssertDestroyBiDirChanParams( IN OUT tPOCT6100_INSTANCE_API f_pApiInstance, IN tPOCT6100_CHANNEL_DESTROY_BIDIR f_pChannelDestroyBiDir, IN OUT PUINT16 f_pusBiDirChanIndex, + IN OUT PUINT16 f_pusFirstChanIndex, IN OUT PUINT16 f_pusSecondChanIndex ); UINT32 Oct6100ApiInvalidateBiDirChannelStructs( IN OUT tPOCT6100_INSTANCE_API f_pApiInstance, + IN UINT16 f_usFirstChanIndex, IN UINT16 f_usSecondChanIndex ); UINT32 Oct6100ApiReleaseBiDirChannelResources( IN OUT tPOCT6100_INSTANCE_API f_pApiInstance, IN UINT16 f_usBiDirChanIndex, + IN UINT16 f_usFirstChanIndex, IN UINT16 f_usSecondChanIndex ); @@ -499,6 +506,11 @@ UINT32 Oct6100ApiAssertChannelUnMuteParams( OUT PUINT16 f_pusChanIndex, OUT PUINT16 f_pusPorts ); +UINT32 Oct6100ApiMuteSinWithFeatures( + IN tPOCT6100_INSTANCE_API f_pApiInstance, + IN UINT16 f_usChanIndex, + IN BOOL f_fEnableSinWithFeatures ); + UINT32 Oct6100ApiMuteChannelPorts( IN OUT tPOCT6100_INSTANCE_API f_pApiInstance, IN UINT16 f_usChanIndex, diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h index 90c6841..1d9fd50 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 56 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h index 058aa8f..d1b66dc 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 8 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h index 11506c2..1cb647a 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 29 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_debug_priv.h index a00e6d2..e611a6d 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 12 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_events_priv.h b/software/octdeviceapi/oct6100api/oct6100_events_priv.h index a11b35c..7263bdc 100644 --- a/software/octdeviceapi/oct6100api/oct6100_events_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_events_priv.h @@ -3,7 +3,7 @@ File: oct6100_events_priv.h - Copyright (c) 2001-2005 Octasic Inc. + Copyright (c) 2001-2006 Octasic Inc. Description: @@ -26,7 +26,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-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 12 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h b/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h index 8458c03..958de37 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 8 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h index cd68107..8fb408f 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 16 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h b/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h index d511674..4954fe1 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 20 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h index efc4b39..7c113e8 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 17 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h index 37e9135..8be64d4 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 10 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h index 4a11874..8fa5bc4 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 21 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h index c6a42a0..0daf6ca 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 12 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h b/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h index 21534df..6e4c528 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 54 $ +$Octasic_Revision: 56 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -192,6 +192,10 @@ $Octasic_Revision: 54 $ #define cOCT6100_TLV_TYPE_NLP_STATISTICS 138 +#define cOCT6100_TLV_TYPE_ALC_NOISE_BLEED_OUT_TIME_BOFF 143 +#define cOCT6100_TLV_TYPE_RESET_RIN_ALC_ON_TONES_BOFF 144 +#define cOCT6100_TLV_TYPE_RESET_SOUT_ALC_ON_TONES_BOFF 145 + #define cOCT6100_TLV_TYPE_ADPCM_ENABLE 150 #define cOCT6100_TLV_TYPE_NUM_TONE_DETECTOR 151 #define cOCT6100_TLV_TYPE_CONFERENCING_ENABLE 152 @@ -413,6 +417,14 @@ $Octasic_Revision: 54 $ #define cOCT6100_TLV_MIN_LENGTH_IDLE_CODE_DETECTION_BOFF 8 #define cOCT6100_TLV_MAX_LENGTH_IDLE_CODE_DETECTION_BOFF 8 +#define cOCT6100_TLV_MIN_LENGTH_ALC_NOISE_BLEED_OUT_TIME_BOFF 8 +#define cOCT6100_TLV_MAX_LENGTH_ALC_NOISE_BLEED_OUT_TIME_BOFF 8 + +#define cOCT6100_TLV_MIN_LENGTH_RESET_RIN_ALC_ON_TONES_BOFF 8 +#define cOCT6100_TLV_MAX_LENGTH_RESET_RIN_ALC_ON_TONES_BOFF 8 +#define cOCT6100_TLV_MIN_LENGTH_RESET_SOUT_ALC_ON_TONES_BOFF 8 +#define cOCT6100_TLV_MAX_LENGTH_RESET_SOUT_ALC_ON_TONES_BOFF 8 + #define cOCT6100_TLV_MIN_LENGTH_DEBUG_CHAN_INDEX_VALUE 4 #define cOCT6100_TLV_MAX_LENGTH_DEBUG_CHAN_INDEX_VALUE 4 #define cOCT6100_TLV_MIN_LENGTH_ADPCM_ENABLE 4 diff --git a/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h b/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h index 5c2ef94..22ca8f9 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 13 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h index 0274c7a..c105553 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 12 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h index 57b323f..c5f6d68 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ $Octasic_Revision: 13 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_version.h b/software/octdeviceapi/oct6100api/oct6100_version.h index 31db16e..400d35f 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-2005 Octasic Inc. + Copyright (c) 2001-2006 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.00-PR38 $ +$Octasic_Release: OCT612xAPI-01.00-PR39 $ -$Octasic_Revision: 39 $ +$Octasic_Revision: 42 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -34,6 +34,6 @@ $Octasic_Revision: 39 $ /* String version of the OCT6100 API.*/ -#define cOCT6100_API_VERSION "OCT6100API-01.00-PR38" +#define cOCT6100_API_VERSION "OCT6100API-01.00-PR39" #endif /* __OCT6100_VERSION_H__ */ |