merge up to PR49

git-svn-id: http://svn.asterisk.org/svn/octasic_api/oct612x/trunk@33 537310ab-6354-42db-a3cc-247b777f7be6

91 files changed, 258 insertions, 151 deletions

diff --git a/software/apilib/bt/octapi_bt0.c b/software/apilib/bt/octapi_bt0.c
index a5e009a..f9af44a 100644
--- a/software/apilib/bt/octapi_bt0.c
+++ b/software/apilib/bt/octapi_bt0.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 18 $
 
diff --git a/software/apilib/bt/octapi_bt0_private.h b/software/apilib/bt/octapi_bt0_private.h
index 059e58e..8c68c3e 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 11 $
 
diff --git a/software/apilib/largmath/octapi_largmath.c b/software/apilib/largmath/octapi_largmath.c
index 8f224e4..75153b8 100644
--- a/software/apilib/largmath/octapi_largmath.c
+++ b/software/apilib/largmath/octapi_largmath.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 10 $
 
diff --git a/software/apilib/llman/octapi_llman.c b/software/apilib/llman/octapi_llman.c
index c87d824..9926d20 100644
--- a/software/apilib/llman/octapi_llman.c
+++ b/software/apilib/llman/octapi_llman.c
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 22 $
 
diff --git a/software/apilib/llman/octapi_llman_private.h b/software/apilib/llman/octapi_llman_private.h
index 4f24182..14a053d 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 13 $
 
diff --git a/software/include/apilib/octapi_bt0.h b/software/include/apilib/octapi_bt0.h
index 1b130e0..a0f22ca 100644
--- a/software/include/apilib/octapi_bt0.h
+++ b/software/include/apilib/octapi_bt0.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 11 $
 
diff --git a/software/include/apilib/octapi_largmath.h b/software/include/apilib/octapi_largmath.h
index 7c4df4d..1680474 100644
--- a/software/include/apilib/octapi_largmath.h
+++ b/software/include/apilib/octapi_largmath.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 6 $
 
diff --git a/software/include/apilib/octapi_llman.h b/software/include/apilib/octapi_llman.h
index 15322fa..b70a851 100644
--- a/software/include/apilib/octapi_llman.h
+++ b/software/include/apilib/octapi_llman.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 8 $
 
diff --git a/software/include/oct6100api/oct6100_adpcm_chan_inst.h b/software/include/oct6100api/oct6100_adpcm_chan_inst.h
index f8b890f..9e33909 100644
--- a/software/include/oct6100api/oct6100_adpcm_chan_inst.h
+++ b/software/include/oct6100api/oct6100_adpcm_chan_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 6 $
 
diff --git a/software/include/oct6100api/oct6100_adpcm_chan_pub.h b/software/include/oct6100api/oct6100_adpcm_chan_pub.h
index e1d627b..e29fac4 100644
--- a/software/include/oct6100api/oct6100_adpcm_chan_pub.h
+++ b/software/include/oct6100api/oct6100_adpcm_chan_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 5 $
 
diff --git a/software/include/oct6100api/oct6100_api.h b/software/include/oct6100api/oct6100_api.h
index 1742912..35a9666 100644
--- a/software/include/oct6100api/oct6100_api.h
+++ b/software/include/oct6100api/oct6100_api.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 23 $
 
diff --git a/software/include/oct6100api/oct6100_api_inst.h b/software/include/oct6100api/oct6100_api_inst.h
index 32f7ee1..29bd0fd 100644
--- a/software/include/oct6100api/oct6100_api_inst.h
+++ b/software/include/oct6100api/oct6100_api_inst.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 40 $
 
diff --git a/software/include/oct6100api/oct6100_apimi.h b/software/include/oct6100api/oct6100_apimi.h
index 4c809f3..dd584ea 100644
--- a/software/include/oct6100api/oct6100_apimi.h
+++ b/software/include/oct6100api/oct6100_apimi.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 6 $
 
diff --git a/software/include/oct6100api/oct6100_apiud.h b/software/include/oct6100api/oct6100_apiud.h
index f05dec5..feff93e 100644
--- a/software/include/oct6100api/oct6100_apiud.h
+++ b/software/include/oct6100api/oct6100_apiud.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 16 $
 
diff --git a/software/include/oct6100api/oct6100_channel_inst.h b/software/include/oct6100api/oct6100_channel_inst.h
index 4144c44..b329a49 100644
--- a/software/include/oct6100api/oct6100_channel_inst.h
+++ b/software/include/oct6100api/oct6100_channel_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 90 $
 
diff --git a/software/include/oct6100api/oct6100_channel_pub.h b/software/include/oct6100api/oct6100_channel_pub.h
index 43b2e8f..2691e10 100644
--- a/software/include/oct6100api/oct6100_channel_pub.h
+++ b/software/include/oct6100api/oct6100_channel_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 84 $
 
