From ef7d0400b4b0ea8ad3bf8e3133c3fe5d9cb39fa7 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 18 Jan 2007 21:06:01 +0000
Subject: update to PR47, and update test application to use GetCapacityPins

git-svn-id: http://svn.asterisk.org/svn/octasic_api/oct612x/trunk@23 537310ab-6354-42db-a3cc-247b777f7be6
---
 .../oct6100api/oct6100_adpcm_chan_priv.h           |   4 +-
 .../oct6100api/oct6100_api/oct6100_adpcm_chan.c    |   4 +-
 .../oct6100api/oct6100_api/oct6100_channel.c       |  92 ++-
 .../oct6100api/oct6100_api/oct6100_chip_open.c     | 714 +++++++++++++++++++--
 .../oct6100api/oct6100_api/oct6100_chip_stats.c    |   6 +-
 .../oct6100api/oct6100_api/oct6100_conf_bridge.c   |   2 +-
 .../oct6100api/oct6100_api/oct6100_debug.c         |   2 +-
 .../oct6100api/oct6100_api/oct6100_events.c        |   7 +-
 .../oct6100api/oct6100_api/oct6100_interrupts.c    |   6 +-
 .../oct6100api/oct6100_api/oct6100_memory.c        |   2 +-
 .../oct6100api/oct6100_api/oct6100_miscellaneous.c |   2 +-
 .../oct6100api/oct6100_api/oct6100_mixer.c         |   2 +-
 .../oct6100api/oct6100_api/oct6100_phasing_tsst.c  |   5 +-
 .../oct6100api/oct6100_api/oct6100_playout_buf.c   |   2 +-
 .../oct6100api/oct6100_api/oct6100_remote_debug.c  |   2 +-
 .../oct6100api/oct6100_api/oct6100_tlv.c           |  18 +-
 .../oct6100_api/oct6100_tone_detection.c           |  23 +-
 .../oct6100api/oct6100_api/oct6100_tsi_cnct.c      |   4 +-
 .../oct6100api/oct6100_api/oct6100_tsst.c          |   2 +-
 .../oct6100api/oct6100_api/oct6100_user.c          |   4 +-
 .../oct6100_apimi/oct6100_mask_interrupts.c        |   4 +-
 .../octdeviceapi/oct6100api/oct6100_channel_priv.h |   2 +-
 .../oct6100api/oct6100_chip_open_priv.h            |  20 +-
 .../oct6100api/oct6100_chip_stats_priv.h           |   2 +-
 .../oct6100api/oct6100_conf_bridge_priv.h          |   2 +-
 .../octdeviceapi/oct6100api/oct6100_debug_priv.h   |   2 +-
 .../octdeviceapi/oct6100api/oct6100_events_priv.h  |   6 +-
 .../oct6100api/oct6100_interrupts_priv.h           |   4 +-
 .../octdeviceapi/oct6100api/oct6100_memory_priv.h  |   2 +-
 .../oct6100api/oct6100_miscellaneous_priv.h        |   2 +-
 .../octdeviceapi/oct6100api/oct6100_mixer_priv.h   |   2 +-
 .../oct6100api/oct6100_phasing_tsst_priv.h         |   6 +-
 .../oct6100api/oct6100_playout_buf_priv.h          |   2 +-
 .../oct6100api/oct6100_remote_debug_priv.h         |   2 +-
 .../octdeviceapi/oct6100api/oct6100_tlv_priv.h     |   9 +-
 .../oct6100api/oct6100_tone_detection_priv.h       |   2 +-
 .../oct6100api/oct6100_tsi_cnct_priv.h             |   4 +-
 .../octdeviceapi/oct6100api/oct6100_tsst_priv.h    |   2 +-
 software/octdeviceapi/oct6100api/oct6100_version.h |   6 +-
 39 files changed, 859 insertions(+), 125 deletions(-)

(limited to 'software/octdeviceapi')

