From 28d1a12970507987a1e064ec1f59e73c11e65b4e Mon Sep 17 00:00:00 2001 From: Octasic Inc Date: Fri, 2 Jun 2006 17:20:02 +0300 Subject: importing OCT612x-01.00-PR41 --- ReleaseNotes.txt | 49 ++ doc/oct612Xas5000-031.pdf | Bin 694600 -> 0 bytes doc/oct612Xas5000-032.pdf | Bin 0 -> 779372 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 | 6 +- 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 | 7 +- software/include/oct6100api/oct6100_debug_pub.h | 5 +- software/include/oct6100api/oct6100_defines.h | 10 +- software/include/oct6100api/oct6100_errors.h | 8 +- 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 | 8 +- .../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 | 10 +- .../oct6100api/oct6100_adpcm_chan_priv.h | 10 +- .../oct6100api/oct6100_api/oct6100_adpcm_chan.c | 2 +- .../oct6100api/oct6100_api/oct6100_channel.c | 32 +- .../oct6100api/oct6100_api/oct6100_chip_open.c | 21 +- .../oct6100api/oct6100_api/oct6100_chip_stats.c | 2 +- .../oct6100api/oct6100_api/oct6100_conf_bridge.c | 2 +- .../oct6100api/oct6100_api/oct6100_debug.c | 616 ++++++++++++--------- .../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 | 6 +- .../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 | 4 +- .../oct6100_apimi/oct6100_mask_interrupts.c | 2 +- .../octdeviceapi/oct6100api/oct6100_channel_priv.h | 16 +- .../oct6100api/oct6100_chip_open_priv.h | 2 +- .../oct6100api/oct6100_chip_stats_priv.h | 2 +- .../oct6100api/oct6100_conf_bridge_priv.h | 16 +- .../octdeviceapi/oct6100api/oct6100_debug_priv.h | 2 +- .../octdeviceapi/oct6100api/oct6100_events_priv.h | 8 +- .../oct6100api/oct6100_interrupts_priv.h | 2 +- .../octdeviceapi/oct6100api/oct6100_memory_priv.h | 8 +- .../oct6100api/oct6100_miscellaneous_priv.h | 2 +- .../octdeviceapi/oct6100api/oct6100_mixer_priv.h | 16 +- .../oct6100api/oct6100_phasing_tsst_priv.h | 10 +- .../oct6100api/oct6100_playout_buf_priv.h | 10 +- .../oct6100api/oct6100_remote_debug_priv.h | 12 +- .../octdeviceapi/oct6100api/oct6100_tlv_priv.h | 2 +- .../oct6100api/oct6100_tone_detection_priv.h | 2 +- .../oct6100api/oct6100_tsi_cnct_priv.h | 10 +- .../octdeviceapi/oct6100api/oct6100_tsst_priv.h | 12 +- software/octdeviceapi/oct6100api/oct6100_version.h | 6 +- 94 files changed, 623 insertions(+), 427 deletions(-) delete mode 100644 doc/oct612Xas5000-031.pdf create mode 100644 doc/oct612Xas5000-032.pdf diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 450144a..465e461 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,52 @@ +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + + RELEASE NOTES + +Version: OCT6100API-01.00-PR41 + +Date: June 01, 2006 + +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + +1.0 BACKWARD COMPATIBILITY NOTICE + + 1.1 ALL PRODUCTS + Modified function: Oct6100DebugGetData + Added parameters: ulGetDataContent + +------------------------------------------------------------------------------- + +2.0 MODIFICATIONS DONE SINCE LAST RELEASE + +PR-4346: Added new parameter ulGetDataContent to function Oct6100DebugGetData + +------------------------------------------------------------------------------- + +3.0 BUGS FIXED IN THIS RELEASE + +PR-3004 : Compiler warnings in 64-bit operating systems. +PR-4366 : Law conversion not working when Rin tone removal activated. +PR-4375 : Possible infinite loop in Oct6100ChipOpen function. +PR-4512 : Debug channel TSI resource is not released when the channel is closed. + +------------------------------------------------------------------------------- + +4.0 KNOWN BUGS PRESENT IN THIS RELEASE + +NONE + +------------------------------------------------------------------------------- + +5.0 KNOWN ISSUES PRESENT IN THIS RELEASE + +PR-2379 : Problem with the cOCT6100_MIXING_0_DB mode + +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- + + ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- diff --git a/doc/oct612Xas5000-031.pdf b/doc/oct612Xas5000-031.pdf deleted file mode 100644 index 5a9fa3f..0000000 Binary files a/doc/oct612Xas5000-031.pdf and /dev/null differ diff --git a/doc/oct612Xas5000-032.pdf b/doc/oct612Xas5000-032.pdf new file mode 100644 index 0000000..dab1f94 Binary files /dev/null and b/doc/oct612Xas5000-032.pdf differ diff --git a/software/apilib/bt/octapi_bt0.c b/software/apilib/bt/octapi_bt0.c index 1903884..315752e 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 18 $ diff --git a/software/apilib/bt/octapi_bt0_private.h b/software/apilib/bt/octapi_bt0_private.h index 616796a..f42b59e 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 11 $ diff --git a/software/apilib/largmath/octapi_largmath.c b/software/apilib/largmath/octapi_largmath.c index 81b25de..08b2a31 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 10 $ diff --git a/software/apilib/llman/octapi_llman.c b/software/apilib/llman/octapi_llman.c index c148eae..b622c45 100644 --- a/software/apilib/llman/octapi_llman.c +++ b/software/apilib/llman/octapi_llman.c @@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 21 $ +$Octasic_Revision: 22 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #include "octapi_llman_private.h" @@ -2675,7 +2675,7 @@ VOID * OctApiLlmMemCpy( VOID *f_pvDestination, const VOID * f_pvSource, UINT32 f * then punt into the byte copy loop. This should be rare. */ if ( ( f_ulSize < sizeof(UINT32) ) - || ( ( (UINT32)( pbySrc ) & ( sizeof(UINT32) - 1 ) ) | ( (UINT32)( pbyDst ) & ( sizeof(UINT32) - 1 ) ) ) ) + || ( ( (unsigned long)( pbySrc ) & ( sizeof(UINT32) - 1 ) ) | ( (unsigned long)( pbyDst ) & ( sizeof(UINT32) - 1 ) ) ) ) { while ( f_ulSize-- ) *pbyDst++ = *pbySrc++; diff --git a/software/apilib/llman/octapi_llman_private.h b/software/apilib/llman/octapi_llman_private.h index 8de445e..a370a85 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 13 $ diff --git a/software/include/apilib/octapi_bt0.h b/software/include/apilib/octapi_bt0.h index e03e17d..cfd8746 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 11 $ diff --git a/software/include/apilib/octapi_largmath.h b/software/include/apilib/octapi_largmath.h index e44cd73..7464e6b 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 6 $ diff --git a/software/include/apilib/octapi_llman.h b/software/include/apilib/octapi_llman.h index e32403b..470b8a1 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 8 $ diff --git a/software/include/oct6100api/oct6100_adpcm_chan_inst.h b/software/include/oct6100api/oct6100_adpcm_chan_inst.h index f5c1d97..9d2cab0 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 5 $ diff --git a/software/include/oct6100api/oct6100_adpcm_chan_pub.h b/software/include/oct6100api/oct6100_adpcm_chan_pub.h index 10268fe..fb22097 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 4 $ diff --git a/software/include/oct6100api/oct6100_api.h b/software/include/oct6100api/oct6100_api.h index 14479d6..10d643e 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 22 $ diff --git a/software/include/oct6100api/oct6100_api_inst.h b/software/include/oct6100api/oct6100_api_inst.h index 922e572..8f2fd45 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 39 $ diff --git a/software/include/oct6100api/oct6100_apimi.h b/software/include/oct6100api/oct6100_apimi.h index c0df29b..616c30a 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 5 $ diff --git a/software/include/oct6100api/oct6100_apiud.h b/software/include/oct6100api/oct6100_apiud.h index d7d505d..9b60430 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 15 $ diff --git a/software/include/oct6100api/oct6100_channel_inst.h b/software/include/oct6100api/oct6100_channel_inst.h index fb31c5e..8dec298 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 87 $ diff --git a/software/include/oct6100api/oct6100_channel_pub.h b/software/include/oct6100api/oct6100_channel_pub.h index 4fddb02..fb29f47 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 82 $ diff --git a/software/include/oct6100api/oct6100_chip_open_inst.h b/software/include/oct6100api/oct6100_chip_open_inst.h index 03b5c1b..789152d 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 118 $ diff --git a/software/include/oct6100api/oct6100_chip_open_pub.h b/software/include/oct6100api/oct6100_chip_open_pub.h index 1c4358a..92f951c 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 48 $ diff --git a/software/include/oct6100api/oct6100_chip_stats_inst.h b/software/include/oct6100api/oct6100_chip_stats_inst.h index ef46b55..bc64d0f 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 21 $ diff --git a/software/include/oct6100api/oct6100_chip_stats_pub.h b/software/include/oct6100api/oct6100_chip_stats_pub.h index 69aee49..bbcf390 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 57 $ diff --git a/software/include/oct6100api/oct6100_conf_bridge_inst.h b/software/include/oct6100api/oct6100_conf_bridge_inst.h index 12723b0..67d9fb0 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 19 $ diff --git a/software/include/oct6100api/oct6100_conf_bridge_pub.h b/software/include/oct6100api/oct6100_conf_bridge_pub.h index 2f2983d..e0dadd2 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 22 $ diff --git a/software/include/oct6100api/oct6100_debug_inst.h b/software/include/oct6100api/oct6100_debug_inst.h index f5ea3d7..71a8ea3 100644 --- a/software/include/oct6100api/oct6100_debug_inst.h +++ b/software/include/oct6100api/oct6100_debug_inst.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 9 $ +$Octasic_Revision: 10 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -116,6 +116,9 @@ typedef struct _OCT6100_API_DEBUG_ /* AF events control block size. */ UINT32 ulAfEventCbByteSize; + /* Current user selected data mode. Must be kept constant throughout a debug session. */ + UINT32 ulCurrentGetDataMode; + } tOCT6100_API_DEBUG, *tPOCT6100_API_DEBUG; #endif /* __OCT6100_DEBUG_INST_H__ */ diff --git a/software/include/oct6100api/oct6100_debug_pub.h b/software/include/oct6100api/oct6100_debug_pub.h index 08eb4d3..94216c2 100644 --- a/software/include/oct6100api/oct6100_debug_pub.h +++ b/software/include/oct6100api/oct6100_debug_pub.h @@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 13 $ +$Octasic_Revision: 14 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -50,6 +50,7 @@ typedef struct _OCT6100_DEBUG_SELECT_CHANNEL_ typedef struct _OCT6100_DEBUG_GET_DATA_ { UINT32 ulGetDataMode; + UINT32 ulGetDataContent; UINT32 ulRemainingNumBytes; UINT32 ulTotalNumBytes; UINT32 ulMaxBytes; diff --git a/software/include/oct6100api/oct6100_defines.h b/software/include/oct6100api/oct6100_defines.h index ce9c220..2115028 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 165 $ +$Octasic_Revision: 166 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -615,6 +615,12 @@ $Octasic_Revision: 165 $ #define cOCT6100_DEBUG_GET_DATA_MODE_16S 0x2 #define cOCT6100_DEBUG_GET_DATA_MODE_120S 0x3 +/* Debug get data dump content. */ +#define cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE 0x0 /* Full binary dump to be sent for support. */ +#define cOCT6100_DEBUG_GET_DATA_CONTENT_RIN_PCM 0x1 /* Only Rin PCM stream data. */ +#define cOCT6100_DEBUG_GET_DATA_CONTENT_SIN_PCM 0x2 /* Only Sin PCM stream data. */ +#define cOCT6100_DEBUG_GET_DATA_CONTENT_SOUT_PCM 0x3 /* Only Sout PCM stream data. */ + #define cOCT6100_BIST_IN_PROGRESS 0x0 diff --git a/software/include/oct6100api/oct6100_errors.h b/software/include/oct6100api/oct6100_errors.h index 3a25674..150aa55 100644 --- a/software/include/oct6100api/oct6100_errors.h +++ b/software/include/oct6100api/oct6100_errors.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. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 194 $ +$Octasic_Revision: 196 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -521,7 +521,8 @@ $Octasic_Revision: 194 $ #define cOCT6100_ERR_DEBUG_RC_CHANNEL_RECORDING_DISABLED (0x11012 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_DEBUG_GET_DATA_MODE (0x11013 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_DEBUG_CHANNEL_IN_POWER_DOWN (0x11014 + cOCT6100_ERR_BASE) - +#define cOCT6100_ERR_DEBUG_GET_DATA_CONTENT (0x11015 + cOCT6100_ERR_BASE) +#define cOCT6100_ERR_DEBUG_GET_DATA_MODE_CANNOT_CHANGE (0x11016 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_MIXER_ALL_COPY_EVENT_ENTRY_OPENED (0x12000 + cOCT6100_ERR_BASE) #define cOCT6100_ERR_MIXER_COPY_EVENT_HANDLE (0x12001 + cOCT6100_ERR_BASE) @@ -824,5 +825,6 @@ $Octasic_Revision: 194 $ #define cOCT6100_ERR_FATAL_E7 (0x000E7 + cOCT6100_FATAL_BASE) #define cOCT6100_ERR_FATAL_E8 (0x000E8 + cOCT6100_FATAL_BASE) #define cOCT6100_ERR_FATAL_E9 (0x000E9 + cOCT6100_FATAL_BASE) +#define cOCT6100_ERR_FATAL_EA (0x000EA + cOCT6100_FATAL_BASE) #endif /* __OCT6100_ERRORS_H__ */ diff --git a/software/include/oct6100api/oct6100_events_inst.h b/software/include/oct6100api/oct6100_events_inst.h index b4f6ae3..e5efa36 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 11 $ diff --git a/software/include/oct6100api/oct6100_events_pub.h b/software/include/oct6100api/oct6100_events_pub.h index d992c50..5435605 100644 --- a/software/include/oct6100api/oct6100_events_pub.h +++ b/software/include/oct6100api/oct6100_events_pub.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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 13 $ diff --git a/software/include/oct6100api/oct6100_interrupts_inst.h b/software/include/oct6100api/oct6100_interrupts_inst.h index 468185c..81ad7e2 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 16 $ diff --git a/software/include/oct6100api/oct6100_interrupts_pub.h b/software/include/oct6100api/oct6100_interrupts_pub.h index d94a998..c131359 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 23 $ diff --git a/software/include/oct6100api/oct6100_mixer_inst.h b/software/include/oct6100api/oct6100_mixer_inst.h index 66b5651..dd6be23 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 13 $ diff --git a/software/include/oct6100api/oct6100_mixer_pub.h b/software/include/oct6100api/oct6100_mixer_pub.h index e13a011..f23dddc 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 7 $ diff --git a/software/include/oct6100api/oct6100_phasing_tsst_inst.h b/software/include/oct6100api/oct6100_phasing_tsst_inst.h index 8b650dd..f5e4397 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 9 $ diff --git a/software/include/oct6100api/oct6100_phasing_tsst_pub.h b/software/include/oct6100api/oct6100_phasing_tsst_pub.h index 67993b3..1b0db3f 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 9 $ diff --git a/software/include/oct6100api/oct6100_playout_buf_inst.h b/software/include/oct6100api/oct6100_playout_buf_inst.h index 241607d..60527dd 100644 --- a/software/include/oct6100api/oct6100_playout_buf_inst.h +++ b/software/include/oct6100api/oct6100_playout_buf_inst.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 9 $ +$Octasic_Revision: 10 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,10 +40,10 @@ $Octasic_Revision: 9 $ /***************************** DEFINES *************************************/ #define mOCT6100_GET_BUFFER_MEMORY_NODE_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_BUFFER_PLAYOUT_MALLOC_NODE )(( UINT32 )pSharedInfo + pSharedInfo->ulPlayoutBufMemoryNodeListOfst ); + pList = ( tPOCT6100_API_BUFFER_PLAYOUT_MALLOC_NODE )(( PUINT8 )pSharedInfo + pSharedInfo->ulPlayoutBufMemoryNodeListOfst ); #define mOCT6100_GET_BUFFER_MEMORY_NODE_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_BUFFER_PLAYOUT_MALLOC_NODE )(( UINT32 )pSharedInfo + pSharedInfo->ulPlayoutBufMemoryNodeListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_BUFFER_PLAYOUT_MALLOC_NODE )(( PUINT8 )pSharedInfo + pSharedInfo->ulPlayoutBufMemoryNodeListOfst)) + ulIndex; /***************************** TYPES ***************************************/ diff --git a/software/include/oct6100api/oct6100_playout_buf_pub.h b/software/include/oct6100api/oct6100_playout_buf_pub.h index 3c46edc..0d4b3df 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 21 $ diff --git a/software/include/oct6100api/oct6100_remote_debug_inst.h b/software/include/oct6100api/oct6100_remote_debug_inst.h index 8fe64d8..888c00d 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 6 $ diff --git a/software/include/oct6100api/oct6100_remote_debug_pub.h b/software/include/oct6100api/oct6100_remote_debug_pub.h index acc510b..1cc638d 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 6 $ diff --git a/software/include/oct6100api/oct6100_tlv_inst.h b/software/include/oct6100api/oct6100_tlv_inst.h index 6d06ea4..c555bc5 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 7 $ diff --git a/software/include/oct6100api/oct6100_tone_detection_inst.h b/software/include/oct6100api/oct6100_tone_detection_inst.h index 0271088..d65386f 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 8 $ diff --git a/software/include/oct6100api/oct6100_tone_detection_pub.h b/software/include/oct6100api/oct6100_tone_detection_pub.h index 75cb0dc..6ae6598 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 10 $ diff --git a/software/include/oct6100api/oct6100_tsi_cnct_inst.h b/software/include/oct6100api/oct6100_tsi_cnct_inst.h index a0841a5..4dd8c52 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 8 $ diff --git a/software/include/oct6100api/oct6100_tsi_cnct_pub.h b/software/include/oct6100api/oct6100_tsi_cnct_pub.h index 7f780b2..f503f31 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 10 $ diff --git a/software/include/oct6100api/oct6100_tsst_inst.h b/software/include/oct6100api/oct6100_tsst_inst.h index 31b7f85..7ba52f9 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 5 $ diff --git a/software/include/octdef.h b/software/include/octdef.h index bbe1e20..769d622 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 12 $ diff --git a/software/include/octmac.h b/software/include/octmac.h index 0b8ca71..db57d37 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 14 $ diff --git a/software/include/octosdependant.h b/software/include/octosdependant.h index 654d59e..303557c 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.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 16 $ diff --git a/software/include/octrpc/oct6100_rpc_protocol.h b/software/include/octrpc/oct6100_rpc_protocol.h index 0c877c9..1d808fa 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 6 $ diff --git a/software/include/octrpc/rpc_protocol.h b/software/include/octrpc/rpc_protocol.h index fcee8ea..9c0ed5a 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 23 $ diff --git a/software/include/octtype.h b/software/include/octtype.h index 725afd2..06de4ec 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 16 $ diff --git a/software/include/octtypevx.h b/software/include/octtypevx.h index c3ac2d8..3febe37 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 6 $ diff --git a/software/include/octtypewin.h b/software/include/octtypewin.h index 15b42c1..6625605 100644 --- a/software/include/octtypewin.h +++ b/software/include/octtypewin.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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 13 $ +$Octasic_Revision: 14 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -76,6 +76,12 @@ typedef UINT32 * PUINT32; #define ULLONG unsigned __int64 #define PULLONG unsigned __int64 * +/* Double integers */ +typedef double DOUBLE; +typedef double * PDOUBLE; +typedef float FLOAT; +typedef float * PFLOAT; + #ifndef OPT #define OPT /* OPT param */ #endif diff --git a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h index d122b83..00ad31e 100644 --- a/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 5 $ +$Octasic_Revision: 6 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,13 +40,13 @@ $Octasic_Revision: 5 $ /* ADPCM channel list pointer macros. */ #define mOCT6100_GET_ADPCM_CHAN_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_ADPCM_CHAN )(( UINT32 )pSharedInfo + pSharedInfo->ulAdpcmChanListOfst ); + pList = ( tPOCT6100_API_ADPCM_CHAN )(( PUINT8 )pSharedInfo + pSharedInfo->ulAdpcmChanListOfst ); #define mOCT6100_GET_ADPCM_CHAN_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_ADPCM_CHAN )(( UINT32 )pSharedInfo + pSharedInfo->ulAdpcmChanListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_ADPCM_CHAN )(( PUINT8 )pSharedInfo + pSharedInfo->ulAdpcmChanListOfst)) + ulIndex; #define mOCT6100_GET_ADPCM_CHAN_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulAdpcmChanAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulAdpcmChanAllocOfst); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c index 10ab644..dbd7ad5 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 15 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c index 53bbd67..959992a 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 464 $ +$Octasic_Revision: 466 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -64,6 +64,7 @@ $Octasic_Revision: 464 $ #include "oct6100api/oct6100_conf_bridge_pub.h" #include "oct6100api/oct6100_tone_detection_pub.h" #include "oct6100api/oct6100_channel_pub.h" +#include "oct6100api/oct6100_debug_pub.h" #include "oct6100_chip_open_priv.h" #include "oct6100_miscellaneous_priv.h" @@ -76,6 +77,7 @@ $Octasic_Revision: 464 $ #include "oct6100_conf_bridge_priv.h" #include "oct6100_tone_detection_priv.h" #include "oct6100_channel_priv.h" +#include "oct6100_debug_priv.h" /**************************** PUBLIC FUNCTIONS ****************************/ @@ -2874,6 +2876,24 @@ UINT32 Oct6100ApiInvalidateChannelStructs( SmearParams.pProcessContext = f_pApiInstance->pProcessContext; SmearParams.ulUserChipId = pSharedInfo->ChipConfig.ulUserChipId; + + /* If this channel is currently debugged, automatically close the debug channel. */ + if ( ( pSharedInfo->ChipConfig.fEnableChannelRecording == TRUE ) + && ( pSharedInfo->DebugInfo.usCurrentDebugChanIndex == f_usChanIndex ) ) + { + tOCT6100_DEBUG_SELECT_CHANNEL SelectDebugChan; + + /* Ensure forward compatibility. */ + Oct6100DebugSelectChannelDef( &SelectDebugChan ); + + /* Set the hot channel to an invalid handle to disable recording. */ + SelectDebugChan.ulChannelHndl = cOCT6100_INVALID_HANDLE; + + /* Call the serialized fonction. */ + ulResult = Oct6100DebugSelectChannelSer( f_pApiInstance, &SelectDebugChan, FALSE ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + } /* Deactivate the TSST control memory if used. */ @@ -10902,8 +10922,14 @@ UINT32 Oct6100ApiCheckChannelCreateBiDirParams( return cOCT6100_ERR_CHANNEL_BIDIR_SECOND_CHANNEL_HANDLE; /* Check the specific state of the channel.*/ - if ( pSecondChanEntry->fRinRoutCodecActive == TRUE || pSecondChanEntry->fSinSoutCodecActive == TRUE ) + if ( pSecondChanEntry->fRinRoutCodecActive == TRUE ) return cOCT6100_ERR_CHANNEL_CODEC_ACTIVATED; + if ( pSecondChanEntry->fSinSoutCodecActive == TRUE ) + { + + return cOCT6100_ERR_CHANNEL_CODEC_ACTIVATED; + } + if ( pSecondChanEntry->fBiDirChannel == TRUE ) return cOCT6100_ERR_CHANNEL_ALREADY_BIDIR; diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c index dd54e2c..8b017ce 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c @@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 310 $ +$Octasic_Revision: 312 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -281,7 +281,7 @@ UINT32 Oct6100ChipOpen( ulStructSize = sizeof( tOCT6100_INSTANCE_API ); mOCT6100_ROUND_MEMORY_SIZE( ulStructSize, ulTempVar ) - f_pApiInstance->pSharedInfo = ( tPOCT6100_SHARED_INFO )(( UINT32 )f_pApiInstance + ulStructSize); + f_pApiInstance->pSharedInfo = ( tPOCT6100_SHARED_INFO )(( PUINT8 )f_pApiInstance + ulStructSize); /* Save the process context specified by the user. */ f_pApiInstance->pProcessContext = f_pChipOpen->pProcessContext; @@ -551,7 +551,7 @@ UINT32 Oct6100CreateLocalInstance( ulApiInstSize = sizeof( tOCT6100_INSTANCE_API ); mOCT6100_ROUND_MEMORY_SIZE( ulApiInstSize, ulTempVar ) - pApiInstLocal->pSharedInfo = ( tPOCT6100_SHARED_INFO )(( UINT32 )f_pCreateLocal->pApiInstShared + ulApiInstSize); + pApiInstLocal->pSharedInfo = ( tPOCT6100_SHARED_INFO )(( PUINT8 )f_pCreateLocal->pApiInstShared + ulApiInstSize); pApiInstLocal->pProcessContext = f_pCreateLocal->pProcessContext; /* Create serialization object handles needed. */ @@ -4501,6 +4501,7 @@ UINT32 Oct6100ApiInitChannels( UINT16 usLastMclkRead; UINT16 usMclkDiff; UINT32 ulNumberOfCycleToWait; + UINT32 ulTimeoutCounter; pSharedInfo = f_pApiInstance->pSharedInfo; @@ -4728,6 +4729,9 @@ UINT32 Oct6100ApiInitChannels( if ( ulResult != cOCT6100_ERR_OK ) return ulResult; + /* Reset loop timeout counter. */ + ulTimeoutCounter = 0x0; + do { ReadParams.pusReadData = &usMclkRead; @@ -4746,6 +4750,11 @@ UINT32 Oct6100ApiInitChannels( /* Evaluate the difference. */ usMclkDiff = (UINT16)(( usMclkRead - usLastMclkRead ) & 0xFFFF); + + /* Check for loop timeout. Bad mclk? */ + ulTimeoutCounter++; + if ( ulTimeoutCounter == cOCT6100_MAX_LOOP_CPU_TIMEOUT ) + return cOCT6100_ERR_FATAL_EA; } while( usMclkDiff <= ulNumberOfCycleToWait ); } @@ -4953,7 +4962,7 @@ UINT32 Oct6100ApiInitToneInfo( /* Extract the number of char used to represent the tone event number ( 1 or 2 ). */ pszNextInfo = Oct6100ApiStrStr( pszCurrentInfo, (PUINT8)",", pszToneInfoEnd ); - ulNumCharForValue = pszNextInfo - pszCurrentInfo; + ulNumCharForValue = (UINT32)( pszNextInfo - pszCurrentInfo ); /* Retreive the event number */ ulToneEventNumber = 0; @@ -4998,7 +5007,7 @@ UINT32 Oct6100ApiInitToneInfo( pszNextInfo = pszToneInfoEnd; /* Extract the name size. */ - ulToneNameSize = pszNextInfo - pszCurrentInfo - 2; /* - 2 for 0x0D and 0x0A.*/ + ulToneNameSize = (UINT32)( pszNextInfo - pszCurrentInfo - 2 ); /* - 2 for 0x0D and 0x0A.*/ if ( ulToneNameSize > cOCT6100_TLV_MAX_TONE_NAME_SIZE ) return cOCT6100_ERR_OPEN_INVALID_TONE_NAME; diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c index 9b4ba49..25da0a1 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 87 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c index 9b65b0a..79fdcd4 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c @@ -25,7 +25,7 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 145 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c index 45e9aee..bd23716 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 59 $ +$Octasic_Revision: 62 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -146,6 +146,7 @@ UINT32 Oct6100DebugGetDataDef( tPOCT6100_DEBUG_GET_DATA f_pGetData ) { f_pGetData->ulGetDataMode = cOCT6100_DEBUG_GET_DATA_MODE_120S_LITE; + f_pGetData->ulGetDataContent = cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE; f_pGetData->ulRemainingNumBytes = cOCT6100_INVALID_VALUE; f_pGetData->ulTotalNumBytes = cOCT6100_INVALID_VALUE; f_pGetData->ulMaxBytes = cOCT6100_INVALID_VALUE; @@ -364,7 +365,10 @@ UINT32 Oct6100DebugSelectChannelSer( usChanIndex = cOCT6100_INVALID_INDEX; } - if ( pSharedInfo->ChipConfig.fEnableChannelRecording == TRUE ) + /* Set law of newly selected hot channel. */ + if ( ( pSharedInfo->ChipConfig.fEnableChannelRecording == TRUE ) + && ( f_pSelectDebugChan->ulChannelHndl != cOCT6100_INVALID_HANDLE ) + && ( pChanEntry != NULL ) ) { /* Set the PCM law of the debug channel. */ /* Let's program the channel memory. */ @@ -377,23 +381,11 @@ UINT32 Oct6100DebugSelectChannelSer( TempChanOpen.VqeConfig.fRinDcOffsetRemoval = FALSE; TempChanOpen.VqeConfig.lDefaultErlDb = 0; - if ( ( f_pSelectDebugChan->ulChannelHndl != cOCT6100_INVALID_HANDLE ) - && ( pChanEntry != NULL ) ) - { - /* Use the law of the channel being recorded. */ - TempChanOpen.TdmConfig.ulRinPcmLaw = pChanEntry->TdmConfig.byRinPcmLaw; - TempChanOpen.TdmConfig.ulSinPcmLaw = pChanEntry->TdmConfig.bySinPcmLaw; - TempChanOpen.TdmConfig.ulRoutPcmLaw = pChanEntry->TdmConfig.byRoutPcmLaw; - TempChanOpen.TdmConfig.ulSoutPcmLaw = pChanEntry->TdmConfig.bySoutPcmLaw; - } - else - { - /* Hard-code this to u-Law. */ - TempChanOpen.TdmConfig.ulRinPcmLaw = cOCT6100_PCM_U_LAW; - TempChanOpen.TdmConfig.ulSinPcmLaw = cOCT6100_PCM_U_LAW; - TempChanOpen.TdmConfig.ulRoutPcmLaw = cOCT6100_PCM_U_LAW; - TempChanOpen.TdmConfig.ulSoutPcmLaw = cOCT6100_PCM_U_LAW; - } + /* Use the law of the channel being recorded. */ + TempChanOpen.TdmConfig.ulRinPcmLaw = pChanEntry->TdmConfig.byRinPcmLaw; + TempChanOpen.TdmConfig.ulSinPcmLaw = pChanEntry->TdmConfig.bySinPcmLaw; + TempChanOpen.TdmConfig.ulRoutPcmLaw = pChanEntry->TdmConfig.byRoutPcmLaw; + TempChanOpen.TdmConfig.ulSoutPcmLaw = pChanEntry->TdmConfig.bySoutPcmLaw; ulResult = Oct6100ApiWriteDebugChanMemory( f_pApiInstance, &TempChanOpen.TdmConfig, @@ -423,6 +415,7 @@ UINT32 Oct6100DebugSelectChannelSer( /* Cancel data dump request, if there was one. */ pSharedInfo->DebugInfo.fDebugDataBeingDumped = FALSE; + pSharedInfo->DebugInfo.ulDebugDataTotalNumBytes = cOCT6100_INVALID_VALUE; /* Call from remote client. */ if ( f_fCheckChannelRecording == FALSE ) @@ -472,7 +465,7 @@ UINT32 Oct6100DebugGetDataSer( UINT32 ulReadPointer; UINT32 ulUserBufWriteIndex = 0; UINT32 ulTimestamp; - UINT32 ulDebugEventIndex; + UINT32 ulDebugEventIndex = 0; UINT32 ulStreamIndex; UINT32 ulPcmSampleIndex; UINT32 ulNumAfEvents; @@ -482,8 +475,11 @@ UINT32 Oct6100DebugGetDataSer( UINT32 ulFeatureBytesOffset; UINT32 ulFeatureBitOffset; UINT32 ulFeatureFieldLength; + UINT32 ulStreamIndexMin; + UINT32 ulStreamIndexMax; UINT32 ulTempData; UINT32 ulMask; + BOOL fResetRemainingDataFlag = FALSE; /* Get local pointer(s). */ pSharedInfo = f_pApiInstance->pSharedInfo; @@ -534,6 +530,13 @@ UINT32 Oct6100DebugGetDataSer( && ( f_pGetData->ulGetDataMode != cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) return cOCT6100_ERR_DEBUG_GET_DATA_MODE; + /* Check dump content. */ + if ( ( f_pGetData->ulGetDataContent != cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + && ( f_pGetData->ulGetDataContent != cOCT6100_DEBUG_GET_DATA_CONTENT_RIN_PCM ) + && ( f_pGetData->ulGetDataContent != cOCT6100_DEBUG_GET_DATA_CONTENT_SIN_PCM ) + && ( f_pGetData->ulGetDataContent != cOCT6100_DEBUG_GET_DATA_CONTENT_SOUT_PCM ) ) + return cOCT6100_ERR_DEBUG_GET_DATA_CONTENT; + /* Check if can accomodate the 120 seconds dump. */ if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S_LITE ) || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) @@ -551,13 +554,13 @@ UINT32 Oct6100DebugGetDataSer( /* Check if this is the first time this function is called since the hot channel was set. */ if ( pSharedInfo->DebugInfo.fDebugDataBeingDumped == FALSE ) { - pSharedInfo->DebugInfo.fDebugDataBeingDumped = TRUE; - /* Check that the channel is not in POWER_DOWN. When the channel is in POWER_DOWN, */ /* the debug events are not recorded correctly in external memory. */ if ( pChanEntry->byEchoOperationMode == cOCT6100_ECHO_OP_MODE_POWER_DOWN ) return cOCT6100_ERR_DEBUG_CHANNEL_IN_POWER_DOWN; - + + pSharedInfo->DebugInfo.fDebugDataBeingDumped = TRUE; + /* Flag the hot channel that it must stop recording. The data is being transfered. */ /* This also tells the remote client not to do anything right now. */ @@ -683,29 +686,48 @@ UINT32 Oct6100DebugGetDataSer( while ( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) != 0 ) pSharedInfo->DebugInfo.usLastAfLogReadPtr++; - /* Remember first AF Event Read Pointer. */ - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr ) & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr >> 8 ) & 0xFF ); + /* Remember the data mode for later checks. Also, the user cannot change this "mode". */ + pSharedInfo->DebugInfo.ulCurrentGetDataMode = f_pGetData->ulGetDataMode; + } + else + { + /* Check that the user did not change the current data mode. */ + if ( pSharedInfo->DebugInfo.ulCurrentGetDataMode != f_pGetData->ulGetDataMode ) + return cOCT6100_ERR_DEBUG_GET_DATA_MODE_CANNOT_CHANGE; + } - /* Remember the AF Event Write Pointer. */ - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usAfLogWritePtr ) & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usAfLogWritePtr >> 8 ) & 0xFF ); + /* Check if this is the first pass here. */ + if ( pSharedInfo->DebugInfo.ulDebugDataTotalNumBytes == cOCT6100_INVALID_VALUE ) + { + /* Calculate how many bytes of data will be returned with respect to the selected data content. */ + + /* Check what content type the user requested. */ + if ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + { + /* Remember first AF Event Read Pointer. */ + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr ) & 0xFF ); + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr >> 8 ) & 0xFF ); - /* Remember law and hot channel */ - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( pChanEntry->TdmConfig.bySinPcmLaw | ( ( pSharedInfo->DebugInfo.usCurrentDebugChanIndex >> 2 ) & 0xFE ) ); - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( pChanEntry->TdmConfig.bySoutPcmLaw ); + /* Remember the AF Event Write Pointer. */ + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usAfLogWritePtr ) & 0xFF ); + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usAfLogWritePtr >> 8 ) & 0xFF ); - /* Insert light or heavy mode in array. */ - if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S_LITE ) - || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S_LITE ) ) - { - f_pGetData->pbyData[ ulUserBufWriteIndex - 1 ] |= 0x80; - } - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( pChanEntry->TdmConfig.byRinPcmLaw | ( ( pSharedInfo->DebugInfo.usCurrentDebugChanIndex & 0x1F ) << 3 ) ); + /* Remember law and hot channel */ + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( pChanEntry->TdmConfig.bySinPcmLaw | ( ( pSharedInfo->DebugInfo.usCurrentDebugChanIndex >> 2 ) & 0xFE ) ); + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( pChanEntry->TdmConfig.bySoutPcmLaw ); - /* Remember usNumEvents */ - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usNumEvents ) & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usNumEvents >> 8 ) & 0xFF ); + /* Insert light or heavy mode in array. */ + if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S_LITE ) + || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S_LITE ) ) + { + f_pGetData->pbyData[ ulUserBufWriteIndex - 1 ] |= 0x80; + } + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( pChanEntry->TdmConfig.byRinPcmLaw | ( ( pSharedInfo->DebugInfo.usCurrentDebugChanIndex & 0x1F ) << 3 ) ); + + /* Remember usNumEvents */ + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usNumEvents ) & 0xFF ); + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->DebugInfo.usNumEvents >> 8 ) & 0xFF ); + } /* Last indexes set to '0'! */ pSharedInfo->DebugInfo.usLastDebugEventIndex = 0; @@ -721,37 +743,46 @@ UINT32 Oct6100DebugGetDataSer( /* Estimate the total size of the buffer that will be returned. */ f_pGetData->ulTotalNumBytes = ulUserBufWriteIndex; - /* Add the matrix events. */ - if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) - || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) + /* If the full content is requested, add all the debug data. */ + if ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) { - /* Heavy mode! Grab everything! */ - f_pGetData->ulTotalNumBytes += pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulDebugChanStatsByteSize; - } - else - { - /* Lite mode! Only the most important stuff. */ - f_pGetData->ulTotalNumBytes += pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulDebugChanLiteStatsByteSize; - } + /* Add the matrix events. */ + if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) + || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) + { + /* Heavy mode! Grab everything! */ + f_pGetData->ulTotalNumBytes += pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulDebugChanStatsByteSize; + } + else + { + /* Lite mode! Only the most important stuff. */ + f_pGetData->ulTotalNumBytes += pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulDebugChanLiteStatsByteSize; + } - /* Add the PCM samples. */ - f_pGetData->ulTotalNumBytes += pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulRecordedPcmEventByteSize * 3; + /* Add the PCM samples. */ + f_pGetData->ulTotalNumBytes += pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulRecordedPcmEventByteSize * 3; - /* If requested, add the AF log events. */ - if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) - || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) - { - f_pGetData->ulTotalNumBytes += (UINT32)( ( pSharedInfo->DebugInfo.usAfLogWritePtr - pSharedInfo->DebugInfo.usLastAfLogReadPtr ) & 0xFFFF ) * 16; - } + /* If requested, add the AF log events. */ + if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) + || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) + { + f_pGetData->ulTotalNumBytes += (UINT32)( ( pSharedInfo->DebugInfo.usAfLogWritePtr - pSharedInfo->DebugInfo.usLastAfLogReadPtr ) & 0xFFFF ) * 16; + } - /* Add the tone events strings. */ - f_pGetData->ulTotalNumBytes += cOCT6100_TLV_MAX_TONE_NAME_SIZE * pSharedInfo->ImageInfo.byNumToneDetectors; + /* Add the tone events strings. */ + f_pGetData->ulTotalNumBytes += cOCT6100_TLV_MAX_TONE_NAME_SIZE * pSharedInfo->ImageInfo.byNumToneDetectors; - /* Add the image version string. */ - f_pGetData->ulTotalNumBytes += 512; + /* Add the image version string. */ + f_pGetData->ulTotalNumBytes += 512; - /* Add the API version string. */ - f_pGetData->ulTotalNumBytes += sizeof( cOCT6100_API_VERSION ); + /* Add the API version string. */ + f_pGetData->ulTotalNumBytes += sizeof( cOCT6100_API_VERSION ); + } + else /* if ( f_pGetData->ulGetDataContent != cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) */ + { + /* Add one PCM stream. */ + f_pGetData->ulTotalNumBytes += pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulRecordedPcmEventByteSize; + } /* Save this in the instance for further calls. */ pSharedInfo->DebugInfo.ulDebugDataTotalNumBytes = f_pGetData->ulTotalNumBytes; @@ -773,87 +804,99 @@ UINT32 Oct6100DebugGetDataSer( ulReadPointer += pSharedInfo->DebugInfo.ulDebugChanStatsByteSize * pSharedInfo->DebugInfo.usLastDebugEventIndex; ulReadPointer %= ( ( pSharedInfo->DebugInfo.usMatrixCBMask + 1 ) * pSharedInfo->DebugInfo.ulDebugChanStatsByteSize ); - /* Copy the debug events in the user buffer. */ - for( ulDebugEventIndex = pSharedInfo->DebugInfo.usLastDebugEventIndex; ulDebugEventIndex < pSharedInfo->DebugInfo.usNumEvents; ulDebugEventIndex ++ ) + if ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) { - ReadBurstParams.ulReadAddress = pSharedInfo->DebugInfo.ulMatrixBaseAddress + ulReadPointer; - - /* Check if we are in light or heavy mode. The burst size is not the same. */ - if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) - || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) - { - if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) >= pSharedInfo->DebugInfo.ulDebugChanStatsByteSize ) - ulNumReads = pSharedInfo->DebugInfo.ulDebugChanStatsByteSize / 2; - else - break; - } - else + /* Copy the debug events in the user buffer. */ + for( ulDebugEventIndex = pSharedInfo->DebugInfo.usLastDebugEventIndex; ulDebugEventIndex < pSharedInfo->DebugInfo.usNumEvents; ulDebugEventIndex ++ ) { - if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) >= pSharedInfo->DebugInfo.ulDebugChanLiteStatsByteSize ) - ulNumReads = pSharedInfo->DebugInfo.ulDebugChanLiteStatsByteSize / 2; - else - break; - } + ReadBurstParams.ulReadAddress = pSharedInfo->DebugInfo.ulMatrixBaseAddress + ulReadPointer; - ulTempIndex = 0; - while ( ulNumReads != 0 ) - { - if ( ulNumReads >= pSharedInfo->ChipConfig.usMaxRwAccesses ) - ReadBurstParams.ulReadLength = pSharedInfo->ChipConfig.usMaxRwAccesses; + /* Check if we are in light or heavy mode. The burst size is not the same. */ + if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) + || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) + { + if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) >= pSharedInfo->DebugInfo.ulDebugChanStatsByteSize ) + ulNumReads = pSharedInfo->DebugInfo.ulDebugChanStatsByteSize / 2; + else + break; + } else - ReadBurstParams.ulReadLength = ulNumReads; + { + if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) >= pSharedInfo->DebugInfo.ulDebugChanLiteStatsByteSize ) + ulNumReads = pSharedInfo->DebugInfo.ulDebugChanLiteStatsByteSize / 2; + else + break; + } - /* Set pointer where to write data. */ - ReadBurstParams.pusReadData = pSharedInfo->MiscVars.ausSuperArray; + ulTempIndex = 0; + while ( ulNumReads != 0 ) + { + if ( ulNumReads >= pSharedInfo->ChipConfig.usMaxRwAccesses ) + ReadBurstParams.ulReadLength = pSharedInfo->ChipConfig.usMaxRwAccesses; + else + ReadBurstParams.ulReadLength = ulNumReads; - mOCT6100_DRIVER_READ_BURST_API( ReadBurstParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + /* Set pointer where to write data. */ + ReadBurstParams.pusReadData = pSharedInfo->MiscVars.ausSuperArray; - /* Copy data byte per byte to avoid endianess problems. */ - for ( ulCopyIndex = 0; ulCopyIndex < ReadBurstParams.ulReadLength; ulCopyIndex ++ ) - { - f_pGetData->pbyData[ ulUserBufWriteIndex + ulTempIndex + ( 2 * ulCopyIndex ) ] = (UINT8)( ReadBurstParams.pusReadData[ ulCopyIndex ] & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex + ulTempIndex + ( 2 * ulCopyIndex ) + 1 ] = (UINT8)( ( ReadBurstParams.pusReadData[ ulCopyIndex ] >> 8 ) & 0xFF ); - } + mOCT6100_DRIVER_READ_BURST_API( ReadBurstParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; - /* Update indexes, temp variables, addresses. */ - ulNumReads -= ReadBurstParams.ulReadLength; - ulTempIndex += ReadBurstParams.ulReadLength * 2; - ReadBurstParams.ulReadAddress += ReadBurstParams.ulReadLength * 2; - } + /* Copy data byte per byte to avoid endianess problems. */ + for ( ulCopyIndex = 0; ulCopyIndex < ReadBurstParams.ulReadLength; ulCopyIndex ++ ) + { + f_pGetData->pbyData[ ulUserBufWriteIndex + ulTempIndex + ( 2 * ulCopyIndex ) ] = (UINT8)( ReadBurstParams.pusReadData[ ulCopyIndex ] & 0xFF ); + f_pGetData->pbyData[ ulUserBufWriteIndex + ulTempIndex + ( 2 * ulCopyIndex ) + 1 ] = (UINT8)( ( ReadBurstParams.pusReadData[ ulCopyIndex ] >> 8 ) & 0xFF ); + } - /* Store register 0x202 in the event structure. */ - f_pGetData->pbyData[ ulUserBufWriteIndex + 255 ] = (UINT8)( pSharedInfo->IntrptManage.usRegister202h & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex + 256 ] = (UINT8)( ( pSharedInfo->IntrptManage.usRegister202h >> 8 ) & 0xFF ); + /* Update indexes, temp variables, addresses. */ + ulNumReads -= ReadBurstParams.ulReadLength; + ulTempIndex += ReadBurstParams.ulReadLength * 2; + ReadBurstParams.ulReadAddress += ReadBurstParams.ulReadLength * 2; + } - /* Increment index. */ - if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) - || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) - { - ulUserBufWriteIndex += pSharedInfo->DebugInfo.ulDebugChanStatsByteSize; - } - else - { - ulUserBufWriteIndex += pSharedInfo->DebugInfo.ulDebugChanLiteStatsByteSize; - } + /* Store register 0x202 in the event structure. */ + f_pGetData->pbyData[ ulUserBufWriteIndex + 255 ] = (UINT8)( pSharedInfo->IntrptManage.usRegister202h & 0xFF ); + f_pGetData->pbyData[ ulUserBufWriteIndex + 256 ] = (UINT8)( ( pSharedInfo->IntrptManage.usRegister202h >> 8 ) & 0xFF ); - /* Increment read pointer to get next event. */ - ulReadPointer = ( ulReadPointer + pSharedInfo->DebugInfo.ulDebugChanStatsByteSize ) % ( ( pSharedInfo->DebugInfo.usMatrixCBMask + 1 ) * pSharedInfo->DebugInfo.ulDebugChanStatsByteSize ); + /* Increment index. */ + if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) + || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) + { + ulUserBufWriteIndex += pSharedInfo->DebugInfo.ulDebugChanStatsByteSize; + } + else + { + ulUserBufWriteIndex += pSharedInfo->DebugInfo.ulDebugChanLiteStatsByteSize; + } - /* Save in the instance that one of the events was dumped. */ - pSharedInfo->DebugInfo.usLastDebugEventIndex ++; + /* Increment read pointer to get next event. */ + ulReadPointer = ( ulReadPointer + pSharedInfo->DebugInfo.ulDebugChanStatsByteSize ) % ( ( pSharedInfo->DebugInfo.usMatrixCBMask + 1 ) * pSharedInfo->DebugInfo.ulDebugChanStatsByteSize ); + + /* Save in the instance that one of the events was dumped. */ + pSharedInfo->DebugInfo.usLastDebugEventIndex ++; + } } /* Check if all debug events have been transfered. */ - if ( ulDebugEventIndex == pSharedInfo->DebugInfo.usNumEvents ) + if ( ( ulDebugEventIndex == pSharedInfo->DebugInfo.usNumEvents ) + || ( f_pGetData->ulGetDataContent != cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) ) { /* Fetch all streams per event. */ for ( ulPcmSampleIndex = pSharedInfo->DebugInfo.ulLastPcmSampleIndex; ulPcmSampleIndex < ( (UINT32)pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulRecordedPcmEventByteSize ); ulPcmSampleIndex ++ ) { /* Check if enough room for this sample. */ - if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) < 3 ) - break; + if ( f_pGetData->ulGetDataContent != cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + { + if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) < 1 ) + break; + } + else /* if ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) */ + { + if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) < 3 ) + break; + } /* Check if must retrieve data from external memory. */ if ( ( ulPcmSampleIndex % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE * 2 ) ) == 0x0 ) @@ -864,7 +907,28 @@ UINT32 Oct6100DebugGetDataSer( ulReadPointer += ulPcmSampleIndex % pSharedInfo->DebugInfo.ulRecordedPcmEventByteSize; /* Retrieve more data from external memory. */ - for ( ulStreamIndex = 0; ulStreamIndex < 3; ulStreamIndex ++ ) + switch ( f_pGetData->ulGetDataContent ) + { + case cOCT6100_DEBUG_GET_DATA_CONTENT_RIN_PCM: + ulStreamIndexMin = 0; + ulStreamIndexMax = 1; + break; + case cOCT6100_DEBUG_GET_DATA_CONTENT_SIN_PCM: + ulStreamIndexMin = 1; + ulStreamIndexMax = 2; + break; + case cOCT6100_DEBUG_GET_DATA_CONTENT_SOUT_PCM: + ulStreamIndexMin = 2; + ulStreamIndexMax = 3; + break; + case cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE: + default: + ulStreamIndexMin = 0; + ulStreamIndexMax = 3; + break; + } + + for ( ulStreamIndex = ulStreamIndexMin; ulStreamIndex < ulStreamIndexMax; ulStreamIndex ++ ) { ReadBurstParams.ulReadAddress = pSharedInfo->MemoryMap.ulChanMainMemBase; /* To get right channel information. */ @@ -906,17 +970,33 @@ UINT32 Oct6100DebugGetDataSer( /* We now have the stream data for all streams for 1 event. */ /* Return what we can to the user. */ - if ( ulPcmSampleIndex % 2 == 0 ) + if ( ( ulPcmSampleIndex % 2 ) == 0 ) { - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 8 ) & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray1[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 8 ) & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray2[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 8 ) & 0xFF ); + if ( ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + || ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_RIN_PCM ) ) + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 8 ) & 0xFF ); + + if ( ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + || ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_SIN_PCM ) ) + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray1[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 8 ) & 0xFF ); + + if ( ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + || ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_SOUT_PCM ) ) + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray2[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 8 ) & 0xFF ); } else /* if ( ulPcmSampleIndex % 2 == 1 ) */ { + if ( ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + || ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_RIN_PCM ) ) f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 0 ) & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray1[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 0 ) & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray2[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 0 ) & 0xFF ); + + if ( ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + || ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_SIN_PCM ) ) + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray1[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 0 ) & 0xFF ); + + if ( ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) + || ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_SOUT_PCM ) ) + f_pGetData->pbyData[ ulUserBufWriteIndex++ ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray2[ ( ulPcmSampleIndex / 2 ) % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE ) ] >> 0 ) & 0xFF ); } pSharedInfo->DebugInfo.ulLastPcmSampleIndex++; @@ -925,167 +1005,177 @@ UINT32 Oct6100DebugGetDataSer( /* Check if we are done dumping the PCM samples! */ if ( pSharedInfo->DebugInfo.ulLastPcmSampleIndex == ( (UINT32)pSharedInfo->DebugInfo.usNumEvents * pSharedInfo->DebugInfo.ulRecordedPcmEventByteSize ) ) { - /* Go for the AF events. The AF events are only copied in heavy mode. */ - if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) - || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) + if ( f_pGetData->ulGetDataContent == cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) { - while ( pSharedInfo->DebugInfo.usLastAfLogReadPtr != pSharedInfo->DebugInfo.usAfLogWritePtr ) - { - /* Check if enough room for an event. */ - if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) < 16 ) - break; - /* Check if must fill our buffer. */ - if ( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) == 0x0 ) + /* Go for the AF events. The AF events are only copied in heavy mode. */ + if ( ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_16S ) + || ( f_pGetData->ulGetDataMode == cOCT6100_DEBUG_GET_DATA_MODE_120S ) ) + { + while ( pSharedInfo->DebugInfo.usLastAfLogReadPtr != pSharedInfo->DebugInfo.usAfLogWritePtr ) { - ulNumAfEvents = ( pSharedInfo->DebugInfo.usAfLogWritePtr - pSharedInfo->DebugInfo.usLastAfLogReadPtr ) & 0xFFFF; - - /* Check for the size of the available buffer. */ - if ( ulNumAfEvents > ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) - ulNumAfEvents = ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ); - - /* Start at channel main base address. */ - ReadBurstParams.ulReadAddress = pSharedInfo->MemoryMap.ulChanMainMemBase; - /* To get right channel information. */ - ReadBurstParams.ulReadAddress += ( ( pSharedInfo->DebugInfo.usRecordMemIndex + 2 ) * pSharedInfo->MemoryMap.ulChanMainMemSize ); - /* To get the right AF log. */ - ReadBurstParams.ulReadAddress += ( pSharedInfo->DebugInfo.usLastAfLogReadPtr * 16 ); + /* Check if enough room for an event. */ + if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) < 16 ) + break; - ulTempIndex = 0; - ulNumReads = ulNumAfEvents * 8; - - while ( ulNumReads != 0 ) + /* Check if must fill our buffer. */ + if ( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) == 0x0 ) { - if ( ulNumReads >= pSharedInfo->ChipConfig.usMaxRwAccesses ) - ReadBurstParams.ulReadLength = pSharedInfo->ChipConfig.usMaxRwAccesses; - else - ReadBurstParams.ulReadLength = ulNumReads; + ulNumAfEvents = ( pSharedInfo->DebugInfo.usAfLogWritePtr - pSharedInfo->DebugInfo.usLastAfLogReadPtr ) & 0xFFFF; - /* Set pointer where to write data. */ - ReadBurstParams.pusReadData = &pSharedInfo->MiscVars.ausSuperArray[ ulTempIndex ]; + /* Check for the size of the available buffer. */ + if ( ulNumAfEvents > ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) + ulNumAfEvents = ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ); - mOCT6100_DRIVER_READ_BURST_API( ReadBurstParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + /* Start at channel main base address. */ + ReadBurstParams.ulReadAddress = pSharedInfo->MemoryMap.ulChanMainMemBase; + /* To get right channel information. */ + ReadBurstParams.ulReadAddress += ( ( pSharedInfo->DebugInfo.usRecordMemIndex + 2 ) * pSharedInfo->MemoryMap.ulChanMainMemSize ); + /* To get the right AF log. */ + ReadBurstParams.ulReadAddress += ( pSharedInfo->DebugInfo.usLastAfLogReadPtr * 16 ); - /* Update indexes, temp variables, addresses. */ - ulNumReads -= ReadBurstParams.ulReadLength; - ulTempIndex += ReadBurstParams.ulReadLength; - ReadBurstParams.ulReadAddress += ReadBurstParams.ulReadLength * 2; + ulTempIndex = 0; + ulNumReads = ulNumAfEvents * 8; + + while ( ulNumReads != 0 ) + { + if ( ulNumReads >= pSharedInfo->ChipConfig.usMaxRwAccesses ) + ReadBurstParams.ulReadLength = pSharedInfo->ChipConfig.usMaxRwAccesses; + else + ReadBurstParams.ulReadLength = ulNumReads; + + /* Set pointer where to write data. */ + ReadBurstParams.pusReadData = &pSharedInfo->MiscVars.ausSuperArray[ ulTempIndex ]; + + mOCT6100_DRIVER_READ_BURST_API( ReadBurstParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + + /* Update indexes, temp variables, addresses. */ + ulNumReads -= ReadBurstParams.ulReadLength; + ulTempIndex += ReadBurstParams.ulReadLength; + ReadBurstParams.ulReadAddress += ReadBurstParams.ulReadLength * 2; + } } - } - /* Copy data byte per byte to avoid endianess problems. */ - for ( ulCopyIndex = 0; ulCopyIndex < 8; ulCopyIndex ++ ) - { - f_pGetData->pbyData[ ulUserBufWriteIndex + ( 2 * ulCopyIndex ) ] = (UINT8)( pSharedInfo->MiscVars.ausSuperArray[ ( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) * 8 ) + ulCopyIndex ] & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex + ( 2 * ulCopyIndex ) + 1 ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray[ ( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) * 8 ) + ulCopyIndex ] >> 8 ) & 0xFF ); - } + /* Copy data byte per byte to avoid endianess problems. */ + for ( ulCopyIndex = 0; ulCopyIndex < 8; ulCopyIndex ++ ) + { + f_pGetData->pbyData[ ulUserBufWriteIndex + ( 2 * ulCopyIndex ) ] = (UINT8)( pSharedInfo->MiscVars.ausSuperArray[ ( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) * 8 ) + ulCopyIndex ] & 0xFF ); + f_pGetData->pbyData[ ulUserBufWriteIndex + ( 2 * ulCopyIndex ) + 1 ] = (UINT8)( ( pSharedInfo->MiscVars.ausSuperArray[ ( ( pSharedInfo->DebugInfo.usLastAfLogReadPtr % ( cOCT6100_INTERNAL_SUPER_ARRAY_SIZE / 8 ) ) * 8 ) + ulCopyIndex ] >> 8 ) & 0xFF ); + } - ulUserBufWriteIndex += 16; + ulUserBufWriteIndex += 16; - /* Increment AF log read ptr. */ - pSharedInfo->DebugInfo.usLastAfLogReadPtr = (UINT16)(( pSharedInfo->DebugInfo.usLastAfLogReadPtr + 1 ) & 0xFFFF ); + /* Increment AF log read ptr. */ + pSharedInfo->DebugInfo.usLastAfLogReadPtr = (UINT16)(( pSharedInfo->DebugInfo.usLastAfLogReadPtr + 1 ) & 0xFFFF ); + } } - } - /* Check if we are done with the AF events. */ - if ( pSharedInfo->DebugInfo.usLastAfLogReadPtr == pSharedInfo->DebugInfo.usAfLogWritePtr ) - { - /* Insert the tone event information. */ - for ( ulToneEventIndex = pSharedInfo->DebugInfo.usLastToneEventIndex; ulToneEventIndex < pSharedInfo->ImageInfo.byNumToneDetectors; ulToneEventIndex++ ) + /* Check if we are done with the AF events. */ + if ( pSharedInfo->DebugInfo.usLastAfLogReadPtr == pSharedInfo->DebugInfo.usAfLogWritePtr ) { - if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) < cOCT6100_TLV_MAX_TONE_NAME_SIZE ) - break; + /* Insert the tone event information. */ + for ( ulToneEventIndex = pSharedInfo->DebugInfo.usLastToneEventIndex; ulToneEventIndex < pSharedInfo->ImageInfo.byNumToneDetectors; ulToneEventIndex++ ) + { + if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) < cOCT6100_TLV_MAX_TONE_NAME_SIZE ) + break; - Oct6100UserMemCopy( &f_pGetData->pbyData[ ulUserBufWriteIndex ], pSharedInfo->ImageInfo.aToneInfo[ ulToneEventIndex ].aszToneName, cOCT6100_TLV_MAX_TONE_NAME_SIZE ); + Oct6100UserMemCopy( &f_pGetData->pbyData[ ulUserBufWriteIndex ], pSharedInfo->ImageInfo.aToneInfo[ ulToneEventIndex ].aszToneName, cOCT6100_TLV_MAX_TONE_NAME_SIZE ); - ulUserBufWriteIndex += cOCT6100_TLV_MAX_TONE_NAME_SIZE; + ulUserBufWriteIndex += cOCT6100_TLV_MAX_TONE_NAME_SIZE; - pSharedInfo->DebugInfo.usLastToneEventIndex++; - } + pSharedInfo->DebugInfo.usLastToneEventIndex++; + } - /* If all the tone information has been copied. */ - if ( ulToneEventIndex == pSharedInfo->ImageInfo.byNumToneDetectors ) - { - /* Copy the image version. */ - if ( pSharedInfo->DebugInfo.fImageVersionCopied == FALSE ) + /* If all the tone information has been copied. */ + if ( ulToneEventIndex == pSharedInfo->ImageInfo.byNumToneDetectors ) { - if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) >= 512 ) + /* Copy the image version. */ + if ( pSharedInfo->DebugInfo.fImageVersionCopied == FALSE ) { - Oct6100UserMemCopy( &f_pGetData->pbyData[ ulUserBufWriteIndex ], pSharedInfo->ImageInfo.szVersionNumber, 512 ); - - /* Get PLL jitter count from external memory. */ - if ( pSharedInfo->DebugInfo.fPouchCounter == TRUE ) - { - ulFeatureBytesOffset = pSharedInfo->MemoryMap.PouchCounterFieldOfst.usDwordOffset * 4; - ulFeatureBitOffset = pSharedInfo->MemoryMap.PouchCounterFieldOfst.byBitOffset; - ulFeatureFieldLength = pSharedInfo->MemoryMap.PouchCounterFieldOfst.byFieldSize; - - ulResult = Oct6100ApiReadDword( f_pApiInstance, - cOCT6100_POUCH_BASE + ulFeatureBytesOffset, - &ulTempData ); - - /* Create the mask to retrieve the appropriate value. */ - mOCT6100_CREATE_FEATURE_MASK( ulFeatureFieldLength, ulFeatureBitOffset, &ulMask ); - - /* Mask data. */ - ulTempData &= ulMask; - /* Move to right position. */ - ulTempData = ulTempData >> ulFeatureBitOffset; - - f_pGetData->pbyData[ ulUserBufWriteIndex + 510 ] = (UINT8)( ( ulTempData >> 8 ) & 0xFF ); - f_pGetData->pbyData[ ulUserBufWriteIndex + 511 ] = (UINT8)( ( ulTempData >> 0 ) & 0xFF ); - } - - /* Add "ISR is not called" bit. */ - if ( pSharedInfo->IntrptManage.fIsrCalled == FALSE ) + if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) >= 512 ) { - f_pGetData->pbyData[ ulUserBufWriteIndex + 510 ] |= 0x80; + Oct6100UserMemCopy( &f_pGetData->pbyData[ ulUserBufWriteIndex ], pSharedInfo->ImageInfo.szVersionNumber, 512 ); + + /* Get PLL jitter count from external memory. */ + if ( pSharedInfo->DebugInfo.fPouchCounter == TRUE ) + { + ulFeatureBytesOffset = pSharedInfo->MemoryMap.PouchCounterFieldOfst.usDwordOffset * 4; + ulFeatureBitOffset = pSharedInfo->MemoryMap.PouchCounterFieldOfst.byBitOffset; + ulFeatureFieldLength = pSharedInfo->MemoryMap.PouchCounterFieldOfst.byFieldSize; + + ulResult = Oct6100ApiReadDword( f_pApiInstance, + cOCT6100_POUCH_BASE + ulFeatureBytesOffset, + &ulTempData ); + + /* Create the mask to retrieve the appropriate value. */ + mOCT6100_CREATE_FEATURE_MASK( ulFeatureFieldLength, ulFeatureBitOffset, &ulMask ); + + /* Mask data. */ + ulTempData &= ulMask; + /* Move to right position. */ + ulTempData = ulTempData >> ulFeatureBitOffset; + + f_pGetData->pbyData[ ulUserBufWriteIndex + 510 ] = (UINT8)( ( ulTempData >> 8 ) & 0xFF ); + f_pGetData->pbyData[ ulUserBufWriteIndex + 511 ] = (UINT8)( ( ulTempData >> 0 ) & 0xFF ); + } + + /* Add "ISR is not called" bit. */ + if ( pSharedInfo->IntrptManage.fIsrCalled == FALSE ) + { + f_pGetData->pbyData[ ulUserBufWriteIndex + 510 ] |= 0x80; + } + + ulUserBufWriteIndex += 512; + + /* The version has been copied. */ + pSharedInfo->DebugInfo.fImageVersionCopied = TRUE; } - - ulUserBufWriteIndex += 512; - - /* The version has been copied. */ - pSharedInfo->DebugInfo.fImageVersionCopied = TRUE; } - } - /* If the image version has been copied, proceed with the API version. */ - if ( pSharedInfo->DebugInfo.fImageVersionCopied == TRUE ) - { - if ( pSharedInfo->DebugInfo.fApiVersionCopied == FALSE ) + /* If the image version has been copied, proceed with the API version. */ + if ( pSharedInfo->DebugInfo.fImageVersionCopied == TRUE ) { - if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) >= sizeof(cOCT6100_API_VERSION) ) + if ( pSharedInfo->DebugInfo.fApiVersionCopied == FALSE ) { - Oct6100UserMemCopy( &f_pGetData->pbyData[ ulUserBufWriteIndex ], cOCT6100_API_VERSION, sizeof(cOCT6100_API_VERSION) ); - ulUserBufWriteIndex += sizeof(cOCT6100_API_VERSION); - - /* The API version has been copied. */ - pSharedInfo->DebugInfo.fApiVersionCopied = TRUE; + if ( ( f_pGetData->ulMaxBytes - ulUserBufWriteIndex ) >= sizeof(cOCT6100_API_VERSION) ) + { + Oct6100UserMemCopy( &f_pGetData->pbyData[ ulUserBufWriteIndex ], cOCT6100_API_VERSION, sizeof(cOCT6100_API_VERSION) ); + ulUserBufWriteIndex += sizeof(cOCT6100_API_VERSION); + + /* The API version has been copied. */ + pSharedInfo->DebugInfo.fApiVersionCopied = TRUE; + } } } } - } - /* Check if we are done! */ - if ( pSharedInfo->DebugInfo.fApiVersionCopied == TRUE ) - { - /* Done dumping. */ + /* Check if we are done! */ + if ( pSharedInfo->DebugInfo.fApiVersionCopied == TRUE ) + { + /* Done dumping. */ - /* Reset data being dumpped flag. */ - pSharedInfo->DebugInfo.fDebugDataBeingDumped = FALSE; + /* Reset data being dumpped flag. */ + pSharedInfo->DebugInfo.fDebugDataBeingDumped = FALSE; - /* Reset data recording in the chip. */ - WriteBurstParams.ulWriteAddress = pSharedInfo->DebugInfo.ulHotChannelSelectBaseAddress; - WriteBurstParams.ulWriteLength = 2; - WriteBurstParams.pusWriteData = pSharedInfo->DebugInfo.ausHotChannelData; + /* Reset data recording in the chip. */ + WriteBurstParams.ulWriteAddress = pSharedInfo->DebugInfo.ulHotChannelSelectBaseAddress; + WriteBurstParams.ulWriteLength = 2; + WriteBurstParams.pusWriteData = pSharedInfo->DebugInfo.ausHotChannelData; - mOCT6100_DRIVER_WRITE_BURST_API( WriteBurstParams, ulResult ); - if ( ulResult != cOCT6100_ERR_OK ) - return ulResult; + mOCT6100_DRIVER_WRITE_BURST_API( WriteBurstParams, ulResult ); + if ( ulResult != cOCT6100_ERR_OK ) + return ulResult; + + fResetRemainingDataFlag = TRUE; + } } } + else /* if ( f_pGetData->ulGetDataContent != cOCT6100_DEBUG_GET_DATA_CONTENT_COMPLETE ) */ + { + fResetRemainingDataFlag = TRUE; + } } } @@ -1101,5 +1191,9 @@ UINT32 Oct6100DebugGetDataSer( /* Return total number of bytes. */ f_pGetData->ulTotalNumBytes = pSharedInfo->DebugInfo.ulDebugDataTotalNumBytes; + /* Check if we are done dump the requested content. */ + if ( fResetRemainingDataFlag == TRUE ) + pSharedInfo->DebugInfo.ulDebugDataTotalNumBytes = cOCT6100_INVALID_VALUE; + return cOCT6100_ERR_OK; } diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c index 8b755d9..a210119 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_events.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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 79 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c index 603ca6d..47b2135 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.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 72 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c index dd19920..d95d59e 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 42 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c index 65f43d3..347a3c6 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 34 $ +$Octasic_Revision: 35 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -383,7 +383,7 @@ PUINT8 Oct6100ApiStrStr( if ( f_pszLastCharPtr < f_pszSource ) return NULL; - ulSourceLength = f_pszLastCharPtr - f_pszSource; + ulSourceLength = (UINT32)( f_pszLastCharPtr - f_pszSource ); ulStringLength = Oct6100ApiStrLen( f_pszString ); for ( ulCurrentPos = 0; ulCurrentPos < ulSourceLength; ulCurrentPos++ ) diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c index 73e5136..04ec35d 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $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 751548e..6c385c0 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 43 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c index 07bad06..d200546 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $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 d7bcb66..03610dd 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 35 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c index cacef6f..786efae 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 111 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c index 61dec3a..288fb6c 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 49 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c index a36e8de..dc71878 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 37 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c index 0653903..e638789 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 39 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c index e6e7b29..ad0cce1 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_user.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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 27 $ +$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 ac8217f..e13ce42 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 7 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h b/software/octdeviceapi/oct6100api/oct6100_channel_priv.h index c950422..effa5f7 100644 --- a/software/octdeviceapi/oct6100api/oct6100_channel_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_channel_priv.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 61 $ +$Octasic_Revision: 62 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -42,22 +42,22 @@ $Octasic_Revision: 61 $ /* ECHO channel list pointer macros. */ #define mOCT6100_GET_CHANNEL_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_CHANNEL )(( UINT32 )pSharedInfo + pSharedInfo->ulChannelListOfst ); + pList = ( tPOCT6100_API_CHANNEL )(( PUINT8 )pSharedInfo + pSharedInfo->ulChannelListOfst ); #define mOCT6100_GET_CHANNEL_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_CHANNEL )(( UINT32 )pSharedInfo + pSharedInfo->ulChannelListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_CHANNEL )(( PUINT8 )pSharedInfo + pSharedInfo->ulChannelListOfst)) + ulIndex; #define mOCT6100_GET_CHANNEL_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulChannelAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulChannelAllocOfst); #define mOCT6100_GET_BIDIR_CHANNEL_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_BIDIR_CHANNEL )(( UINT32 )pSharedInfo + pSharedInfo->ulBiDirChannelListOfst ); + pList = ( tPOCT6100_API_BIDIR_CHANNEL )(( PUINT8 )pSharedInfo + pSharedInfo->ulBiDirChannelListOfst ); #define mOCT6100_GET_BIDIR_CHANNEL_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_BIDIR_CHANNEL )(( UINT32 )pSharedInfo + pSharedInfo->ulBiDirChannelListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_BIDIR_CHANNEL )(( PUINT8 )pSharedInfo + pSharedInfo->ulBiDirChannelListOfst)) + ulIndex; #define mOCT6100_GET_BIDIR_CHANNEL_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulBiDirChannelAllocOfst ); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulBiDirChannelAllocOfst ); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_open_priv.h index 885e03d..bf48cfe 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 56 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h b/software/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h index 268660a..c313681 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 8 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h index 92bb296..022f189 100644 --- a/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 29 $ +$Octasic_Revision: 30 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,22 +40,22 @@ $Octasic_Revision: 29 $ /***************************** DEFINES *************************************/ #define mOCT6100_GET_CONF_BRIDGE_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_CONF_BRIDGE )(( UINT32 )pSharedInfo + pSharedInfo->ulConfBridgeListOfst); + pList = ( tPOCT6100_API_CONF_BRIDGE )(( PUINT8 )pSharedInfo + pSharedInfo->ulConfBridgeListOfst); #define mOCT6100_GET_CONF_BRIDGE_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_CONF_BRIDGE )(( UINT32 )pSharedInfo + pSharedInfo->ulConfBridgeListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_CONF_BRIDGE )(( PUINT8 )pSharedInfo + pSharedInfo->ulConfBridgeListOfst)) + ulIndex; #define mOCT6100_GET_CONF_BRIDGE_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulConfBridgeAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulConfBridgeAllocOfst); #define mOCT6100_GET_FLEX_CONF_PARTICIPANT_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_FLEX_CONF_PARTICIPANT )(( UINT32 )pSharedInfo + pSharedInfo->ulFlexConfParticipantListOfst); + pList = ( tPOCT6100_API_FLEX_CONF_PARTICIPANT )(( PUINT8 )pSharedInfo + pSharedInfo->ulFlexConfParticipantListOfst); #define mOCT6100_GET_FLEX_CONF_PARTICIPANT_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_FLEX_CONF_PARTICIPANT )(( UINT32 )pSharedInfo + pSharedInfo->ulFlexConfParticipantListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_FLEX_CONF_PARTICIPANT )(( PUINT8 )pSharedInfo + pSharedInfo->ulFlexConfParticipantListOfst)) + ulIndex; #define mOCT6100_GET_FLEX_CONF_PARTICIPANT_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulFlexConfParticipantAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulFlexConfParticipantAllocOfst); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_debug_priv.h index 4f1be56..02da704 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 12 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_events_priv.h b/software/octdeviceapi/oct6100api/oct6100_events_priv.h index 3025fe5..acad3df 100644 --- a/software/octdeviceapi/oct6100api/oct6100_events_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_events_priv.h @@ -26,9 +26,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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 12 $ +$Octasic_Revision: 13 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -41,10 +41,10 @@ $Octasic_Revision: 12 $ /***************************** DEFINES *************************************/ #define mOCT6100_GET_TONE_EVENT_BUF_PNT( pSharedInfo, pSoftBuf ) \ - pSoftBuf = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->SoftBufs.ulToneEventBufferMemOfst ); + pSoftBuf = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->SoftBufs.ulToneEventBufferMemOfst ); #define mOCT6100_GET_BUFFER_PLAYOUT_EVENT_BUF_PNT( pSharedInfo, pSoftBuf ) \ - pSoftBuf = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->SoftBufs.ulBufPlayoutEventBufferMemOfst ); + pSoftBuf = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->SoftBufs.ulBufPlayoutEventBufferMemOfst ); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h b/software/octdeviceapi/oct6100api/oct6100_interrupts_priv.h index 312dd72..5c94b1b 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 8 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h index a2e3347..ecd2557 100644 --- a/software/octdeviceapi/oct6100api/oct6100_memory_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_memory_priv.h @@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 16 $ +$Octasic_Revision: 17 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,11 +40,11 @@ $Octasic_Revision: 16 $ /* TSI allocation pointer macros. */ #define mOCT6100_GET_TSI_MEMORY_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulTsiMemoryAllocOfst ); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulTsiMemoryAllocOfst ); /* Conversion memory allocation pointer macros. */ #define mOCT6100_GET_CONVERSION_MEMORY_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulConversionMemoryAllocOfst ); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulConversionMemoryAllocOfst ); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h b/software/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h index bf76270..3956a56 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 20 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h index e533463..744922f 100644 --- a/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_mixer_priv.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 17 $ +$Octasic_Revision: 18 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -39,22 +39,22 @@ $Octasic_Revision: 17 $ /***************************** DEFINES *************************************/ #define mOCT6100_GET_MIXER_EVENT_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_MIXER_EVENT )(( UINT32 )pSharedInfo + pSharedInfo->ulMixerEventListOfst); + pList = ( tPOCT6100_API_MIXER_EVENT )(( PUINT8 )pSharedInfo + pSharedInfo->ulMixerEventListOfst); #define mOCT6100_GET_MIXER_EVENT_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_MIXER_EVENT )(( UINT32 )pSharedInfo + pSharedInfo->ulMixerEventListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_MIXER_EVENT )(( PUINT8 )pSharedInfo + pSharedInfo->ulMixerEventListOfst)) + ulIndex; #define mOCT6100_GET_MIXER_EVENT_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulMixerEventAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulMixerEventAllocOfst); #define mOCT6100_GET_COPY_EVENT_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_COPY_EVENT )(( UINT32 )pSharedInfo + pSharedInfo->ulCopyEventListOfst); + pList = ( tPOCT6100_API_COPY_EVENT )(( PUINT8 )pSharedInfo + pSharedInfo->ulCopyEventListOfst); #define mOCT6100_GET_COPY_EVENT_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_COPY_EVENT )(( UINT32 )pSharedInfo + pSharedInfo->ulCopyEventListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_COPY_EVENT )(( PUINT8 )pSharedInfo + pSharedInfo->ulCopyEventListOfst)) + ulIndex; #define mOCT6100_GET_COPY_EVENT_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulCopyEventAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulCopyEventAllocOfst); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h index d77d42a..9581a7f 100644 --- a/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 10 $ +$Octasic_Revision: 11 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -39,13 +39,13 @@ $Octasic_Revision: 10 $ /***************************** DEFINES *************************************/ #define mOCT6100_GET_PHASING_TSST_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_PHASING_TSST )(( UINT32 )pSharedInfo + pSharedInfo->ulPhasingTsstListOfst); + pList = ( tPOCT6100_API_PHASING_TSST )(( PUINT8 )pSharedInfo + pSharedInfo->ulPhasingTsstListOfst); #define mOCT6100_GET_PHASING_TSST_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_PHASING_TSST )(( UINT32 )pSharedInfo + pSharedInfo->ulPhasingTsstListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_PHASING_TSST )(( PUINT8 )pSharedInfo + pSharedInfo->ulPhasingTsstListOfst)) + ulIndex; #define mOCT6100_GET_PHASING_TSST_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulPhasingTsstAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulPhasingTsstAllocOfst); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h index 7391838..5f35a17 100644 --- a/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 21 $ +$Octasic_Revision: 22 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,13 +40,13 @@ $Octasic_Revision: 21 $ /* Playout buffer list pointer macros. */ #define mOCT6100_GET_BUFFER_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_BUFFER )(( UINT32 )pSharedInfo + pSharedInfo->ulPlayoutBufListOfst ); + pList = ( tPOCT6100_API_BUFFER )(( PUINT8 )pSharedInfo + pSharedInfo->ulPlayoutBufListOfst ); #define mOCT6100_GET_BUFFER_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_BUFFER )(( UINT32 )pSharedInfo + pSharedInfo->ulPlayoutBufListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_BUFFER )(( PUINT8 )pSharedInfo + pSharedInfo->ulPlayoutBufListOfst)) + ulIndex; #define mOCT6100_GET_BUFFER_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulPlayoutBufAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulPlayoutBufAllocOfst); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h index 51a8433..449583d 100644 --- a/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 12 $ +$Octasic_Revision: 13 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,16 +40,16 @@ $Octasic_Revision: 12 $ /***************************** DEFINES *************************************/ #define mOCT6100_GET_REMOTE_DEBUG_LIST_ENTRY_PNT( pSharedInfo, ulIndex, pEntry ) \ - pEntry = ( tPOCT6100_API_REMOTE_DEBUG_SESSION )(( UINT32 )pSharedInfo + pSharedInfo->RemoteDebugInfo.ulSessionListOfst) + ulIndex; + pEntry = ( tPOCT6100_API_REMOTE_DEBUG_SESSION )(( PUINT8 )pSharedInfo + pSharedInfo->RemoteDebugInfo.ulSessionListOfst) + ulIndex; #define mOCT6100_GET_REMOTE_DEBUG_TREE_PNT( pSharedInfo, pList ) \ - pList = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->RemoteDebugInfo.ulSessionTreeOfst); + pList = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->RemoteDebugInfo.ulSessionTreeOfst); #define mOCT6100_GET_REMOTE_DEBUG_DATA_BUF_PNT( pSharedInfo, pulDataBuf ) \ - pulDataBuf = ( PUINT16 )(( UINT32 )pSharedInfo + pSharedInfo->RemoteDebugInfo.ulDataBufOfst); + pulDataBuf = ( PUINT16 )(( PUINT8 )pSharedInfo + pSharedInfo->RemoteDebugInfo.ulDataBufOfst); #define mOCT6100_GET_REMOTE_DEBUG_SESSION_PKT_CACHE_PNT( pSharedInfo, pulPktCache, ulSessionIndex ) \ - pulPktCache = ( PUINT32 )(( UINT32 )pSharedInfo + pSharedInfo->RemoteDebugInfo.ulPktCacheOfst) + (ulSessionIndex * (cOCTRPC_MAX_PACKET_BYTE_LENGTH / 4)); + pulPktCache = ( PUINT32 )(( PUINT8 )pSharedInfo + pSharedInfo->RemoteDebugInfo.ulPktCacheOfst) + (ulSessionIndex * (cOCTRPC_MAX_PACKET_BYTE_LENGTH / 4)); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h b/software/octdeviceapi/oct6100api/oct6100_tlv_priv.h index ae1de0e..3a02d79 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 56 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h b/software/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h index 525d0c3..c10c48c 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ $Octasic_Revision: 13 $ diff --git a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h index 62cd54a..42a92c4 100644 --- a/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h @@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 12 $ +$Octasic_Revision: 13 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,13 +40,13 @@ $Octasic_Revision: 12 $ /* TSI connection list pointer macros. */ #define mOCT6100_GET_TSI_CNCT_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_TSI_CNCT )(( UINT32 )pSharedInfo + pSharedInfo->ulTsiCnctListOfst ); + pList = ( tPOCT6100_API_TSI_CNCT )(( PUINT8 )pSharedInfo + pSharedInfo->ulTsiCnctListOfst ); #define mOCT6100_GET_TSI_CNCT_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_TSI_CNCT )(( UINT32 )pSharedInfo + pSharedInfo->ulTsiCnctListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_TSI_CNCT )(( PUINT8 )pSharedInfo + pSharedInfo->ulTsiCnctListOfst)) + ulIndex; #define mOCT6100_GET_TSI_CNCT_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulTsiCnctAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulTsiCnctAllocOfst); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h index 7cdef28..b43b578 100644 --- a/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h +++ b/software/octdeviceapi/oct6100api/oct6100_tsst_priv.h @@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.00-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 13 $ +$Octasic_Revision: 14 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -40,16 +40,16 @@ $Octasic_Revision: 13 $ /* TSST allocation and serialization pointer macros. */ #define mOCT6100_GET_TSST_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PUINT32 )(( UINT32 )pSharedInfo + pSharedInfo->ulTsstAllocOfst); + pAlloc = ( PUINT32 )(( PUINT8 )pSharedInfo + pSharedInfo->ulTsstAllocOfst); #define mOCT6100_GET_TSST_LIST_PNT( pSharedInfo, pList ) \ - pList = ( tPOCT6100_API_TSST_ENTRY )(( UINT32 )pSharedInfo + pSharedInfo->ulTsstListOfst ); + pList = ( tPOCT6100_API_TSST_ENTRY )(( PUINT8 )pSharedInfo + pSharedInfo->ulTsstListOfst ); #define mOCT6100_GET_TSST_LIST_ENTRY_PNT( pSharedInfo, pEntry, ulIndex ) \ - pEntry = (( tPOCT6100_API_TSST_ENTRY )(( UINT32 )pSharedInfo + pSharedInfo->ulTsstListOfst)) + ulIndex; + pEntry = (( tPOCT6100_API_TSST_ENTRY )(( PUINT8 )pSharedInfo + pSharedInfo->ulTsstListOfst)) + ulIndex; #define mOCT6100_GET_TSST_LIST_ALLOC_PNT( pSharedInfo, pAlloc ) \ - pAlloc = ( PVOID )(( UINT32 )pSharedInfo + pSharedInfo->ulTsstListAllocOfst); + pAlloc = ( PVOID )(( PUINT8 )pSharedInfo + pSharedInfo->ulTsstListAllocOfst); /***************************** TYPES ***************************************/ diff --git a/software/octdeviceapi/oct6100api/oct6100_version.h b/software/octdeviceapi/oct6100api/oct6100_version.h index 13eb2c0..9f581cf 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-PR40 $ +$Octasic_Release: OCT612xAPI-01.00-PR41 $ -$Octasic_Revision: 43 $ +$Octasic_Revision: 44 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -34,6 +34,6 @@ $Octasic_Revision: 43 $ /* String version of the OCT6100 API.*/ -#define cOCT6100_API_VERSION "OCT6100API-01.00-PR40" +#define cOCT6100_API_VERSION "OCT6100API-01.00-PR41" #endif /* __OCT6100_VERSION_H__ */ -- cgit v1.2.3