diff --git a/software/include/oct6100api/oct6100_chip_open_inst.h b/software/include/oct6100api/oct6100_chip_open_inst.h
index 85eedf7..6de2d7e 100644
--- a/software/include/oct6100api/oct6100_chip_open_inst.h
+++ b/software/include/oct6100api/oct6100_chip_open_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 122 $
 
diff --git a/software/include/oct6100api/oct6100_chip_open_pub.h b/software/include/oct6100api/oct6100_chip_open_pub.h
index 980447c..7153106 100644
--- a/software/include/oct6100api/oct6100_chip_open_pub.h
+++ b/software/include/oct6100api/oct6100_chip_open_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 54 $
 
diff --git a/software/include/oct6100api/oct6100_chip_stats_inst.h b/software/include/oct6100api/oct6100_chip_stats_inst.h
index 85ad6e7..bcba616 100644
--- a/software/include/oct6100api/oct6100_chip_stats_inst.h
+++ b/software/include/oct6100api/oct6100_chip_stats_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 21 $
 
diff --git a/software/include/oct6100api/oct6100_chip_stats_pub.h b/software/include/oct6100api/oct6100_chip_stats_pub.h
index f9ec60a..a718f7b 100644
--- a/software/include/oct6100api/oct6100_chip_stats_pub.h
+++ b/software/include/oct6100api/oct6100_chip_stats_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 59 $
 
diff --git a/software/include/oct6100api/oct6100_conf_bridge_inst.h b/software/include/oct6100api/oct6100_conf_bridge_inst.h
index 641f2f7..f49a473 100644
--- a/software/include/oct6100api/oct6100_conf_bridge_inst.h
+++ b/software/include/oct6100api/oct6100_conf_bridge_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 19 $
 
diff --git a/software/include/oct6100api/oct6100_conf_bridge_pub.h b/software/include/oct6100api/oct6100_conf_bridge_pub.h
index 7be321a..4ecea7b 100644
--- a/software/include/oct6100api/oct6100_conf_bridge_pub.h
+++ b/software/include/oct6100api/oct6100_conf_bridge_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 22 $
 
diff --git a/software/include/oct6100api/oct6100_debug_inst.h b/software/include/oct6100api/oct6100_debug_inst.h
index 05a4f96..6a6f573 100644
--- a/software/include/oct6100api/oct6100_debug_inst.h
+++ b/software/include/oct6100api/oct6100_debug_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 10 $
 
diff --git a/software/include/oct6100api/oct6100_debug_pub.h b/software/include/oct6100api/oct6100_debug_pub.h
index e8eb4ca..097ecc6 100644
--- a/software/include/oct6100api/oct6100_debug_pub.h
+++ b/software/include/oct6100api/oct6100_debug_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 14 $
 
diff --git a/software/include/oct6100api/oct6100_defines.h b/software/include/oct6100api/oct6100_defines.h
index 1e5edb1..ab7aab8 100644
--- a/software/include/oct6100api/oct6100_defines.h
+++ b/software/include/oct6100api/oct6100_defines.h
@@ -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.7
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
-$Octasic_Revision: 170 $
+$Octasic_Revision: 171 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -664,6 +664,7 @@ $Octasic_Revision: 170 $
 #define cOCT6100_FATAL_GENERAL_ERROR_TYPE_6		0x0020
 #define cOCT6100_FATAL_GENERAL_ERROR_TYPE_7		0x0040
 #define cOCT6100_FATAL_GENERAL_ERROR_TYPE_8		0x0080
+#define cOCT6100_FATAL_GENERAL_ERROR_TYPE_9		0x0100
 
 #endif /* __OCT6100_DEFINES_H__ */
 
diff --git a/software/include/oct6100api/oct6100_errors.h b/software/include/oct6100api/oct6100_errors.h
index c751b95..a123762 100644
--- a/software/include/oct6100api/oct6100_errors.h
+++ b/software/include/oct6100api/oct6100_errors.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 205 $
 
diff --git a/software/include/oct6100api/oct6100_events_inst.h b/software/include/oct6100api/oct6100_events_inst.h
index fba4f02..323cd5b 100644
--- a/software/include/oct6100api/oct6100_events_inst.h
+++ b/software/include/oct6100api/oct6100_events_inst.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 12 $
 
diff --git a/software/include/oct6100api/oct6100_events_pub.h b/software/include/oct6100api/oct6100_events_pub.h
index 59261b8..4ee131a 100644
--- a/software/include/oct6100api/oct6100_events_pub.h
+++ b/software/include/oct6100api/oct6100_events_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 14 $
 