diff --git a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h
index fb9a5d4..65df05b 100644
--- a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 6 $
+$Octasic_Revision: 7 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
index b059be0..6abeda3 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 15 $
+$Octasic_Revision: 16 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
index f1bb058..43bb1ed 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
@@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 469 $
+$Octasic_Revision: 480 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -147,6 +147,7 @@ UINT32 Oct6100ChannelOpenDef(
 	f_pChannelOpen->VqeConfig.ulSoutNaturalListenerEnhancementGainDb = 0;
 	f_pChannelOpen->VqeConfig.fSoutNaturalListenerEnhancement = FALSE;
 	f_pChannelOpen->VqeConfig.fRoutNoiseReduction = FALSE;
+	f_pChannelOpen->VqeConfig.lRoutNoiseReductionLevelGainDb = -18;
 	f_pChannelOpen->VqeConfig.lAnrSnrEnhancementDb = -18;
 	f_pChannelOpen->VqeConfig.ulAnrVoiceNoiseSegregation = 6;
 	f_pChannelOpen->VqeConfig.ulToneDisablerVqeActivationDelay = 300;
@@ -381,6 +382,7 @@ UINT32 Oct6100ChannelModifyDef(
 	f_pChannelModify->VqeConfig.ulSoutNaturalListenerEnhancementGainDb = cOCT6100_KEEP_PREVIOUS_SETTING;
 	f_pChannelModify->VqeConfig.fSoutNaturalListenerEnhancement = cOCT6100_KEEP_PREVIOUS_SETTING;
 	f_pChannelModify->VqeConfig.fRoutNoiseReduction = cOCT6100_KEEP_PREVIOUS_SETTING;
+	f_pChannelModify->VqeConfig.lRoutNoiseReductionLevelGainDb = cOCT6100_KEEP_PREVIOUS_SETTING;
 	f_pChannelModify->VqeConfig.lAnrSnrEnhancementDb = cOCT6100_KEEP_PREVIOUS_SETTING;
 	f_pChannelModify->VqeConfig.ulAnrVoiceNoiseSegregation = cOCT6100_KEEP_PREVIOUS_SETTING;
 	f_pChannelModify->VqeConfig.ulToneDisablerVqeActivationDelay = cOCT6100_KEEP_PREVIOUS_SETTING;
@@ -861,6 +863,7 @@ UINT32 Oct6100ChannelGetStatsDef(
 	f_pChannelStats->VqeConfig.ulSoutNaturalListenerEnhancementGainDb = cOCT6100_INVALID_STAT;
 	f_pChannelStats->VqeConfig.fSoutNaturalListenerEnhancement = FALSE;
 	f_pChannelStats->VqeConfig.fRoutNoiseReduction = FALSE;
+	f_pChannelStats->VqeConfig.lRoutNoiseReductionLevelGainDb = cOCT6100_INVALID_SIGNED_STAT;
 	f_pChannelStats->VqeConfig.lAnrSnrEnhancementDb = cOCT6100_INVALID_SIGNED_STAT;
 	f_pChannelStats->VqeConfig.ulAnrVoiceNoiseSegregation = cOCT6100_INVALID_STAT;
 	f_pChannelStats->VqeConfig.ulToneDisablerVqeActivationDelay = cOCT6100_INVALID_STAT;
@@ -2581,6 +2584,7 @@ UINT32 Oct6100ApiUpdateChannelEntry(
 	pChanEntry->VqeConfig.bySoutNaturalListenerEnhancementGainDb = (UINT8)( pVqeConfig->ulSoutNaturalListenerEnhancementGainDb & 0xFF );
 	pChanEntry->VqeConfig.fSoutNaturalListenerEnhancement = (UINT8)( pVqeConfig->fSoutNaturalListenerEnhancement & 0xFF );
 	pChanEntry->VqeConfig.fRoutNoiseReduction = (UINT8)( pVqeConfig->fRoutNoiseReduction & 0xFF );
+	pChanEntry->VqeConfig.chRoutNoiseReductionLevelGainDb = (OCT_INT8) (pVqeConfig->lRoutNoiseReductionLevelGainDb & 0xFF);
 	pChanEntry->VqeConfig.fEnableMusicProtection = (UINT8)( pVqeConfig->fEnableMusicProtection & 0xFF );
 	pChanEntry->VqeConfig.fIdleCodeDetection = (UINT8)( pVqeConfig->fIdleCodeDetection & 0xFF );
 	pChanEntry->VqeConfig.fResetRinAlcOnTones = (UINT8)( pVqeConfig->fResetRinAlcOnTones & 0xFF );
@@ -5862,6 +5866,7 @@ UINT32 Oct6100ApiModifyChannelEntry(
 		pApiVqeConf->bySoutNaturalListenerEnhancementGainDb		= (UINT8)( f_pChannelOpen->VqeConfig.ulSoutNaturalListenerEnhancementGainDb & 0xFF );
 		pApiVqeConf->fSoutNaturalListenerEnhancement			= (UINT8)( f_pChannelOpen->VqeConfig.fSoutNaturalListenerEnhancement & 0xFF );
 		pApiVqeConf->fRoutNoiseReduction						= (UINT8)( f_pChannelOpen->VqeConfig.fRoutNoiseReduction & 0xFF );
+		pApiVqeConf->chRoutNoiseReductionLevelGainDb			= (OCT_INT8)( f_pChannelOpen->VqeConfig.lRoutNoiseReductionLevelGainDb & 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 );
@@ -6943,6 +6948,7 @@ UINT32 Oct6100ApiChannelGetStatsSer(
 	f_pChannelStats->VqeConfig.ulSoutNaturalListenerEnhancementGainDb	= pChanEntry->VqeConfig.bySoutNaturalListenerEnhancementGainDb;
 	f_pChannelStats->VqeConfig.fSoutNaturalListenerEnhancement			= pChanEntry->VqeConfig.fSoutNaturalListenerEnhancement;
 	f_pChannelStats->VqeConfig.fRoutNoiseReduction						= pChanEntry->VqeConfig.fRoutNoiseReduction;
+	f_pChannelStats->VqeConfig.lRoutNoiseReductionLevelGainDb			= pChanEntry->VqeConfig.chRoutNoiseReductionLevelGainDb;
 	f_pChannelStats->VqeConfig.fEnableMusicProtection					= pChanEntry->VqeConfig.fEnableMusicProtection;
 	f_pChannelStats->VqeConfig.fIdleCodeDetection						= pChanEntry->VqeConfig.fIdleCodeDetection;
 	f_pChannelStats->VqeConfig.fResetRinAlcOnTones						= pChanEntry->VqeConfig.fResetRinAlcOnTones;
@@ -8060,6 +8066,21 @@ UINT32 Oct6100ApiCheckVqeConfig(
 	if ( f_pVqeConfig->fRoutNoiseReduction == TRUE && pImageInfo->fRoutNoiseReduction == FALSE )
 		return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ROUT_NR;
 
+	/* Validate Rout noise reduction Level. */
+	if ( f_pVqeConfig->fRoutNoiseReduction == TRUE )
+	{
+		/*Check if noise reduction level gain is supported*/
+		if ( ( pImageInfo->fRoutNoiseReductionLevel == FALSE ) && ( f_pVqeConfig->lRoutNoiseReductionLevelGainDb != -18 ) )
+			 return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ROUT_NOISE_REDUCTION_GAIN;
+		
+		if ( ( f_pVqeConfig->lRoutNoiseReductionLevelGainDb != 0 ) && 
+			( f_pVqeConfig->lRoutNoiseReductionLevelGainDb != -6 ) && 
+			( f_pVqeConfig->lRoutNoiseReductionLevelGainDb != -12 ) &&
+			( f_pVqeConfig->lRoutNoiseReductionLevelGainDb != -18 ) )
+		
+			return cOCT6100_ERR_CHANNEL_ROUT_NOISE_REDUCTION_GAIN;
+	}
+
 	/* Check if ANR SNRE is supported. */
 	if ( ( f_pVqeConfig->lAnrSnrEnhancementDb != -18 ) && ( pImageInfo->fAnrSnrEnhancement == FALSE ) )
 		return cOCT6100_ERR_NOT_SUPPORTED_CHANNEL_ANR_SNR_ENHANCEMENT;
@@ -8912,6 +8933,60 @@ UINT32 Oct6100ApiWriteVqeNlpMemory(
 				return ulResult;	
 		}
 	}
+	if (pSharedInfo->ImageInfo.fRoutNoiseReductionLevel == TRUE)
+	{
+		/* Check if the configuration has been changed. */
+		if ( ( f_fModifyOnly == FALSE )
+			|| ( ( f_fModifyOnly == TRUE ) 
+				&& ( f_pVqeConfig->lRoutNoiseReductionLevelGainDb != pChanEntry->VqeConfig.chRoutNoiseReductionLevelGainDb ) ) )
+		{
+			ulFeatureBytesOffset = pSharedInfo->MemoryMap.RinAnrValOfst.usDwordOffset * 4;
+			ulFeatureBitOffset	 = pSharedInfo->MemoryMap.RinAnrValOfst.byBitOffset;
+			ulFeatureFieldLength = pSharedInfo->MemoryMap.RinAnrValOfst.byFieldSize;
+
+			mOCT6100_RETRIEVE_NLP_CONF_DWORD(	f_pApiInstance,
+												pChanEntry,
+												ulNlpConfigBaseAddress + 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->fRoutNoiseReduction == TRUE)
+			{
+				switch( f_pVqeConfig->lRoutNoiseReductionLevelGainDb)
+				{
+				case  0:	ulTempData |= ( 0 << ulFeatureBitOffset );
+					break;
+				case -6:	ulTempData |= ( 1 << ulFeatureBitOffset );
+					break;
+				case -12:	ulTempData |= ( 2 << ulFeatureBitOffset );
+					break;
+				case -18:	ulTempData |= ( 3 << ulFeatureBitOffset );
+					break;
+				default:	ulTempData |= ( 0 << ulFeatureBitOffset );
+					break;
+				}
+			}
+			else 
+				ulTempData |= ( 0 << ulFeatureBitOffset );
+
+			/* Write the new DWORD where the field is located. */
+			mOCT6100_SAVE_NLP_CONF_DWORD(	f_pApiInstance,
+											pChanEntry,
+											ulNlpConfigBaseAddress + ulFeatureBytesOffset,
+											ulTempData,
+											ulResult );
+			if ( ulResult != cOCT6100_ERR_OK )
+				return ulResult;	
+		}
+
+	}
 
 	/* Configure Sout ANR SNR enhancement. */
 	if ( pSharedInfo->ImageInfo.fAnrSnrEnhancement == TRUE )
@@ -9494,6 +9569,14 @@ UINT32 Oct6100ApiWriteVqeNlpMemory(
 			mOCT6100_CREATE_FEATURE_MASK( ulFeatureFieldLength, ulFeatureBitOffset, &ulMask );
 
 			ulTempData &= (~ulMask);
+			
+			/*If we support ANR level the TLV is shared over 2 bits*/
+			if (pSharedInfo->ImageInfo.fRoutNoiseReductionLevel == TRUE)
+			{
+				ulFeatureBitOffset -= 2;
+				ausLookupTable[ f_pVqeConfig->ulNonLinearityBehaviorA ] &= 0xFFFC;
+			}
+
 			if ( ( f_pChannelOpen->ulEchoOperationMode == cOCT6100_ECHO_OP_MODE_NO_ECHO )
 				|| ( f_pChannelOpen->ulEchoOperationMode == cOCT6100_ECHO_OP_MODE_SPEECH_RECOGNITION ) )
 				ulTempData |= ( 0x0 << ulFeatureBitOffset );
@@ -10623,6 +10706,11 @@ UINT32 Oct6100ApiUpdateOpenStruct(
 	else
 		f_pChanOpen->VqeConfig.fRoutNoiseReduction = f_pChanModify->VqeConfig.fRoutNoiseReduction;
 
+	if ( f_pChanModify->VqeConfig.lRoutNoiseReductionLevelGainDb == cOCT6100_KEEP_PREVIOUS_SETTING )
+		f_pChanOpen->VqeConfig.lRoutNoiseReductionLevelGainDb = f_pChanEntry->VqeConfig.chRoutNoiseReductionLevelGainDb;
+	else
+		f_pChanOpen->VqeConfig.lRoutNoiseReductionLevelGainDb = f_pChanModify->VqeConfig.lRoutNoiseReductionLevelGainDb;
+
 
 	if ( f_pChanModify->VqeConfig.lAnrSnrEnhancementDb == cOCT6100_KEEP_PREVIOUS_SETTING )
 		f_pChanOpen->VqeConfig.lAnrSnrEnhancementDb = f_pChanEntry->VqeConfig.chAnrSnrEnhancementDb;
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index 54727d2..3f4baed 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 312 $
+$Octasic_Revision: 336 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -241,6 +241,7 @@ UINT32 Oct6100ChipOpenDef(
 
 	f_pChipOpen->fEnableChannelRecording = FALSE;
 	f_pChipOpen->fEnableProductionBist = FALSE;
+	f_pChipOpen->ulProductionBistMode = cOCT6100_PRODUCTION_BIST_STANDARD;
 	f_pChipOpen->ulNumProductionBistLoops = 1;
 
 	return cOCT6100_ERR_OK;
@@ -293,7 +294,6 @@ UINT32 Oct6100ChipOpen(
 		/* Save the process context specified by the user. */
 		f_pApiInstance->pProcessContext = f_pChipOpen->pProcessContext;
 
-
 		/* Create serialization object handles. */
 		ulResult = Oct6100ApiCreateSerializeObjects( f_pApiInstance, f_pChipOpen->ulUserChipId );
 		if ( ulResult != cOCT6100_ERR_OK )
@@ -863,9 +863,177 @@ UINT32 Oct6100ApiGetVersion(
 }
 #endif
 
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+Function:		Oct6100ApiGetCapacityPins
+
+Description:    Retrieves the Capcity Pins value.
+
+-------------------------------------------------------------------------------
+|	Argument		|	Description
+-------------------------------------------------------------------------------
+
+f_pGetCapacityPins	 Pointer to the parameters structure needed
+					 by GetCapacityPins().
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+#if !SKIP_Oct6100ApiGetCapacityPinsDef
+UINT32 Oct6100ApiGetCapacityPinsDef(
+				tPOCT6100_API_GET_CAPACITY_PINS			f_pGetCapacityPins)
+{
+
+	f_pGetCapacityPins->pProcessContext = NULL;
+	f_pGetCapacityPins->ulUserChipId = 0;
+	f_pGetCapacityPins->ulMemoryType = cOCT6100_MEM_TYPE_DDR;
+	f_pGetCapacityPins->ulCapacityValue = cOCT6100_INVALID_VALUE;
+	f_pGetCapacityPins->fEnableMemClkOut = TRUE;
+	f_pGetCapacityPins->ulMemClkFreq = 133000000;
+	
+	return cOCT6100_ERR_OK;
+}
+#endif
+
+#if !SKIP_Oct6100ApiGetCapacityPins
+UINT32 Oct6100ApiGetCapacityPins(
+				tPOCT6100_API_GET_CAPACITY_PINS		f_pGetCapacityPins  )
+{
+
+	UINT32					ulResult;
+
+	tOCT6100_INSTANCE_API	ApiInstance;
+	
+	Oct6100UserMemSet(&ApiInstance,0,sizeof(tOCT6100_INSTANCE_API));
+
+	/*Check parameters*/
+	if ( f_pGetCapacityPins->ulMemClkFreq != cOCT6100_MCLK_FREQ_133_MHZ &&
+		 f_pGetCapacityPins->ulMemClkFreq != cOCT6100_MCLK_FREQ_125_MHZ &&
+		 f_pGetCapacityPins->ulMemClkFreq != cOCT6100_MCLK_FREQ_117_MHZ &&
+		 f_pGetCapacityPins->ulMemClkFreq != cOCT6100_MCLK_FREQ_108_MHZ &&
+		 f_pGetCapacityPins->ulMemClkFreq != cOCT6100_MCLK_FREQ_100_MHZ &&
+		 f_pGetCapacityPins->ulMemClkFreq != cOCT6100_MCLK_FREQ_92_MHZ &&
+		 f_pGetCapacityPins->ulMemClkFreq != cOCT6100_MCLK_FREQ_83_MHZ &&
+		 f_pGetCapacityPins->ulMemClkFreq != cOCT6100_MCLK_FREQ_75_MHZ )
+		return cOCT6100_ERR_OPEN_MEM_CLK_FREQ;
+
+	if ( f_pGetCapacityPins->fEnableMemClkOut != TRUE &&
+		 f_pGetCapacityPins->fEnableMemClkOut != FALSE )
+		return cOCT6100_ERR_OPEN_ENABLE_MEM_CLK_OUT;
+
+	if ( f_pGetCapacityPins->ulMemoryType != cOCT6100_MEM_TYPE_SDR &&
+		 f_pGetCapacityPins->ulMemoryType != cOCT6100_MEM_TYPE_DDR &&
+		 f_pGetCapacityPins->ulMemoryType != cOCT6100_MEM_TYPE_SDR_PLL_BYPASS )
+		return cOCT6100_ERR_OPEN_MEMORY_TYPE;
+	
+
+	
+	ApiInstance.pProcessContext = f_pGetCapacityPins->pProcessContext;
+
+
+
+	ulResult = Oct6100ApiReadCapacity(&ApiInstance, f_pGetCapacityPins);
+	
+
+	
+	return ulResult;
+}
+#endif
 
 /***************************  PRIVATE FUNCTIONS  *****************************/
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+Function:		Oct6100ApiReadCapacity
+
+Description:    Read the capacity pins using modified functions from the openchip.
+
+-------------------------------------------------------------------------------
+|	Argument		|	Description
+-------------------------------------------------------------------------------
+
+f_pChipOpen			Pointer to chip configuration structure.
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+#if !SKIP_OCT6100ApiReadCapacity
+UINT32 Oct6100ApiReadCapacity(	IN	tPOCT6100_INSTANCE_API	f_pApiInstance,
+								IN	tPOCT6100_API_GET_CAPACITY_PINS	f_pGetCapacityPins)
+{
+	UINT32					ulResult;
+	tOCT6100_READ_PARAMS	ReadParams;
+	UINT16					usReadData;
+	
+	/*Read capacity Pins*/
+
 
+	ReadParams.pProcessContext = f_pGetCapacityPins->pProcessContext;
+	ReadParams.ulUserChipId = f_pGetCapacityPins->ulUserChipId;
+	ReadParams.pusReadData = &usReadData;
+	
+	/*Check the Reset register*/
+	ReadParams.ulReadAddress = 0x100;
+	mOCT6100_DRIVER_READ_API( ReadParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	if ((usReadData & 0xFFFF) != 0x0000)
+		return cOCT6100_ERR_CAP_PINS_INVALID_CHIP_STATE;
+
+	/* Test the CPU registers. */
+	ulResult = Oct6100ApiCpuRegisterBistReadCap( f_pApiInstance, f_pGetCapacityPins );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Boot the FC2 PLL. */
+	ulResult = Oct6100ApiBootFc2PllReadCap( f_pApiInstance,f_pGetCapacityPins );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+	
+	/* Program the FC1 PLL. */
+	ulResult = Oct6100ApiProgramFc1PllReadCap( f_pApiInstance,f_pGetCapacityPins );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+			
+	if ( (f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_SDR) ||
+		 (f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_SDR_PLL_BYPASS) )
+	{
+		ReadParams.ulReadAddress = 0x168;
+	}
+	else
+		ReadParams.ulReadAddress = 0x166;
+	
+	mOCT6100_DRIVER_READ_API( ReadParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+					
+	switch (usReadData & 0xF)
+	{
+	case 0x9:
+		f_pGetCapacityPins->ulCapacityValue = 16;
+		break;
+	case 0x8:
+		f_pGetCapacityPins->ulCapacityValue = 32;
+		break;
+	case 0xE:
+		f_pGetCapacityPins->ulCapacityValue = 64;
+		break;
+	case 0x0:
+		f_pGetCapacityPins->ulCapacityValue = 128;
+		break;
+	case 0x2:
+		f_pGetCapacityPins->ulCapacityValue = 256;
+		break;
+	case 0x5:
+		f_pGetCapacityPins->ulCapacityValue = 512;
+		break;
+	case 0x6:
+		f_pGetCapacityPins->ulCapacityValue = 672;
+		break;
+	default:
+		f_pGetCapacityPins->ulCapacityValue = (usReadData & 0xF);
+		return  cOCT6100_ERR_CAP_PINS_INVALID_CAPACITY_VALUE;
+	}
+	
+	return cOCT6100_ERR_OK;
+}
+#endif
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
 
@@ -1146,6 +1314,10 @@ UINT32 Oct6100ApiCheckChipConfiguration(
 	{
 		if ( f_pChipOpen->ulNumProductionBistLoops == 0 )
 			return cOCT6100_ERR_OPEN_NUM_PRODUCTION_BIST_LOOPS;
+
+		if ( (f_pChipOpen->ulProductionBistMode != cOCT6100_PRODUCTION_BIST_STANDARD) &&
+			 (f_pChipOpen->ulProductionBistMode != cOCT6100_PRODUCTION_BIST_SHORT) )
+			return cOCT6100_ERR_OPEN_PRODUCTION_BIST_MODE;
 	}
 
 	/* If the production BIST has been requested, make sure all */
@@ -1266,6 +1438,7 @@ UINT32 Oct6100ApiCopyChipConfiguration(
 
 
 	pSharedInfo->ChipConfig.fEnableProductionBist = (UINT8)( f_pChipOpen->fEnableProductionBist & 0xFF );
+	pSharedInfo->ChipConfig.ulProductionBistMode = f_pChipOpen->ulProductionBistMode;
 	pSharedInfo->ChipConfig.ulNumProductionBistLoops  = f_pChipOpen->ulNumProductionBistLoops;
 
 	return cOCT6100_ERR_OK;
@@ -1373,6 +1546,7 @@ UINT32 Oct6100ApiInitializeMiscellaneousVariables(
 	pSharedInfo->ImageInfo.fSoutAppliedGainStat			= FALSE;
 	pSharedInfo->ImageInfo.fListenerEnhancement			= FALSE;
 	pSharedInfo->ImageInfo.fRoutNoiseReduction			= FALSE;
+	pSharedInfo->ImageInfo.fRoutNoiseReductionLevel		= FALSE;
 	pSharedInfo->ImageInfo.fAnrSnrEnhancement			= FALSE;
 	pSharedInfo->ImageInfo.fAnrVoiceNoiseSegregation	= FALSE;
 	pSharedInfo->ImageInfo.fRinMute						= FALSE;
@@ -1482,13 +1656,11 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
 	ulResult = Oct6100ApiGetChannelsEchoSwSizes( f_pChipOpen, f_pInstSizes );
 	if ( ulResult != cOCT6100_ERR_OK )
 		return ulResult;
-
 	/*-----------------------------------------------------------------------------*/
 	/* Memory needed by the TSI structures. */
 	ulResult = Oct6100ApiGetTsiCnctSwSizes( f_pChipOpen, f_pInstSizes );
 	if ( ulResult != cOCT6100_ERR_OK )
 		return ulResult;
-
 	/*-----------------------------------------------------------------------------*/
 	/* Calculate memory needed for the conference bridges. */
 	ulResult = Oct6100ApiGetConfBridgeSwSizes( f_pChipOpen, f_pInstSizes );
@@ -1514,7 +1686,6 @@ UINT32 Oct6100ApiCalculateInstanceSizes(
 	ulResult = Oct6100ApiGetPhasingTsstSwSizes( f_pChipOpen, f_pInstSizes );
 	if ( ulResult != cOCT6100_ERR_OK )
 		return ulResult;
-
 	/*-----------------------------------------------------------------------------*/
 	/* Calculate memory needed for the ADPCM channels. */
 	ulResult = Oct6100ApiGetAdpcmChanSwSizes( f_pChipOpen, f_pInstSizes );
@@ -1770,13 +1941,11 @@ UINT32 Oct6100ApiInitializeInstanceMemory(
 	ulResult = Oct6100ApiChannelsEchoSwInit( f_pApiInstance );
 	if ( ulResult != cOCT6100_ERR_OK )
 		return ulResult;
-
 	/*-----------------------------------------------------------------------------*/
 	/* Initialize the API TSI connection structures. */
 	ulResult = Oct6100ApiTsiCnctSwInit( f_pApiInstance );
 	if ( ulResult != cOCT6100_ERR_OK )
 		return ulResult;
-
 	/*-----------------------------------------------------------------------------*/
 	/* Initialize the API conference bridges. */
 	ulResult = Oct6100ApiConfBridgeSwInit( f_pApiInstance );
@@ -1794,7 +1963,6 @@ UINT32 Oct6100ApiInitializeInstanceMemory(
 	ulResult = Oct6100ApiPhasingTsstSwInit( f_pApiInstance );
 	if ( ulResult != cOCT6100_ERR_OK )
 		return ulResult;
-
 	/*-----------------------------------------------------------------------------*/
 	/* Initialize the API ADPCM channels. */
 	ulResult = Oct6100ApiAdpcmChanSwInit( f_pApiInstance );
@@ -2044,19 +2212,253 @@ UINT32 Oct6100ApiDecodeKeyAndBist(
 	if (ausBistData[0] != 0x0000 || ausBistData[1] != 0x0000 || ausBistData[2] != 0x0000)
 		return cOCT6100_ERR_OPEN_INTERNAL_MEMORY_BIST;
 
-	/* Put key decoder in powerdown. */
-	WriteParams.ulWriteAddress = 0x160;
-	WriteParams.usWriteData = 0x008A;
+	/* Put key decoder in powerdown. */
+	WriteParams.ulWriteAddress = 0x160;
+	WriteParams.usWriteData = 0x008A;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	return cOCT6100_ERR_OK;
+}
+#endif
+
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+Function:		Oct6100ApiBootFc2PllReadCap
+
+Description:    Configures the chip's FC2 PLL. Special version for GetcapacityPins.
+
+-------------------------------------------------------------------------------
+|	Argument		|	Description
+-------------------------------------------------------------------------------
+f_pApiInstance		Pointer to API instance. This memory is used to keep the
+					present state of the chip and all its resources.
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+UINT32 Oct6100ApiBootFc2PllReadCap(
+				IN 	tPOCT6100_INSTANCE_API	f_pApiInstance,
+				IN	tPOCT6100_API_GET_CAPACITY_PINS	f_pGetCapacityPins)
+{
+	tOCT6100_WRITE_PARAMS		WriteParams;
+	UINT32						aulWaitTime[ 2 ];
+	UINT32						ulResult;
+	UINT32						ulFc2PllDivisor = 0;
+	UINT32						ulMtDivisor = 0;
+	UINT32						ulFcDivisor = 0;
+
+	/* Set the process context and user chip ID parameters once and for all. */
+	WriteParams.pProcessContext = f_pGetCapacityPins->pProcessContext;
+
+	WriteParams.ulUserChipId = f_pGetCapacityPins->ulUserChipId;
+
+	/* First put the chip and main registers in soft-reset. */
+	WriteParams.ulWriteAddress = 0x100;
+	WriteParams.usWriteData = 0x0;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult )
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	ulFc2PllDivisor = 0x1050;
+	ulMtDivisor = 0x4300;
+	ulFcDivisor = 0x4043;
+
+	/* Setup delay chains. */
+	if ( (f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_SDR) ||  (f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_SDR_PLL_BYPASS) )
+	{
+		/* SDRAM */
+		WriteParams.ulWriteAddress = 0x1B0;
+		WriteParams.usWriteData = 0x1003;
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		WriteParams.ulWriteAddress = 0x1B2;
+		WriteParams.usWriteData = 0x0021;
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		WriteParams.ulWriteAddress = 0x1B4;
+		WriteParams.usWriteData = 0x4030;
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		WriteParams.ulWriteAddress = 0x1B6;
+		WriteParams.usWriteData = 0x0021;
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+	}
+	else /* if ( cOCT6100_MEM_TYPE_DDR == pChipConfig->byMemoryType ) */
+	{
+		/* DDR */
+		WriteParams.ulWriteAddress = 0x1B0;
+		WriteParams.usWriteData = 0x201F;
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		WriteParams.ulWriteAddress = 0x1B2;
+		WriteParams.usWriteData = 0x0021;
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		WriteParams.ulWriteAddress = 0x1B4;
+		WriteParams.usWriteData = 0x1000;
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		WriteParams.ulWriteAddress = 0x1B6;
+		WriteParams.usWriteData = 0x0021;
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+	}
+
+	/* udqs */
+	WriteParams.ulWriteAddress = 0x1B8;
+	WriteParams.usWriteData = 0x1003;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	WriteParams.ulWriteAddress = 0x1BA;
+	WriteParams.usWriteData = 0x0021;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* ldqs */
+	WriteParams.ulWriteAddress = 0x1BC;
+	WriteParams.usWriteData = 0x1000;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	WriteParams.ulWriteAddress = 0x1BE;
+	WriteParams.usWriteData = 0x0021;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	WriteParams.ulWriteAddress = 0x12C;
+	WriteParams.usWriteData = 0x0000;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	WriteParams.ulWriteAddress = 0x12E;
+	WriteParams.usWriteData = 0x0000;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Select fc2pll for fast_clk and mtsclk sources. Select mem_clk_i for afclk. */
+	WriteParams.ulWriteAddress = 0x140;
+	WriteParams.usWriteData = (UINT16)ulMtDivisor;
+
+	if ( f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_SDR_PLL_BYPASS )
+		WriteParams.usWriteData |= 0x0001;
+	else
+		WriteParams.usWriteData |= 0x0004;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	WriteParams.ulWriteAddress = 0x144;
+	WriteParams.usWriteData = (UINT16)ulFcDivisor;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	WriteParams.ulWriteAddress = 0x13E;
+	WriteParams.usWriteData = 0x0001;	/*  Remove reset from above divisors */
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Select upclk directly as ref source for fc2pll. */
+	WriteParams.ulWriteAddress = 0x134;
+	WriteParams.usWriteData = 0x0001;
+		
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Setup fc2pll. */
+	WriteParams.ulWriteAddress = 0x132;
+	WriteParams.usWriteData = (UINT16)ulFc2PllDivisor;
+		
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	WriteParams.usWriteData |= 0x02;	/* Raise fb divisor reset. */
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
 
+	WriteParams.usWriteData |= 0x80;	/* Raise IDDTN signal.*/
 	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
 	if ( ulResult != cOCT6100_ERR_OK )
 		return ulResult;
 
-	return cOCT6100_ERR_OK;
-}
-#endif
+	/* Wait for fc2pll to stabilize. */
+	aulWaitTime[ 0 ] = 2000;
+	aulWaitTime[ 1 ] = 0;
+	ulResult = Oct6100ApiWaitForTime( f_pApiInstance, aulWaitTime );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Drive mem_clk_o out on proper interface. */
+	if ( TRUE == f_pGetCapacityPins->fEnableMemClkOut )
+	{
+		if ( (f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_SDR) || (f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_SDR_PLL_BYPASS)  )
+		{
+			WriteParams.ulWriteAddress = 0x128;
+			WriteParams.usWriteData = 0x0301;
 
+			mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+			if ( ulResult != cOCT6100_ERR_OK )
+				return ulResult;
+		}
+	
+		if ( f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_DDR || f_pGetCapacityPins->ulMemoryType == cOCT6100_MEM_TYPE_SDR_PLL_BYPASS )
+		{
+			WriteParams.ulWriteAddress = 0x12A;
+			WriteParams.usWriteData = 0x000F;
+			
+			mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+			if ( ulResult != cOCT6100_ERR_OK )
+				return ulResult;
+		}
+	}
 
+	return cOCT6100_ERR_OK;
+}
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
 
 Function:		Oct6100ApiBootFc2Pll
@@ -2413,7 +2815,83 @@ UINT32 Oct6100ApiBootFc2Pll(
 }
 #endif
 
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+Function:		Oct6100ApiProgramFc1PllReadCap
+
+Description:    Configures the chip's FC1 PLL. Special version for getCapacityPins.
+
+-------------------------------------------------------------------------------
+|	Argument		|	Description
+-------------------------------------------------------------------------------
+f_pApiInstance		Pointer to API instance. This memory is used to keep the
+					present state of the chip and all its resources.
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+UINT32 Oct6100ApiProgramFc1PllReadCap(
+				IN	tPOCT6100_INSTANCE_API	f_pApiInstance,
+				IN	tPOCT6100_API_GET_CAPACITY_PINS	f_pGetCapacityPins)
+{
+	tOCT6100_WRITE_PARAMS		WriteParams;
+	UINT32						aulWaitTime[ 2 ];
+	UINT32						ulResult;
+
+	/* Set the process context and user chip ID parameters once and for all. */
+	WriteParams.pProcessContext = f_pApiInstance->pProcessContext;
+
+	WriteParams.ulUserChipId = f_pGetCapacityPins->ulUserChipId;
+
+	/* Programm P/Z bits. */
+	WriteParams.ulWriteAddress = 0x130;
+	
+	if ( f_pGetCapacityPins->ulMemoryType  == cOCT6100_MEM_TYPE_SDR_PLL_BYPASS )
+		WriteParams.usWriteData  = 0x0041;
+	else
+		WriteParams.usWriteData  = 0x0040;
+
+	WriteParams.usWriteData |= ( f_pGetCapacityPins->ulMemoryType << 8 );
+	
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+	
+	/* Raise FB divisor. */
+	WriteParams.usWriteData |= 0x0002;
+	
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+	
+	/* Raise IDDTN. */
+	WriteParams.usWriteData |= 0x0080;
+	
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Wait for fc1pll to stabilize. */ 
+	aulWaitTime[ 0 ] = 2000;
+	aulWaitTime[ 1 ] = 0;
+	ulResult = Oct6100ApiWaitForTime( f_pApiInstance, aulWaitTime );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Enable all the clock domains to do reset procedure. */
+	WriteParams.ulWriteAddress = 0x186;
+	WriteParams.usWriteData  = 0x015F;
+	
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	aulWaitTime[ 0 ] = 15000;
+	aulWaitTime[ 1 ] = 0;
+	ulResult = Oct6100ApiWaitForTime( f_pApiInstance, aulWaitTime );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
 
+	return cOCT6100_ERR_OK;
+}
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
 
 Function:		Oct6100ApiProgramFc1Pll
@@ -2789,7 +3267,119 @@ UINT32 Oct6100ApiLoadImage(
 }
 #endif
 
+/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+Function:		Oct6100ApiCpuRegisterBistReadCap
+
+Description:    Tests the operation of the CPU registers. Special Version for
+				GetCapacityPins
+
+-------------------------------------------------------------------------------
+|	Argument		|	Description
+-------------------------------------------------------------------------------
+f_pApiInstance		Pointer to API instance. This memory is used to keep the
+					present state of the chip and all its resources.
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+UINT32 Oct6100ApiCpuRegisterBistReadCap(
+				IN tPOCT6100_INSTANCE_API	f_pApiInstance,
+				IN	tPOCT6100_API_GET_CAPACITY_PINS	f_pGetCapacityPins
+				)
+{
+	tOCT6100_WRITE_PARAMS	WriteParams;
+	tOCT6100_READ_PARAMS	ReadParams;
+	UINT32	ulResult;
+	UINT16	i;
+	UINT16	usReadData;
+
+	/* Set the process context and user chip ID parameters once and for all. */
+	WriteParams.pProcessContext = f_pApiInstance->pProcessContext;
+
+	WriteParams.ulUserChipId = f_pGetCapacityPins->ulUserChipId;
 
+	ReadParams.pProcessContext = f_pApiInstance->pProcessContext;
+
+	ReadParams.ulUserChipId = f_pGetCapacityPins->ulUserChipId;
+
+	/* Assign read data pointer that will be used throughout the function. */
+	ReadParams.pusReadData = &usReadData;
+
+	/* Start with a walking bit test. */
+	for ( i = 0; i < 16; i ++ )
+	{
+		/* Write at address 0x150.*/
+		WriteParams.ulWriteAddress = 0x150;
+		WriteParams.usWriteData = (UINT16)( 0x1 << i );
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		/* Write at address 0x180.*/
+		WriteParams.ulWriteAddress = 0x180;
+		WriteParams.usWriteData = (UINT16)( 0x1 << ( 15 - i ) );
+
+		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		/* Now read back the two registers to make sure the acceses were successfull. */
+		ReadParams.ulReadAddress = 0x150;
+
+		mOCT6100_DRIVER_READ_API( ReadParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		if ( usReadData != ( 0x1 << i ) )
+			return cOCT6100_ERR_OPEN_CPU_REG_BIST_ERROR;
+
+		ReadParams.ulReadAddress = 0x180;
+
+		mOCT6100_DRIVER_READ_API( ReadParams, ulResult );
+		if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+		if ( usReadData != ( 0x1 << ( 15 - i ) ) )
+			return cOCT6100_ERR_OPEN_CPU_REG_BIST_ERROR;
+	}
+
+	/* Write at address 0x150. */
+	WriteParams.ulWriteAddress = 0x150;
+	WriteParams.usWriteData = 0xCAFE;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Write at address 0x180. */
+	WriteParams.ulWriteAddress = 0x180;
+	WriteParams.usWriteData = 0xDECA;
+
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	/* Now read back the two registers to make sure the acceses were successfull. */
+	ReadParams.ulReadAddress = 0x150;
+
+	mOCT6100_DRIVER_READ_API( ReadParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	if ( usReadData != 0xCAFE )
+		return cOCT6100_ERR_OPEN_CPU_REG_BIST_ERROR;
+
+	ReadParams.ulReadAddress = 0x180;
+
+	mOCT6100_DRIVER_READ_API( ReadParams, ulResult );
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+
+	if ( usReadData != 0xDECA )
+		return cOCT6100_ERR_OPEN_CPU_REG_BIST_ERROR;
+
+	return cOCT6100_ERR_OK;
+}
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
 
 Function:		Oct6100ApiCpuRegisterBist
@@ -3810,7 +4400,10 @@ UINT32 Oct6100ApiProgramNLP(
 		{
 			if ( pSharedInfo->ChipConfig.fEnableProductionBist == TRUE )
 			{
-				WriteParams.usWriteData = cOCT6100_PRODUCTION_BOOT_TYPE;
+				if (pSharedInfo->ChipConfig.ulProductionBistMode == cOCT6100_PRODUCTION_BIST_SHORT)
+					WriteParams.usWriteData = cOCT6100_PRODUCTION_SHORT_BOOT_TYPE;
+				else
+					WriteParams.usWriteData = cOCT6100_PRODUCTION_BOOT_TYPE;
 			}
 			else
 			{
@@ -3892,7 +4485,8 @@ UINT32 Oct6100ApiProgramNLP(
 			if ( pSharedInfo->ChipConfig.fEnableProductionBist == TRUE )
 			{
 				/* Should read 0x0007 when bisting. */
-				if ( ( usReadHighData & 0xFFFF ) == cOCT6100_PRODUCTION_BOOT_TYPE )
+				if ( (( usReadHighData & 0xFFFF ) == cOCT6100_PRODUCTION_BOOT_TYPE) ||
+					(( usReadHighData & 0xFFFF ) == cOCT6100_PRODUCTION_SHORT_BOOT_TYPE) )
 				{
 					/* Verify if the bist has started successfully. */
 					if ( ( usReadData & 0xFFFF ) == 0x0002 )
@@ -5269,6 +5863,11 @@ UINT32 Oct6100ApiRandomMemoryWrite(
 	UINT32	ulResult, i, j;
 	UINT32	ulBistAddress;
 	UINT16	usReadData;
+	UINT32	aulBistAddress[20]={0x00000000, 0x00000002, 0x00000004, 0x007FFFFE,
+		                        0x00900000, 0x00900006, 0x00900008, 0x009FFFFE,
+								0x01000000, 0x0100000A, 0x0200000C, 0x01FFFFFE,
+								0x03000000, 0x03000002, 0x04000004, 0x03FFFFFE,
+								0x04000000, 0x05000006, 0x06000008, 0x07FFFFFE};	
 
 	/* Get local pointer to shared portion of instance. */
 	pSharedInfo = f_pApiInstance->pSharedInfo;
@@ -5282,51 +5881,54 @@ UINT32 Oct6100ApiRandomMemoryWrite(
 
 	ReadParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId;
 
-	/* Make sure we don't perform more access then the size of our BIST resources. */
-	if ( f_ulNumAccesses > 1024 )
-		return cOCT6100_ERR_FATAL_C0;
-
 	/* Determine mask for number of data bits. */
 	ulDataMask = (1 << f_ulNumDataBits) - 1;
 	
-	/* Bist all data pin. */
-	for ( i = 0; i < 32; i += 2 )
-	{
-		WriteParams.ulWriteAddress = f_ulMemBase + i * 2;
-		WriteParams.usWriteData = (UINT16)(0x1 << (i / 2));
-
-		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult )
-		if ( ulResult != cOCT6100_ERR_OK )
-			return ulResult;
+	/* Write specific data to specific address */
+	WriteParams.ulWriteAddress = f_ulMemBase | 0x00001000;
+	WriteParams.usWriteData = 0xCAFE;
 
-		WriteParams.ulWriteAddress = f_ulMemBase + i * 2 + 2;
-		WriteParams.usWriteData = (UINT16)(0x1 << (i / 2));
+	mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult )
+	if ( ulResult != cOCT6100_ERR_OK )
+		return ulResult;
+	
+	for(j=0; j<20; j++)
+	{		
+		/* Change address to test lower and higher part of the 32 bit bus */
+		ulBistAddress  = aulBistAddress[j];		
+		ulBistAddress &= f_ulMemSize - 2;
+		ulBistAddress |= f_ulMemBase;
 
-		mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult )
-		if ( ulResult != cOCT6100_ERR_OK )
-			return ulResult;
-	}
+		/* Bist 16 data pins of this address */
+		for ( i = 0; i < 16; i ++)
+		{
+			WriteParams.ulWriteAddress = ulBistAddress;
+			WriteParams.usWriteData = (UINT16)(0x1 << i);
 
-	/* Read back the data written. */
-	for ( i = 0; i < 32; i += 2 )
-	{
-		ReadParams.ulReadAddress = f_ulMemBase + i * 2;
-		ReadParams.pusReadData = &usReadData;
-		mOCT6100_DRIVER_READ_API( ReadParams, ulResult )
-		if ( ulResult != cOCT6100_ERR_OK )
-			return ulResult;
+			mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult )
+			if ( ulResult != cOCT6100_ERR_OK )
+				return ulResult;
 
-		if ( usReadData != (UINT16)(0x1 << (i / 2)) )
-			return f_ulErrorCode;
+			/* Read back the specific data to flush the data bus.*/
+			ReadParams.ulReadAddress = f_ulMemBase | 0x00001000;
+			ReadParams.pusReadData = &usReadData;
+			mOCT6100_DRIVER_READ_API( ReadParams, ulResult )
+			if ( ulResult != cOCT6100_ERR_OK )
+				return ulResult;
 
-		ReadParams.ulReadAddress = f_ulMemBase + i * 2 + 2;
-		ReadParams.pusReadData = &usReadData;
-		mOCT6100_DRIVER_READ_API( ReadParams, ulResult )
-		if ( ulResult != cOCT6100_ERR_OK )
-			return ulResult;
+			if ( usReadData != 0xCAFE )
+				return f_ulErrorCode;
+			
+			/* Read back the data written.*/
+			ReadParams.ulReadAddress = WriteParams.ulWriteAddress;
+			ReadParams.pusReadData = &usReadData;
+			mOCT6100_DRIVER_READ_API( ReadParams, ulResult )
+			if ( ulResult != cOCT6100_ERR_OK )
+				return ulResult;
 
-		if ( usReadData != (UINT16)(0x1 << (i / 2)) )
-			return f_ulErrorCode;
+			if ( usReadData != (UINT16)(0x1 << i) )
+				return f_ulErrorCode;
+		}
 	}
 
 	/* Perform the first write at address 0 + mem base */
@@ -5394,6 +5996,7 @@ UINT32 Oct6100ApiRandomMemoryWrite(
 			return f_ulErrorCode;
 	}
 	
+	
 	return cOCT6100_ERR_OK;
 }
 #endif
@@ -5895,7 +6498,6 @@ UINT32 Oct6100FreeResourcesSer(
 				return ulResult;
 		}
 	}
-
 	/* Close all TSI connections. */
 	if ( f_pFreeResources->fFreeTsiConnections == TRUE )
 	{
@@ -5919,7 +6521,6 @@ UINT32 Oct6100FreeResourcesSer(
 			}
 		}
 	}
-
 	/* Close all conference bridges. */
 	if ( f_pFreeResources->fFreeConferenceBridges == TRUE )
 	{
@@ -5969,7 +6570,6 @@ UINT32 Oct6100FreeResourcesSer(
 		}
 	}
 
-
 	/* Close all phasing TSSTs. */
 	if ( f_pFreeResources->fFreePhasingTssts == TRUE )
 	{
@@ -5992,7 +6592,6 @@ UINT32 Oct6100FreeResourcesSer(
 			}
 		}
 	}
-	
 	/* Close all ADPCM channels. */
 	if ( f_pFreeResources->fFreeAdpcmChannels == TRUE )
 	{
@@ -6015,7 +6614,6 @@ UINT32 Oct6100FreeResourcesSer(
 		}
 	}
 
-
 	return cOCT6100_ERR_OK;
 }
 #endif
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
index 1fb3f7f..ffbde43 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 87 $
+$Octasic_Revision: 88 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -209,6 +209,7 @@ UINT32 Oct6100ChipGetImageInfoDef(
 	f_pChipImageInfo->fPerChannelTailLength			= FALSE;
 	f_pChipImageInfo->fListenerEnhancement			= FALSE;
 	f_pChipImageInfo->fRoutNoiseReduction			= FALSE;
+	f_pChipImageInfo->fRoutNoiseReductionLevel		= FALSE;
 	f_pChipImageInfo->fAnrSnrEnhancement			= FALSE;
 	f_pChipImageInfo->fAnrVoiceNoiseSegregation		= FALSE;
 	f_pChipImageInfo->fToneDisablerVqeActivationDelay = FALSE;
@@ -267,6 +268,7 @@ UINT32 Oct6100ChipGetImageInfo(
 	f_pChipImageInfo->fPerChannelTailDisplacement	= pImageInfo->fPerChannelTailDisplacement;
 	f_pChipImageInfo->fListenerEnhancement			= pImageInfo->fListenerEnhancement;
 	f_pChipImageInfo->fRoutNoiseReduction			= pImageInfo->fRoutNoiseReduction;
+	f_pChipImageInfo->fRoutNoiseReductionLevel		= pImageInfo->fRoutNoiseReductionLevel;
 	f_pChipImageInfo->fAnrSnrEnhancement			= pImageInfo->fAnrSnrEnhancement;
 	f_pChipImageInfo->fAnrVoiceNoiseSegregation		= pImageInfo->fAnrVoiceNoiseSegregation;
 	f_pChipImageInfo->fMusicProtection				= pImageInfo->fMusicProtection;
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
index b237efe..2ff3a5a 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
@@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 145 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
index 975f85b..6095108 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 63 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
index 4d67576..f765732 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
@@ -1,4 +1,3 @@
-#ifndef cOCT6100_REMOVE_EVENTS
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
 
 File: oct6100_events.c
@@ -23,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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 79 $
+$Octasic_Revision: 80 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -1343,4 +1342,4 @@ UINT32 Oct6100BufferPlayoutCheckForSpecificEvent(
 }
 #endif
 
-#endif /* cOCT6100_REMOVE_EVENTS */
+
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
index 145e201..6900dfd 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
@@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 72 $
+$Octasic_Revision: 75 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -1852,7 +1852,7 @@ UINT32	Oct6100ApiCheckProcessorState(
 	else
 		ulTimestampDiff = ulNlpTimestamp - ulAfTimestamp;
 
-	if ( ulTimestampDiff > 0x1000 )
+	if ( ulTimestampDiff > 0x2000 )
 	{
 		f_pIntFlags->ulFatalGeneralFlags |= cOCT6100_FATAL_GENERAL_ERROR_TYPE_5;
 		f_pIntFlags->fFatalGeneral = TRUE;
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
index ed88207..93edd54 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 42 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
index 4028658..107ba76 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 35 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
index ec5fb34..c6edcba 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $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 f72a2c4..0165060 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 43 $
+$Octasic_Revision: 46 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -59,7 +59,6 @@ $Octasic_Revision: 43 $
 #include "oct6100_tsst_priv.h"
 #include "oct6100_phasing_tsst_priv.h"
 
-
 /****************************  PUBLIC FUNCTIONS  ****************************/
 
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
index c1e3a1f..9f87d83 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $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 0c67d0b..0bed078 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 35 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
index 0c797c1..4ecc81e 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
@@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 111 $
+$Octasic_Revision: 112 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -1385,7 +1385,21 @@ UINT32 Oct6100ApiInterpretTlvEntry(
 		}
 
 		break;
+	case cOCT6100_TLV_TYPE_RIN_ANR_VALUE:
 		
+		ulResult = Oct6100ApiTlvCheckLengthField( f_ulTlvFieldLength, 
+												  cOCT6100_TLV_MIN_LENGTH_RIN_ANR_VALUE_RW, 
+												  cOCT6100_TLV_MAX_LENGTH_RIN_ANR_VALUE_RW );
+		if ( ulResult == cOCT6100_ERR_OK )
+		{
+			ulResult = Oct6100ApiTlvReadBitOffsetStruct( f_pApiInstance,
+														 f_ulTlvValueAddress, 
+														 &f_pApiInstance->pSharedInfo->MemoryMap.RinAnrValOfst );
+
+			f_pApiInstance->pSharedInfo->ImageInfo.fRoutNoiseReductionLevel = TRUE;
+		}
+
+		break;
 	case cOCT6100_TLV_TYPE_RIN_MUTE_BOFF:
 
 		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 e19152e..280f4e2 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
@@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 49 $
+$Octasic_Revision: 50 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -1014,8 +1014,23 @@ UINT32 Oct6100ApiIsSSTone(
 
 	switch( f_ulToneEventNumber )
 	{
-	case cOCT6100_TONE_SIN_SYSTEM7_2000:
-	case cOCT6100_TONE_SIN_SYSTEM7_1780:
+	case cOCT6100_TONE_SIN_SYSTEM7_2000				:
+	case cOCT6100_TONE_SIN_SYSTEM7_1780				:	
+	case cOCT6100_TONE_ROUT_G168_2100GB_ON			:
+	case cOCT6100_TONE_ROUT_G168_2100GB_WSPR		:	
+	case cOCT6100_TONE_ROUT_G168_1100GB_ON			:	
+	case cOCT6100_TONE_ROUT_G168_2100GB_ON_WIDE_A	:	
+	case cOCT6100_TONE_ROUT_G168_2100GB_ON_WIDE_B	:
+	case cOCT6100_TONE_ROUT_G168_2100GB_WSPR_WIDE	:	
+	case cOCT6100_TONE_SOUT_G168_2100GB_ON			:	
+	case cOCT6100_TONE_SOUT_G168_2100GB_WSPR		:	
+	case cOCT6100_TONE_SOUT_G168_1100GB_ON			:	
+	case cOCT6100_TONE_SOUT_G168_2100GB_ON_WIDE_A	:	
+	case cOCT6100_TONE_SOUT_G168_2100GB_ON_WIDE_B	:	
+	case cOCT6100_TONE_SOUT_G168_2100GB_WSPR_WIDE	:	
+	case cOCT6100_TONE_SIN_SYSTEM5_2400				:
+	case cOCT6100_TONE_SIN_SYSTEM5_2600				:
+	case cOCT6100_TONE_SIN_SYSTEM5_2400_2600		:	
 		*f_fSSTone = TRUE;
 		break;
 	default:
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
index 01f27f9..83738cc 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 37 $
+$Octasic_Revision: 38 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
index 37bc28d..1add50d 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 39 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
index 0019b03..ee506f9 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 28 $
 
@@ -108,7 +108,7 @@ f_ulLength				Length in bytes to copy.
 #if !SKIP_Oct6100UserMemCopy
 UINT32 Oct6100UserMemCopy(
 				IN		PVOID						f_pDestination,
-				IN		PVOID						f_pSource,
+				IN		const void					*f_pSource,
 				IN		UINT32						f_ulLength )
 {
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c
index 0c6970a..7598d48 100644
--- a/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c
+++ b/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 7 $
+$Octasic_Revision: 8 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h b/software/octdeviceapi/oct6100api/oct6100_channel_priv.h
index f8968c9..bc7c667 100644
--- a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_channel_priv.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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 62 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h
index 1d0e6aa..225cb8e 100644
--- a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 56 $
+$Octasic_Revision: 59 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -237,6 +237,22 @@ UINT32 Oct6100ApiProductionCrc(
 				IN		UINT32							f_ulMessageLength,
 				OUT		PUINT32							f_pulCrcResult );
 
+UINT32 Oct6100ApiReadCapacity(	
+				IN	tPOCT6100_INSTANCE_API				f_pApiInstance,
+				IN	tPOCT6100_API_GET_CAPACITY_PINS		f_pGetCapacityPins );
+
+UINT32 Oct6100ApiCpuRegisterBistReadCap(
+				IN tPOCT6100_INSTANCE_API				f_pApiInstance,
+				IN	tPOCT6100_API_GET_CAPACITY_PINS		f_pGetCapacityPins );
+
+UINT32 Oct6100ApiBootFc2PllReadCap(
+				IN 	tPOCT6100_INSTANCE_API				f_pApiInstance,
+				IN	tPOCT6100_API_GET_CAPACITY_PINS		f_pGetCapacityPins );
+
+UINT32 Oct6100ApiProgramFc1PllReadCap(
+				IN	tPOCT6100_INSTANCE_API				f_pApiInstance,
+				IN	tPOCT6100_API_GET_CAPACITY_PINS		f_pGetCapacityPins );
+
 UINT32 Oct6100ApiInitToneInfo(
 				IN OUT	tPOCT6100_INSTANCE_API			f_pApiInstance );
 #endif /* __OCT6100_CHIP_OPEN_PRIV_H__ */
diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h
index 0e876d8..fe832ba 100644
--- a/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 8 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h
index d63d87d..b9657cf 100644
--- a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 30 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_debug_priv.h
index a6292d8..ff48eea 100644
--- a/software/octdeviceapi/oct6100api/oct6100_debug_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_debug_priv.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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 12 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_events_priv.h b/software/octdeviceapi/oct6100api/oct6100_events_priv.h
index 33555e3..cf2ba24 100644
--- a/software/octdeviceapi/oct6100api/oct6100_events_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_events_priv.h
@@ -1,4 +1,3 @@
-#ifndef cOCT6100_REMOVE_EVENTS
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
 
 File:  oct6100_events_priv.h
@@ -26,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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 13 $
+$Octasic_Revision: 14 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -81,4 +80,3 @@ UINT32 Oct6100BufferPlayoutCheckForSpecificEvent(
 				OUT		PBOOL								f_pfEventDetected );
 
 #endif /* __OCT6100_EVENTS_PRIV_H__ */
-#endif /* cOCT6100_REMOVE_EVENTS */
diff --git a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h b/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h
index 19856c5..8095825 100644
--- a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 8 $
+$Octasic_Revision: 10 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h
index 9ed2963..fcb383d 100644
--- a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 17 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h b/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
index 45c9fdd..3241631 100644
--- a/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 20 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h
index 5d5f4c4..cdeb666 100644
--- a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 18 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h
index bdae645..a5aba53 100644
--- a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 11 $
+$Octasic_Revision: 12 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -111,4 +111,4 @@ UINT32 Oct6100ApiReleasePhasingEntry(
 				IN OUT	tPOCT6100_INSTANCE_API			f_pApiInstance,
 				IN		UINT16							f_usPhasingIndex );
 
-#endif /* __OCT6100_PHASING_TSST_PRIV_H__ */
+#endif /* #ifndef cOCT6100_REMOVE_PHASING_TSST */
diff --git a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h
index 57e2e34..c91c861 100644
--- a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 22 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h
index d74e82c..c722fb7 100644
--- a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 13 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h b/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h
index 409939f..ddabf16 100644
--- a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 56 $
+$Octasic_Revision: 57 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -196,6 +196,8 @@ $Octasic_Revision: 56 $
 #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_RIN_ANR_VALUE						147
+
 #define cOCT6100_TLV_TYPE_ADPCM_ENABLE						150
 #define cOCT6100_TLV_TYPE_NUM_TONE_DETECTOR					151
 #define cOCT6100_TLV_TYPE_CONFERENCING_ENABLE				152
@@ -369,6 +371,9 @@ $Octasic_Revision: 56 $
 #define cOCT6100_TLV_MIN_LENGTH_RIN_ANR_BOFF_RW					8
 #define cOCT6100_TLV_MAX_LENGTH_RIN_ANR_BOFF_RW					8
 
+#define cOCT6100_TLV_MIN_LENGTH_RIN_ANR_VALUE_RW				8
+#define cOCT6100_TLV_MAX_LENGTH_RIN_ANR_VALUE_RW				8
+
 #define cOCT6100_TLV_MIN_LENGTH_RIN_MUTE_BOFF_RW				8
 #define cOCT6100_TLV_MAX_LENGTH_RIN_MUTE_BOFF_RW				8
 #define cOCT6100_TLV_MIN_LENGTH_SIN_MUTE_BOFF_RW				8
diff --git a/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h b/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h
index 82a56c3..9b9689a 100644
--- a/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 13 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h
index 1be80ef..742d5af 100644
--- a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 13 $
+$Octasic_Revision: 14 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h
index e7a2733..039a9d0 100644
--- a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
 $Octasic_Revision: 14 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_version.h b/software/octdeviceapi/oct6100api/oct6100_version.h
index 49ddb25..8a2849a 100644
--- a/software/octdeviceapi/oct6100api/oct6100_version.h
+++ b/software/octdeviceapi/oct6100api/oct6100_version.h
@@ -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-PR43 $
+$Octasic_Release: OCT612xAPI-01.00-PR47 $
 
-$Octasic_Revision: 46 $
+$Octasic_Revision: 50 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -34,6 +34,6 @@ $Octasic_Revision: 46 $
 
 /* String version of the OCT6100 API.*/
 
-#define cOCT6100_API_VERSION "OCT6100API-01.00-PR43"
+#define cOCT6100_API_VERSION "OCT6100API-01.00-PR47"
 
 #endif /* __OCT6100_VERSION_H__ */
-- 
cgit v1.2.3