From 543281d15d1c725f1e7be06b4bd542f3ff368f1c Mon Sep 17 00:00:00 2001 From: Octasic Inc Date: Fri, 20 May 2011 10:56:30 +0300 Subject: importing OCT612x-01.04.06 --- ReleaseNotes.txt | 46 +++++++++++++ doc/oct612Xas5000-041.pdf | Bin 818671 -> 0 bytes doc/oct612Xas5000-042.pdf | Bin 0 -> 821644 bytes software/apilib/bt/octapi_bt0.c | 2 +- software/apilib/bt/octapi_bt0_private.h | 2 +- software/apilib/largmath/octapi_largmath.c | 2 +- software/apilib/llman/octapi_llman.c | 2 +- software/apilib/llman/octapi_llman_private.h | 2 +- software/include/apilib/octapi_bt0.h | 2 +- software/include/apilib/octapi_largmath.h | 2 +- software/include/apilib/octapi_llman.h | 2 +- .../include/oct6100api/oct6100_adpcm_chan_inst.h | 2 +- .../include/oct6100api/oct6100_adpcm_chan_pub.h | 2 +- software/include/oct6100api/oct6100_api.h | 2 +- software/include/oct6100api/oct6100_api_inst.h | 2 +- software/include/oct6100api/oct6100_apimi.h | 2 +- software/include/oct6100api/oct6100_apiud.h | 2 +- software/include/oct6100api/oct6100_channel_inst.h | 2 +- software/include/oct6100api/oct6100_channel_pub.h | 2 +- .../include/oct6100api/oct6100_chip_open_inst.h | 2 +- .../include/oct6100api/oct6100_chip_open_pub.h | 2 +- .../include/oct6100api/oct6100_chip_stats_inst.h | 2 +- .../include/oct6100api/oct6100_chip_stats_pub.h | 2 +- .../include/oct6100api/oct6100_conf_bridge_inst.h | 2 +- .../include/oct6100api/oct6100_conf_bridge_pub.h | 2 +- software/include/oct6100api/oct6100_debug_inst.h | 2 +- software/include/oct6100api/oct6100_debug_pub.h | 2 +- software/include/oct6100api/oct6100_defines.h | 2 +- software/include/oct6100api/oct6100_errors.h | 2 +- software/include/oct6100api/oct6100_events_inst.h | 2 +- software/include/oct6100api/oct6100_events_pub.h | 2 +- .../include/oct6100api/oct6100_interrupts_inst.h | 2 +- .../include/oct6100api/oct6100_interrupts_pub.h | 2 +- software/include/oct6100api/oct6100_mixer_inst.h | 2 +- software/include/oct6100api/oct6100_mixer_pub.h | 2 +- .../include/oct6100api/oct6100_phasing_tsst_inst.h | 2 +- .../include/oct6100api/oct6100_phasing_tsst_pub.h | 2 +- .../include/oct6100api/oct6100_playout_buf_inst.h | 2 +- .../include/oct6100api/oct6100_playout_buf_pub.h | 2 +- .../include/oct6100api/oct6100_remote_debug_inst.h | 2 +- .../include/oct6100api/oct6100_remote_debug_pub.h | 2 +- software/include/oct6100api/oct6100_tlv_inst.h | 2 +- .../oct6100api/oct6100_tone_detection_inst.h | 2 +- .../oct6100api/oct6100_tone_detection_pub.h | 2 +- .../include/oct6100api/oct6100_tsi_cnct_inst.h | 2 +- software/include/oct6100api/oct6100_tsi_cnct_pub.h | 2 +- software/include/oct6100api/oct6100_tsst_inst.h | 2 +- software/include/octdef.h | 2 +- software/include/octmac.h | 2 +- software/include/octosdependant.h | 2 +- software/include/octrpc/oct6100_rpc_protocol.h | 2 +- software/include/octrpc/rpc_protocol.h | 2 +- software/include/octtype.h | 2 +- software/include/octtypevx.h | 2 +- software/include/octtypewin.h | 2 +- .../oct6100api/oct6100_adpcm_chan_priv.h | 2 +- .../oct6100api/oct6100_api/oct6100_adpcm_chan.c | 2 +- .../oct6100api/oct6100_api/oct6100_channel.c | 76 ++++++++++++++------- .../oct6100api/oct6100_api/oct6100_chip_open.c | 4 +- .../oct6100api/oct6100_api/oct6100_chip_stats.c | 2 +- .../oct6100api/oct6100_api/oct6100_conf_bridge.c | 2 +- .../oct6100api/oct6100_api/oct6100_debug.c | 2 +- .../oct6100api/oct6100_api/oct6100_events.c | 2 +- .../oct6100api/oct6100_api/oct6100_interrupts.c | 2 +- .../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 | 2 +- .../oct6100api/oct6100_api/oct6100_playout_buf.c | 2 +- .../oct6100api/oct6100_api/oct6100_remote_debug.c | 2 +- .../oct6100api/oct6100_api/oct6100_tlv.c | 2 +- .../oct6100_api/oct6100_tone_detection.c | 2 +- .../oct6100api/oct6100_api/oct6100_tsi_cnct.c | 2 +- .../oct6100api/oct6100_api/oct6100_tsst.c | 2 +- .../oct6100api/oct6100_api/oct6100_user.c | 2 +- .../oct6100_apimi/oct6100_mask_interrupts.c | 2 +- .../octdeviceapi/oct6100api/oct6100_channel_priv.h | 2 +- .../oct6100api/oct6100_chip_open_priv.h | 2 +- .../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 | 2 +- .../oct6100api/oct6100_interrupts_priv.h | 2 +- .../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 | 2 +- .../oct6100api/oct6100_playout_buf_priv.h | 2 +- .../oct6100api/oct6100_remote_debug_priv.h | 2 +- .../octdeviceapi/oct6100api/oct6100_tlv_priv.h | 2 +- .../oct6100api/oct6100_tone_detection_priv.h | 2 +- .../oct6100api/oct6100_tsi_cnct_priv.h | 2 +- .../octdeviceapi/oct6100api/oct6100_tsst_priv.h | 2 +- software/octdeviceapi/oct6100api/oct6100_version.h | 6 +- 94 files changed, 191 insertions(+), 117 deletions(-) delete mode 100644 doc/oct612Xas5000-041.pdf create mode 100644 doc/oct612Xas5000-042.pdf diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index bc3757c..edcb034 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,49 @@ +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + + RELEASE NOTES + +Version: OCT6100API-01.04.06 + +Date: May 06, 2011 + +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + +1.0 BACKWARD COMPATIBILITY NOTICE + +- Rout Noise Reduction features are no more supported +- Stop events on 2100Hz are only supported from firmware 01.06.00. + +------------------------------------------------------------------------------- + +2.0 MODIFICATIONS DONE SINCE LAST RELEASE + +PR-9747: The lDefaultErlDb parameter can now be set down to -30dB. + +------------------------------------------------------------------------------- + +3.0 BUGS FIXED IN THIS RELEASE + +PR-9746: The recorded SOUT data may not be correct when using the Dynamic + Recording feature. + +------------------------------------------------------------------------------- + +4.0 KNOWN BUGS PRESENT IN THIS RELEASE + +NONE + +------------------------------------------------------------------------------- + +5.0 KNOWN ISSUES PRESENT IN THIS RELEASE + +PR-5157 : 16-bit architectures are not supported by the API. + +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + + ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- diff --git a/doc/oct612Xas5000-041.pdf b/doc/oct612Xas5000-041.pdf deleted file mode 100644 index 17c3052..0000000 Binary files a/doc/oct612Xas5000-041.pdf and /dev/null differ diff --git a/doc/oct612Xas5000-042.pdf b/doc/oct612Xas5000-042.pdf new file mode 100644 index 0000000..25587fa Binary files /dev/null and b/doc/oct612Xas5000-042.pdf differ diff --git a/software/apilib/bt/octapi_bt0.c b/software/apilib/bt/octapi_bt0.c index 687e8ab..a67fdf3 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 18 $ diff --git a/software/apilib/bt/octapi_bt0_private.h b/software/apilib/bt/octapi_bt0_private.h index 8dcb6a1..02f6f39 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 11 $ diff --git a/software/apilib/largmath/octapi_largmath.c b/software/apilib/largmath/octapi_largmath.c index 2bdddcb..a8bfe7a 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 10 $ diff --git a/software/apilib/llman/octapi_llman.c b/software/apilib/llman/octapi_llman.c index 59dcc89..0904fe7 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 22 $ diff --git a/software/apilib/llman/octapi_llman_private.h b/software/apilib/llman/octapi_llman_private.h index 2d93406..05d8318 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 13 $ diff --git a/software/include/apilib/octapi_bt0.h b/software/include/apilib/octapi_bt0.h index 35f9495..9536ebc 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 11 $ diff --git a/software/include/apilib/octapi_largmath.h b/software/include/apilib/octapi_largmath.h index 38b29be..9ed3bef 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 6 $ diff --git a/software/include/apilib/octapi_llman.h b/software/include/apilib/octapi_llman.h index 00ea60d..3b6541e 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 8 $ diff --git a/software/include/oct6100api/oct6100_adpcm_chan_inst.h b/software/include/oct6100api/oct6100_adpcm_chan_inst.h index d6ee07d..cd82933 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 6 $ diff --git a/software/include/oct6100api/oct6100_adpcm_chan_pub.h b/software/include/oct6100api/oct6100_adpcm_chan_pub.h index d290b37..6370237 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 5 $ diff --git a/software/include/oct6100api/oct6100_api.h b/software/include/oct6100api/oct6100_api.h index 8a6e3ec..f0f55d3 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 23 $ diff --git a/software/include/oct6100api/oct6100_api_inst.h b/software/include/oct6100api/oct6100_api_inst.h index 0f87331..ee9d3f5 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 42 $ diff --git a/software/include/oct6100api/oct6100_apimi.h b/software/include/oct6100api/oct6100_apimi.h index d51c602..708076b 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 6 $ diff --git a/software/include/oct6100api/oct6100_apiud.h b/software/include/oct6100api/oct6100_apiud.h index 6faa2bf..a81d835 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 16 $ diff --git a/software/include/oct6100api/oct6100_channel_inst.h b/software/include/oct6100api/oct6100_channel_inst.h index 2a1e095..24b1a71 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 92 $ diff --git a/software/include/oct6100api/oct6100_channel_pub.h b/software/include/oct6100api/oct6100_channel_pub.h index 0938299..f305f91 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 93 $ diff --git a/software/include/oct6100api/oct6100_chip_open_inst.h b/software/include/oct6100api/oct6100_chip_open_inst.h index 7f03acd..030edee 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 138 $ diff --git a/software/include/oct6100api/oct6100_chip_open_pub.h b/software/include/oct6100api/oct6100_chip_open_pub.h index 0f3cb92..165217d 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 62 $ diff --git a/software/include/oct6100api/oct6100_chip_stats_inst.h b/software/include/oct6100api/oct6100_chip_stats_inst.h index bc35c7a..1529fe7 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 28 $ diff --git a/software/include/oct6100api/oct6100_chip_stats_pub.h b/software/include/oct6100api/oct6100_chip_stats_pub.h index 7023e19..e6f46a1 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 68 $ diff --git a/software/include/oct6100api/oct6100_conf_bridge_inst.h b/software/include/oct6100api/oct6100_conf_bridge_inst.h index 5f66592..a2077a9 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 19 $ diff --git a/software/include/oct6100api/oct6100_conf_bridge_pub.h b/software/include/oct6100api/oct6100_conf_bridge_pub.h index bccb15b..3e47f24 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 22 $ diff --git a/software/include/oct6100api/oct6100_debug_inst.h b/software/include/oct6100api/oct6100_debug_inst.h index c5db585..2a5df4d 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 15 $ diff --git a/software/include/oct6100api/oct6100_debug_pub.h b/software/include/oct6100api/oct6100_debug_pub.h index 1ba50e5..1182a09 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 14 $ diff --git a/software/include/oct6100api/oct6100_defines.h b/software/include/oct6100api/oct6100_defines.h index 5a13c41..225d274 100644 --- a/software/include/oct6100api/oct6100_defines.h +++ b/software/include/oct6100api/oct6100_defines.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.7 -$Octasic_Release: OCT612xAPI-01.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 180 $ diff --git a/software/include/oct6100api/oct6100_errors.h b/software/include/oct6100api/oct6100_errors.h index 8cdc812..8834492 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 221 $ diff --git a/software/include/oct6100api/oct6100_events_inst.h b/software/include/oct6100api/oct6100_events_inst.h index cfe302d..517f1c5 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 12 $ diff --git a/software/include/oct6100api/oct6100_events_pub.h b/software/include/oct6100api/oct6100_events_pub.h index 341b830..9d59953 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 14 $ diff --git a/software/include/oct6100api/oct6100_interrupts_inst.h b/software/include/oct6100api/oct6100_interrupts_inst.h index cb1682a..729cb22 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 23 $ diff --git a/software/include/oct6100api/oct6100_interrupts_pub.h b/software/include/oct6100api/oct6100_interrupts_pub.h index 959d59d..4d05dd7 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 29 $ diff --git a/software/include/oct6100api/oct6100_mixer_inst.h b/software/include/oct6100api/oct6100_mixer_inst.h index 047ca76..fe4dd00 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 13 $ diff --git a/software/include/oct6100api/oct6100_mixer_pub.h b/software/include/oct6100api/oct6100_mixer_pub.h index 1c879f1..390e02b 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 7 $ diff --git a/software/include/oct6100api/oct6100_phasing_tsst_inst.h b/software/include/oct6100api/oct6100_phasing_tsst_inst.h index 958a743..f8a346c 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 11 $ diff --git a/software/include/oct6100api/oct6100_phasing_tsst_pub.h b/software/include/oct6100api/oct6100_phasing_tsst_pub.h index 5041188..9356412 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 10 $ diff --git a/software/include/oct6100api/oct6100_playout_buf_inst.h b/software/include/oct6100api/oct6100_playout_buf_inst.h index db67261..25ba577 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 10 $ diff --git a/software/include/oct6100api/oct6100_playout_buf_pub.h b/software/include/oct6100api/oct6100_playout_buf_pub.h index 6cd0138..4257a24 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 21 $ diff --git a/software/include/oct6100api/oct6100_remote_debug_inst.h b/software/include/oct6100api/oct6100_remote_debug_inst.h index f06e8a7..174acb3 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 6 $ diff --git a/software/include/oct6100api/oct6100_remote_debug_pub.h b/software/include/oct6100api/oct6100_remote_debug_pub.h index ab80fe8..1aab547 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 6 $ diff --git a/software/include/oct6100api/oct6100_tlv_inst.h b/software/include/oct6100api/oct6100_tlv_inst.h index efd8a30..77ba6c7 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 7 $ diff --git a/software/include/oct6100api/oct6100_tone_detection_inst.h b/software/include/oct6100api/oct6100_tone_detection_inst.h index 17e92aa..8271f66 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 8 $ diff --git a/software/include/oct6100api/oct6100_tone_detection_pub.h b/software/include/oct6100api/oct6100_tone_detection_pub.h index cf8ed5d..0017851 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 10 $ diff --git a/software/include/oct6100api/oct6100_tsi_cnct_inst.h b/software/include/oct6100api/oct6100_tsi_cnct_inst.h index e9d6536..75a995f 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 9 $ diff --git a/software/include/oct6100api/oct6100_tsi_cnct_pub.h b/software/include/oct6100api/oct6100_tsi_cnct_pub.h index dc0f2b3..f350035 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 11 $ diff --git a/software/include/oct6100api/oct6100_tsst_inst.h b/software/include/oct6100api/oct6100_tsst_inst.h index 58cdccb..de22183 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 5 $ diff --git a/software/include/octdef.h b/software/include/octdef.h index 9eed89f..852f1f4 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 12 $ diff --git a/software/include/octmac.h b/software/include/octmac.h index cf9e07f..5aa34d6 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 14 $ diff --git a/software/include/octosdependant.h b/software/include/octosdependant.h index 706e5ca..d7752c4 100644 --- a/software/include/octosdependant.h +++ b/software/include/octosdependant.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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 20 $ diff --git a/software/include/octrpc/oct6100_rpc_protocol.h b/software/include/octrpc/oct6100_rpc_protocol.h index acb8e1e..6936784 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 6 $ diff --git a/software/include/octrpc/rpc_protocol.h b/software/include/octrpc/rpc_protocol.h index 657bb5c..6b2f76f 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 23 $ diff --git a/software/include/octtype.h b/software/include/octtype.h index 44fe43a..94d23b8 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 18 $ diff --git a/software/include/octtypevx.h b/software/include/octtypevx.h index 907297b..f7ff248 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 9 $ diff --git a/software/include/octtypewin.h b/software/include/octtypewin.h index 8fd0b31..2ace0f4 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 16 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h index 87e1800..483708c 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $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 8a41cea..5282571 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 16 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c index 79801dc..a037aa5 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ -$Octasic_Revision: 524 $ +$Octasic_Revision: 526 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -8143,7 +8143,13 @@ UINT32 Oct6100ApiCheckVqeConfig( ( f_pVqeConfig->lDefaultErlDb != -3 ) && ( f_pVqeConfig->lDefaultErlDb != -6 ) && ( f_pVqeConfig->lDefaultErlDb != -9 ) && - ( f_pVqeConfig->lDefaultErlDb != -12 ) ) + ( f_pVqeConfig->lDefaultErlDb != -12 ) && + ( f_pVqeConfig->lDefaultErlDb != -15 ) && + ( f_pVqeConfig->lDefaultErlDb != -18 ) && + ( f_pVqeConfig->lDefaultErlDb != -21 ) && + ( f_pVqeConfig->lDefaultErlDb != -24 ) && + ( f_pVqeConfig->lDefaultErlDb != -27 ) && + ( f_pVqeConfig->lDefaultErlDb != -30 ) ) return cOCT6100_ERR_CHANNEL_DEFAULT_ERL; /* Validate the Default AEC ERL parameter.*/ @@ -12725,7 +12731,11 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( tPOCT6100_SHARED_INFO pSharedInfo; tOCT6100_WRITE_PARAMS WriteParams; tOCT6100_WRITE_SMEAR_PARAMS SmearParams; - UINT32 ulResult; + tPOCT6100_API_CHANNEL pChanEntry; + UINT32 ulResult; + UINT32 ulTempData; + UINT32 ulBaseAddress; + UINT32 ulOffset; pSharedInfo = f_pApiInstance->pSharedInfo; @@ -12747,6 +12757,9 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( /* We let through even though this could already be disabled.. */ if ( pSharedInfo->DebugInfo.fRecordChanUp == TRUE ) { + /* Obtain a pointer to the new buffer's list entry. */ + mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pChanEntry, pSharedInfo->DebugInfo.usRecordChanIndex ); + /*------------------------------------------------------------------------------*/ /* Deactivate the ECHO control memory entry.*/ @@ -12769,13 +12782,17 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( /*------------------------------------------------------------------------------*/ /* Clear the VQE memory. */ - - SmearParams.ulWriteAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pSharedInfo->DebugInfo.usRecordChanIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x20; - SmearParams.usWriteData = 0x0000; - SmearParams.ulWriteLength = 2; - - mOCT6100_DRIVER_WRITE_SMEAR_API( SmearParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) + + ulBaseAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pSharedInfo->DebugInfo.usRecordChanIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x20; + ulTempData = 0x0000; + + /* Save the new DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) return ulResult; /*------------------------------------------------------------------------------*/ @@ -12783,12 +12800,16 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( /*------------------------------------------------------------------------------*/ /* Clear the NLP memory. */ - SmearParams.ulWriteAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pSharedInfo->DebugInfo.usRecordChanIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x28; - SmearParams.usWriteData = 0x0000; - SmearParams.ulWriteLength = 2; - - mOCT6100_DRIVER_WRITE_SMEAR_API( SmearParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) + ulBaseAddress = cOCT6100_CHANNEL_ROOT_BASE + ( pSharedInfo->DebugInfo.usRecordChanIndex * cOCT6100_CHANNEL_ROOT_SIZE ) + pSharedInfo->MemoryMap.ulChanRootConfOfst + 0x28; + ulTempData = 0x0000; + + /* Save the new DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) return ulResult; /*------------------------------------------------------------------------------*/ @@ -12796,13 +12817,20 @@ UINT32 Oct6100ApiDisableChannelRecordingSer( /*------------------------------------------------------------------------------*/ /* Clear the AF information memory. */ - SmearParams.ulWriteAddress = pSharedInfo->MemoryMap.ulChanMainMemBase + ( pSharedInfo->DebugInfo.usRecordChanIndex * f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainMemSize ) + f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainIoMemOfst; - SmearParams.usWriteData = 0x0000; - SmearParams.ulWriteLength = 12; - - mOCT6100_DRIVER_WRITE_SMEAR_API( SmearParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + ulBaseAddress = pSharedInfo->MemoryMap.ulChanMainMemBase + ( pSharedInfo->DebugInfo.usRecordChanIndex * f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainMemSize ) + f_pApiInstance->pSharedInfo->MemoryMap.ulChanMainIoMemOfst; + ulTempData = 0x0000; + + for(ulOffset=0; ulOffset<=0x14; ulOffset+=4) + { + /* Save the new DWORD where the field is located.*/ + mOCT6100_SAVE_NLP_CONF_DWORD( f_pApiInstance, + pChanEntry, + ulBaseAddress + ulOffset, + ulTempData, + ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } /*------------------------------------------------------------------------------*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c index 3a88233..bbe5a67 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ -$Octasic_Revision: 388 $ +$Octasic_Revision: 390 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c index 349a3be..02f1d96 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 101 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c index a7a27d6..e19a110 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 149 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c index b1ae4a3..49672fc 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 83 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c index 2095057..0ff687d 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 83 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c index 5f8f255..6361bc6 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 103 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c index e716b4c..802823f 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 42 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c index 66b87e9..597d3cf 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 36 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c index b48b65f..422903e 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 45 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c index ca86709..6e0fa13 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $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 433c87c..6bf2491 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 110 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c index 678cbcb..ac74ec1 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 35 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c index f08a695..9483513 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 120 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c index f23aefc..6b65c9d 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $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 6361cf3..a44ae46 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 38 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c index 798cf74..278014e 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 40 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c index c7f355b..58201a3 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 31 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c index fde359d..2f0f8ca 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 8 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h b/software/octdeviceapi/oct6100api/oct6100_channel_priv.h index 3fbc8a2..6662b2e 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 65 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h index f2b585c..a686cd6 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 63 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h index 86bf117..f4ceb45 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 8 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h index 518c385..4e10981 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 30 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_debug_priv.h index 7ddd518..892d3f2 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 14 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_events_priv.h b/software/octdeviceapi/oct6100api/oct6100_events_priv.h index 6516aab..daab8f7 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 14 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h b/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h index ee2aa10..438c66c 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 13 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h index d6c7030..aac2a03 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 17 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h b/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h index 6782819..50fdf68 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 20 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h index bfc7077..bd08c41 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 18 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h index 0421e22..4e1acda 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 12 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h index 154aa19..7f6d24a 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 22 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h index 3cb9bb3..1e68730 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 13 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h b/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h index 00d2238..010c53c 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 60 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h b/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h index 5f4e60a..08c8366 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 14 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h index 5a2c410..14df69a 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 14 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h index c89eb98..0d21f44 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ $Octasic_Revision: 15 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_version.h b/software/octdeviceapi/oct6100api/oct6100_version.h index 19bc67e..121838e 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.04.05 $ +$Octasic_Release: OCT612xAPI-01.04.06 $ -$Octasic_Revision: 75 $ +$Octasic_Revision: 76 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -34,6 +34,6 @@ $Octasic_Revision: 75 $ /* String version of the OCT6100 API.*/ -#define cOCT6100_API_VERSION "OCT6100API-01.04.05" +#define cOCT6100_API_VERSION "OCT6100API-01.04.06" #endif /* __OCT6100_VERSION_H__ */ -- cgit v1.2.3