diff --git a/software/include/oct6100api/oct6100_interrupts_inst.h b/software/include/oct6100api/oct6100_interrupts_inst.h
index 55a3b4d..fc82cdd 100644
--- a/software/include/oct6100api/oct6100_interrupts_inst.h
+++ b/software/include/oct6100api/oct6100_interrupts_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 16 $
 
diff --git a/software/include/oct6100api/oct6100_interrupts_pub.h b/software/include/oct6100api/oct6100_interrupts_pub.h
index e8e082c..a90fdcf 100644
--- a/software/include/oct6100api/oct6100_interrupts_pub.h
+++ b/software/include/oct6100api/oct6100_interrupts_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 23 $
 
diff --git a/software/include/oct6100api/oct6100_mixer_inst.h b/software/include/oct6100api/oct6100_mixer_inst.h
index 4d13618..1415e86 100644
--- a/software/include/oct6100api/oct6100_mixer_inst.h
+++ b/software/include/oct6100api/oct6100_mixer_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 13 $
 
diff --git a/software/include/oct6100api/oct6100_mixer_pub.h b/software/include/oct6100api/oct6100_mixer_pub.h
index 954fc18..08aa28b 100644
--- a/software/include/oct6100api/oct6100_mixer_pub.h
+++ b/software/include/oct6100api/oct6100_mixer_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 7 $
 
diff --git a/software/include/oct6100api/oct6100_phasing_tsst_inst.h b/software/include/oct6100api/oct6100_phasing_tsst_inst.h
index 2bc5fd4..a2b2e27 100644
--- a/software/include/oct6100api/oct6100_phasing_tsst_inst.h
+++ b/software/include/oct6100api/oct6100_phasing_tsst_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 11 $
 
diff --git a/software/include/oct6100api/oct6100_phasing_tsst_pub.h b/software/include/oct6100api/oct6100_phasing_tsst_pub.h
index 4bcf055..b5af946 100644
--- a/software/include/oct6100api/oct6100_phasing_tsst_pub.h
+++ b/software/include/oct6100api/oct6100_phasing_tsst_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 10 $
 
diff --git a/software/include/oct6100api/oct6100_playout_buf_inst.h b/software/include/oct6100api/oct6100_playout_buf_inst.h
index 4e06387..046a639 100644
--- a/software/include/oct6100api/oct6100_playout_buf_inst.h
+++ b/software/include/oct6100api/oct6100_playout_buf_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 10 $
 
diff --git a/software/include/oct6100api/oct6100_playout_buf_pub.h b/software/include/oct6100api/oct6100_playout_buf_pub.h
index 60fd9e2..9fe0d6f 100644
--- a/software/include/oct6100api/oct6100_playout_buf_pub.h
+++ b/software/include/oct6100api/oct6100_playout_buf_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 21 $
 
diff --git a/software/include/oct6100api/oct6100_remote_debug_inst.h b/software/include/oct6100api/oct6100_remote_debug_inst.h
index 7167655..85a8d39 100644
--- a/software/include/oct6100api/oct6100_remote_debug_inst.h
+++ b/software/include/oct6100api/oct6100_remote_debug_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 6 $
 
diff --git a/software/include/oct6100api/oct6100_remote_debug_pub.h b/software/include/oct6100api/oct6100_remote_debug_pub.h
index cda0319..18a7e22 100644
--- a/software/include/oct6100api/oct6100_remote_debug_pub.h
+++ b/software/include/oct6100api/oct6100_remote_debug_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 6 $
 
diff --git a/software/include/oct6100api/oct6100_tlv_inst.h b/software/include/oct6100api/oct6100_tlv_inst.h
index dad10df..093ce0d 100644
--- a/software/include/oct6100api/oct6100_tlv_inst.h
+++ b/software/include/oct6100api/oct6100_tlv_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 7 $
 
diff --git a/software/include/oct6100api/oct6100_tone_detection_inst.h b/software/include/oct6100api/oct6100_tone_detection_inst.h
index 8fcc826..1ee86fe 100644
--- a/software/include/oct6100api/oct6100_tone_detection_inst.h
+++ b/software/include/oct6100api/oct6100_tone_detection_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 8 $
 
diff --git a/software/include/oct6100api/oct6100_tone_detection_pub.h b/software/include/oct6100api/oct6100_tone_detection_pub.h
index 19574c3..cf28069 100644
--- a/software/include/oct6100api/oct6100_tone_detection_pub.h
+++ b/software/include/oct6100api/oct6100_tone_detection_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 10 $
 
diff --git a/software/include/oct6100api/oct6100_tsi_cnct_inst.h b/software/include/oct6100api/oct6100_tsi_cnct_inst.h
index c8d8737..9eb23ba 100644
--- a/software/include/oct6100api/oct6100_tsi_cnct_inst.h
+++ b/software/include/oct6100api/oct6100_tsi_cnct_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 9 $
 
diff --git a/software/include/oct6100api/oct6100_tsi_cnct_pub.h b/software/include/oct6100api/oct6100_tsi_cnct_pub.h
index a3857ee..c030468 100644
--- a/software/include/oct6100api/oct6100_tsi_cnct_pub.h
+++ b/software/include/oct6100api/oct6100_tsi_cnct_pub.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 11 $
 
diff --git a/software/include/oct6100api/oct6100_tsst_inst.h b/software/include/oct6100api/oct6100_tsst_inst.h
index 6ddc9c3..6b9fe77 100644
--- a/software/include/oct6100api/oct6100_tsst_inst.h
+++ b/software/include/oct6100api/oct6100_tsst_inst.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 5 $
 
diff --git a/software/include/octdef.h b/software/include/octdef.h
index 6f98931..a2da33d 100644
--- a/software/include/octdef.h
+++ b/software/include/octdef.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 12 $
 
diff --git a/software/include/octmac.h b/software/include/octmac.h
index d9ae708..2e930ae 100644
--- a/software/include/octmac.h
+++ b/software/include/octmac.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 14 $
 
diff --git a/software/include/octosdependant.h b/software/include/octosdependant.h
index 9a94fb2..6e797bc 100644
--- a/software/include/octosdependant.h
+++ b/software/include/octosdependant.h
@@ -4,7 +4,7 @@ File: octosdependant.h
 
     Copyright (c) 2001-2007 Octasic Inc.
 
-Description: 
+Description:
 
 	This file is included to set target-specific constants.
 
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
-$Octasic_Revision: 17 $
+$Octasic_Revision: 18 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -63,8 +63,8 @@ extern "C" {
 
 	GCC Compiler
 			__GNUC__		== GCC Compiler
-			__unix__		== Unix system 
-			__vax__			== Unix system 
+			__unix__		== Unix system
+			__vax__			== Unix system
 			unix			== Unix system
 			vax				== vax system
 
@@ -98,7 +98,7 @@ extern "C" {
 	/* Try with cpu type */
 	#if !defined(OCT_MACH_ENDIAN)
 		/* Look for intel */
-		#if defined( _M_IX86 )	
+		#if defined( _M_IX86 )
 			#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN
 		/* Look for PowerPC */
 		#elif defined( _M_MPPC  ) || defined( _M_PPC ) || defined(PPC) || defined(__PPC) || defined(_ARCH_PPC)
@@ -107,17 +107,17 @@ extern "C" {
 			#if CPU==PPC860 || CPU==SIMNT
 				#define OCT_MACH_ENDIAN		OCT_MACH_BIG_ENDIAN
 			#else
-				#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN	
+				#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN
 			#endif
 		#else
-			#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN	
+			#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN
 		#endif
 	#endif
 #else
 	#if defined( MACH_TYPE_BIG_ENDIAN )
 		#define OCT_MACH_ENDIAN		OCT_MACH_BIG_ENDIAN
 	#else
-		#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN	
+		#define OCT_MACH_ENDIAN		OCT_MACH_LITTLE_ENDIAN
 	#endif
 #endif
 
@@ -134,7 +134,9 @@ extern "C" {
 #elif defined( _VXWORKS_ )
 	#define OCT_VXENV
 #elif defined( _ECOS_ )
+#ifndef OCT_ECOSENV
 	#define OCT_ECOSENV
+#endif /* OCT_ECOSENV */
 #elif defined( _SOLARIS_ )
 	#define OCT_SOLARISENV
 #elif defined( _LINUX_ )
diff --git a/software/include/octrpc/oct6100_rpc_protocol.h b/software/include/octrpc/oct6100_rpc_protocol.h
index 0ee0f5f..fcee581 100644
--- a/software/include/octrpc/oct6100_rpc_protocol.h
+++ b/software/include/octrpc/oct6100_rpc_protocol.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 6 $
 
diff --git a/software/include/octrpc/rpc_protocol.h b/software/include/octrpc/rpc_protocol.h
index 6b17ee3..24e1596 100644
--- a/software/include/octrpc/rpc_protocol.h
+++ b/software/include/octrpc/rpc_protocol.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 23 $
 
diff --git a/software/include/octtype.h b/software/include/octtype.h
index 74c8418..4400570 100644
--- a/software/include/octtype.h
+++ b/software/include/octtype.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 18 $
 
diff --git a/software/include/octtypevx.h b/software/include/octtypevx.h
index a5e9d55..6588ae2 100644
--- a/software/include/octtypevx.h
+++ b/software/include/octtypevx.h
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 9 $
 
diff --git a/software/include/octtypewin.h b/software/include/octtypewin.h
index 357b348..8bdd690 100644
--- a/software/include/octtypewin.h
+++ b/software/include/octtypewin.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 16 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h
index 88d8e92..a078070 100644
--- a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $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 94f4495..aec4c5e 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 16 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c
index 4536ad4..0fe36d5 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
-$Octasic_Revision: 491 $
+$Octasic_Revision: 492 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -9556,7 +9556,7 @@ UINT32 Oct6100ApiWriteVqeNlpMemory(
 			ulTempData &= (~ulMask);
 			
 			/*If we support ANR level the TLV is shared over 2 bits*/
-			if (pSharedInfo->ImageInfo.fRoutNoiseReductionLevel == TRUE)
+			if (ulFeatureBitOffset == 18)
 			{
 				ulFeatureBitOffset -= 2;
 				ausLookupTable[ f_pVqeConfig->ulNonLinearityBehaviorA ] &= 0xFFFC;
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
index ccf6110..0afcc40 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 347 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
index 346005a..0a51835 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 89 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
index 4a30671..63c458a 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c
@@ -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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
-$Octasic_Revision: 145 $
+$Octasic_Revision: 146 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -2100,33 +2100,6 @@ UINT32 Oct6100ApiBridgeEventAdd(
 	}
 	mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pEchoChanEntry, f_usChanIndex );
 
-	/* Configure the SIN copy mixer entry and memory - if using the SOUT port. */
-	if ( ( f_ulInputPort == cOCT6100_CHANNEL_PORT_SOUT ) && ( f_fTap == FALSE ) )
-	{
-		if ( pEchoChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX )
-		{
-			ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance,
-															  pEchoChanEntry->usSinTsstIndex,
-															  pEchoChanEntry->usExtraSinTsiMemIndex,
-															  pEchoChanEntry->TdmConfig.bySinPcmLaw );
-			if ( ulResult != cOCT6100_ERR_OK )
-				return ulResult;
-		}
-
-		/* If the silence TSI is loaded on this port, update with the extra sin TSI. */
-		if ( pEchoChanEntry->usSinSilenceEventIndex != cOCT6100_INVALID_INDEX )
-		{
-			WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( pEchoChanEntry->usSinSilenceEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE );
-
-			WriteParams.ulWriteAddress += 2;
-			WriteParams.usWriteData = pEchoChanEntry->usExtraSinTsiMemIndex;
-
-			mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
-			if ( ulResult != cOCT6100_ERR_OK )
-				return ulResult;
-		}
-	}
-
 	if ( f_fFlexibleConfBridge == TRUE )
 	{
 		tPOCT6100_API_FLEX_CONF_PARTICIPANT pNewParticipant;
@@ -2242,9 +2215,36 @@ UINT32 Oct6100ApiBridgeEventAdd(
 	}
 	else /* if ( f_fFlexibleConfBridge == FALSE ) */
 	{
+		/* Configure the SIN copy mixer entry and memory - if using the SOUT port. */
+		if ( ( f_ulInputPort == cOCT6100_CHANNEL_PORT_SOUT ) && ( f_fTap == FALSE ) )
+		{
+			if ( pEchoChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX )
+			{
+				ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance,
+																  pEchoChanEntry->usSinTsstIndex,
+																  pEchoChanEntry->usExtraSinTsiMemIndex,
+																  pEchoChanEntry->TdmConfig.bySinPcmLaw );
+				if ( ulResult != cOCT6100_ERR_OK )
+					return ulResult;
+			}
+
+			/* If the silence TSI is loaded on this port, update with the extra sin TSI. */
+			if ( pEchoChanEntry->usSinSilenceEventIndex != cOCT6100_INVALID_INDEX )
+			{
+				WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( pEchoChanEntry->usSinSilenceEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE );
+
+				WriteParams.ulWriteAddress += 2;
+				WriteParams.usWriteData = pEchoChanEntry->usExtraSinTsiMemIndex;
+
+				mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+				if ( ulResult != cOCT6100_ERR_OK )
+					return ulResult;
+			}
+		}
+
 		mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pLoadEventEntry, f_usLoadEventIndex );
 		mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pSubStoreEventEntry, f_usSubStoreEventIndex );
-		
+
 		/*=======================================================================*/
 		/* Program the Load event.*/
 		WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( f_usLoadEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE );
@@ -2927,6 +2927,39 @@ UINT32	Oct6100ApiBridgeAddParticipantToChannel(
 	if ( pDestinationParticipant->fFlexibleMixerCreated == FALSE )
 	{
 		/*=======================================================================*/
+		/* Before creating the participant's flexible mixer, make sure the extra Sin */
+		/* mixer event is programmed correctly for sending the voice stream to the right place. */
+
+		/* Configure the SIN copy mixer entry and memory - if using the SOUT port. */
+		if ( f_ulDestinationInputPort == cOCT6100_CHANNEL_PORT_SOUT )
+		{
+			if ( pDestinationChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX )
+			{
+				ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance,
+																  pDestinationChanEntry->usSinTsstIndex,
+																  pDestinationChanEntry->usExtraSinTsiMemIndex,
+																  pDestinationChanEntry->TdmConfig.bySinPcmLaw );
+				if ( ulResult != cOCT6100_ERR_OK )
+					return ulResult;
+			}
+
+			/* If the silence TSI is loaded on this port, update with the extra sin TSI. */
+			if ( pDestinationChanEntry->usSinSilenceEventIndex != cOCT6100_INVALID_INDEX )
+			{
+				WriteParams.ulWriteAddress = cOCT6100_MIXER_CONTROL_MEM_BASE + ( pDestinationChanEntry->usSinSilenceEventIndex * cOCT6100_MIXER_CONTROL_MEM_ENTRY_SIZE );
+
+				WriteParams.ulWriteAddress += 2;
+				WriteParams.usWriteData = pDestinationChanEntry->usExtraSinTsiMemIndex;
+
+				mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult );
+				if ( ulResult != cOCT6100_ERR_OK )
+					return ulResult;
+			}
+		}
+		/*=======================================================================*/
+
+		
+		/*=======================================================================*/
 		/* Program the load event.  This is the first event for this new destination channel. */
 
 		/* First set the TSI buffer where the resulting stream should be written to. */
@@ -4031,6 +4064,11 @@ UINT32 Oct6100ApiBridgeEventRemove (
 				pEchoChanEntry->usExtraSinTsiDependencyCnt--;
 				pEchoChanEntry->usExtraSinTsiMemIndex = cOCT6100_INVALID_INDEX;
 			}
+			else
+			{
+				/* Decrement the dependency count, but do not clear the mem index. */
+				pEchoChanEntry->usExtraSinTsiDependencyCnt--;
+			}
 			
 			/* Indicate that the extra RIN TSI is not needed anymore by the mixer. */
 			if ( pEchoChanEntry->usExtraRinTsiDependencyCnt == 1 )
@@ -4197,6 +4235,11 @@ UINT32 Oct6100ApiBridgeEventRemove (
 						pEchoChanEntry->usExtraSinTsiDependencyCnt--;
 						pEchoChanEntry->usExtraSinTsiMemIndex = cOCT6100_INVALID_INDEX;
 					}
+					else
+					{
+						/* Decrement the dependency count, but do not clear the mem index. */
+						pEchoChanEntry->usExtraSinTsiDependencyCnt--;
+					}
 					
 					/* Indicate that the Extra RIN TSI is not needed anymore by the mixer. */
 					if ( pEchoChanEntry->usExtraRinTsiDependencyCnt == 1 )
@@ -4690,6 +4733,11 @@ UINT32 Oct6100ApiBridgeEventRemove (
 				pEchoChanEntry->usExtraSinTsiDependencyCnt--;
 				pEchoChanEntry->usExtraSinTsiMemIndex = cOCT6100_INVALID_INDEX;
 			}
+			else
+			{
+				/* Decrement the dependency count, but do not clear the mem index. */
+				pEchoChanEntry->usExtraSinTsiDependencyCnt--;
+			}
 
 			/* Update the chip stats structure. */
 			pSharedInfo->ChipStats.usNumEcChanUsingMixer--;
@@ -4868,6 +4916,11 @@ UINT32 Oct6100ApiBridgeEventRemove (
 							pEchoChanEntry->usExtraSinTsiDependencyCnt--;
 							pEchoChanEntry->usExtraSinTsiMemIndex = cOCT6100_INVALID_INDEX;
 						}
+						else
+						{
+							/* Decrement the dependency count, but do not clear the mem index. */
+							pEchoChanEntry->usExtraSinTsiDependencyCnt--;
+						}
 
 						/* Invalidate the channel entry. */
 						pEchoChanEntry->usLoadEventIndex = cOCT6100_INVALID_INDEX;
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
index ac25f81..1f4de01 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
-$Octasic_Revision: 64 $
+$Octasic_Revision: 65 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -257,7 +257,7 @@ UINT32 Oct6100DebugSelectChannelSer(
 		mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pTempChanEntry, pSharedInfo->DebugInfo.usCurrentDebugChanIndex  )
 
 		/* Release the extra TSI memory entry and reprogram the TSST control memory if required. */
-		if ( pTempChanEntry->usExtraSinTsiDependencyCnt == 1 )
+		if ( pTempChanEntry->usExtraSinTsiDependencyCnt >= 1 )
 		{
 			/*=======================================================================*/
 			/* Clear memcpy operations. */
@@ -280,23 +280,30 @@ UINT32 Oct6100DebugSelectChannelSer(
 
 			/*=======================================================================*/
 
-			ulResult = Oct6100ApiReleaseTsiMemEntry( f_pApiInstance, pTempChanEntry->usExtraSinTsiMemIndex );
-			if ( ulResult != cOCT6100_ERR_OK )
-				return ulResult;
-
-			if ( pTempChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX )
+			/* If we are the last dependency using the extra Sin TSI, release it */
+			if ( pTempChanEntry->usExtraSinTsiDependencyCnt == 1 )
 			{
-				ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance,
-																  pTempChanEntry->usSinTsstIndex,
-																  pTempChanEntry->usSinSoutTsiMemIndex,
-																  pTempChanEntry->TdmConfig.bySinPcmLaw );
-			}
+				ulResult = Oct6100ApiReleaseTsiMemEntry( f_pApiInstance, pTempChanEntry->usExtraSinTsiMemIndex );
+				if ( ulResult != cOCT6100_ERR_OK )
+					return ulResult;
 
-			if ( ulResult != cOCT6100_ERR_OK )
-				return ulResult;
+				/* Do not forget to reprogram the TSST control memory. */
+				if ( pTempChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX )
+				{
+					ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance,
+																	  pTempChanEntry->usSinTsstIndex,
+																	  pTempChanEntry->usSinSoutTsiMemIndex,
+																	  pTempChanEntry->TdmConfig.bySinPcmLaw );
+					if ( ulResult != cOCT6100_ERR_OK )
+						return ulResult;
+				}
+				pTempChanEntry->usExtraSinTsiMemIndex = cOCT6100_INVALID_INDEX;
+
+				/* XXX: What about the silence TSI usSinSilenceEventIndex ?? */
+			}
 
 			pTempChanEntry->usExtraSinTsiDependencyCnt--;
-			pTempChanEntry->usExtraSinTsiMemIndex = cOCT6100_INVALID_INDEX;
+			
 		}
 	}
 
@@ -337,12 +344,14 @@ UINT32 Oct6100DebugSelectChannelSer(
 		/* Check if the API needs to reserve an extra TSI memory to load the SIN signal. */
 		if ( pSharedInfo->ChipConfig.fEnableChannelRecording == TRUE )
 		{
+			/* Reserve the extra Sin TSI memory if it was not already reserved. */
 			if ( pChanEntry->usExtraSinTsiMemIndex == cOCT6100_INVALID_INDEX )
 			{
 				ulResult = Oct6100ApiReserveTsiMemEntry( f_pApiInstance, &pChanEntry->usExtraSinTsiMemIndex );
 				if ( ulResult != cOCT6100_ERR_OK )
 					return ulResult;
 
+				/* Reprogram the TSST control memory accordingly. */
 				if ( pChanEntry->usSinTsstIndex != cOCT6100_INVALID_INDEX )
 				{
 					ulResult = Oct6100ApiWriteInputTsstControlMemory( f_pApiInstance,
@@ -352,6 +361,8 @@ UINT32 Oct6100DebugSelectChannelSer(
 					if ( ulResult != cOCT6100_ERR_OK )
 						return ulResult;
 				}
+
+				/* XXX: What about the silence TSI usSinSilenceEventIndex ?? */
 			}
 		
 			
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
index ef7a36b..7fa36d6 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 81 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c
index 4d0cf79..1a7ebc6 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
-$Octasic_Revision: 78 $
+$Octasic_Revision: 81 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -1831,15 +1831,18 @@ UINT32	Oct6100ApiCheckProcessorState(
 	tPOCT6100_SHARED_INFO			pSharedInfo;
 	tOCT6100_READ_PARAMS			ReadParams;
 	tOCT6100_READ_BURST_PARAMS		ReadBurstParams;
+
 	UINT32		ulNlpTimestamp;
 	UINT32		ulAfTimestamp;
 	UINT32		ulTimestampDiff;
 
 	UINT32		ulResult;
 	UINT32		i;
-	
+
 	UINT16		usReadData;
 	UINT16		ausReadData[ 2 ];
+
+	UINT32		aulWaitTime[ 2 ];
 	
 	/* Get local pointer(s). */
 	pSharedInfo = f_pApiInstance->pSharedInfo;
@@ -1947,7 +1950,7 @@ UINT32	Oct6100ApiCheckProcessorState(
 
 	/*-----------------------------------------------------------------------*/
 	/* Check the validity of the timestamp. */
-
+	
 	if ( ulAfTimestamp > ulNlpTimestamp )
 	{
 		/* The NLP timestamp wrapped. */
@@ -1964,6 +1967,43 @@ UINT32	Oct6100ApiCheckProcessorState(
 		pSharedInfo->ErrorStats.fFatalChipError = TRUE;
 	}
 
+	/*Check if AF and NLP are both stuck*/
+	if ( f_pIntFlags->fErrorH100ClkA == FALSE &&
+		 f_pIntFlags->fErrorH100ClkB == FALSE &&
+		 f_pIntFlags->fErrorH100FrameA == FALSE &&
+		 f_pIntFlags->fErrorH100OutOfSync == FALSE )
+		
+	{
+		if ( ulAfTimestamp == 0 && ulNlpTimestamp == 0 )
+		{
+			/*Give some time to the counters*/
+			aulWaitTime[ 0 ] = 250;
+			aulWaitTime[ 1 ] = 0;
+			ulResult = Oct6100ApiWaitForTime( f_pApiInstance, aulWaitTime );
+			if ( ulResult != cOCT6100_ERR_OK )
+				return ulResult;
+
+			/*Let's read again the AF timestamp to be sure. Maybe they were at 0 at the same time*/
+			ReadBurstParams.ulReadAddress	= 0x082E0008;
+			ReadBurstParams.ulReadLength	= 2;
+
+			mOCT6100_DRIVER_READ_BURST_API( ReadBurstParams, ulResult )
+			if ( ulResult != cOCT6100_ERR_OK )
+			return ulResult;
+
+			ulAfTimestamp = (ausReadData[ 0 ] << 16) | ausReadData[ 1 ];
+	
+			if ( ulAfTimestamp == 0 )
+			{
+				/*TDM Clocks are ok but NLP and AF timestamps are both at 0*/
+				f_pIntFlags->ulFatalGeneralFlags |= cOCT6100_FATAL_GENERAL_ERROR_TYPE_9;
+				f_pIntFlags->fFatalGeneral = TRUE;
+				pSharedInfo->ErrorStats.fFatalChipError = TRUE;
+			}
+		}
+			
+	}
+
 	/*-----------------------------------------------------------------------*/
 
 	return cOCT6100_ERR_OK;
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c
index 8580249..b2c0e8e 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 42 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c
index 0648d31..4e5c189 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 35 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c
index d88e706..05aff3b 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $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 2f1ac92..5d27c3c 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 46 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c
index 5c3bdbf..57fda7c 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $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 1c7e9f0..8afb2f9 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 35 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
index 3569865..7f3182b 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c
@@ -24,7 +24,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 113 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
index acefeae..6d9c82b 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c
@@ -23,7 +23,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 51 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
index 6c4c540..e885aa4 100644
--- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
+++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with the OCT6100 GPL API; if not, write to the Free Software 
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$Octasic_Release: OCT612xAPI-01.00-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 38 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c
index 4468e35..02fbd8f 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 39 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c
index 5d57695..9d0e317 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 28 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c
index 3dc4cc3..a93db97 100644
--- a/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c
+++ b/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 8 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h b/software/octdeviceapi/oct6100api/oct6100_channel_priv.h
index 9616e8b..cd55191 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 62 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h
index 0ee2eee..46a13e3 100644
--- a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_chip_open_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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 63 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h
index 4fe9d38..6c36163 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 8 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h
index c1d9f40..071e645 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 30 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_debug_priv.h
index a39c590..44a9a21 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 12 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_events_priv.h b/software/octdeviceapi/oct6100api/oct6100_events_priv.h
index 808809c..fd3980a 100644
--- a/software/octdeviceapi/oct6100api/oct6100_events_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_events_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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 14 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h b/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h
index 019d7d1..d29f1b0 100644
--- a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_interrupts_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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 11 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h
index 59ed600..77eed5e 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 17 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h b/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h
index c4e24e3..dba94fd 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 20 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h
index ad273c0..b6a7a34 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 18 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h
index a31cc07..e17ab8b 100644
--- a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 12 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h
index d58a2c2..a69e942 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 22 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h
index 18bfea6..c599ee9 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 13 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h b/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h
index 4e824c1..e1982bd 100644
--- a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_tlv_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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 58 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h b/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h
index 8cd296d..c3192c2 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 14 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h
index 8ccc542..b7c57f3 100644
--- a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h
+++ b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 14 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h
index 317df1b..ca080b3 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
 $Octasic_Revision: 14 $
 
diff --git a/software/octdeviceapi/oct6100api/oct6100_version.h b/software/octdeviceapi/oct6100api/oct6100_version.h
index 74cf3c0..7b3eb5d 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-PR48 $
+$Octasic_Release: OCT612xAPI-01.00-PR49 $
 
-$Octasic_Revision: 51 $
+$Octasic_Revision: 52 $
 
 \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 
@@ -34,6 +34,6 @@ $Octasic_Revision: 51 $
 
 /* String version of the OCT6100 API.*/
 
-#define cOCT6100_API_VERSION "OCT6100API-01.00-PR48"
+#define cOCT6100_API_VERSION "OCT6100API-01.00-PR49"
 
 #endif /* __OCT6100_VERSION_H__ */