From 2416c53c7f5bd70325d7c05f1df79ccb8d018d2e Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Thu, 21 Jun 2018 11:26:51 +0200 Subject: [PATCH] Import headers from OCTSDR-OPENBSC-02.11.00-B1322.tgz --- octdev_devices.h | 4 +- octdev_devices_swap.h | 4 +- octdev_macro.h | 4 +- octdev_opus_rev.h | 4 +- octdev_rc_base.h | 4 +- octdev_types.h | 13 +- octdev_types_swap.h | 4 +- octoptions.h | 4 +- octpkt/octpkt_hdr.h | 4 +- octpkt/octpkt_hdr_swap.h | 4 +- octpkt/octpkt_hdrxl.h | 4 +- octpkt/octpkt_hdrxl_swap.h | 4 +- octvc1/ctrl/octvc1_ctrl_api.h | 4 +- octvc1/ctrl/octvc1_ctrl_api_priv.h | 4 +- octvc1/ctrl/octvc1_ctrl_api_priv_swap.h | 4 +- octvc1/ctrl/octvc1_ctrl_api_swap.h | 4 +- octvc1/ctrl/octvc1_ctrl_base.h | 4 +- octvc1/ctrl/octvc1_ctrl_id.h | 4 +- octvc1/ctrl/octvc1_ctrl_id_priv.h | 4 +- octvc1/ctrl/octvc1_ctrl_version.h | 25 +- octvc1/gsm/octvc1_gsm_api.h | 262 +++++++- octvc1/gsm/octvc1_gsm_api_priv.h | 4 +- octvc1/gsm/octvc1_gsm_api_priv_swap.h | 4 +- octvc1/gsm/octvc1_gsm_api_swap.h | 129 +++- octvc1/gsm/octvc1_gsm_base.h | 4 +- octvc1/gsm/octvc1_gsm_default.h | 194 +++++- octvc1/gsm/octvc1_gsm_default_priv.h | 11 +- octvc1/gsm/octvc1_gsm_evt.h | 4 +- octvc1/gsm/octvc1_gsm_evt_priv.h | 4 +- octvc1/gsm/octvc1_gsm_evt_priv_swap.h | 4 +- octvc1/gsm/octvc1_gsm_evt_swap.h | 4 +- octvc1/gsm/octvc1_gsm_id.h | 11 +- octvc1/gsm/octvc1_gsm_id_priv.h | 4 +- octvc1/gsm/octvc1_gsm_lic.h | 4 +- octvc1/gsm/octvc1_gsm_lic_priv.h | 4 +- octvc1/gsm/octvc1_gsm_rc.h | 44 +- octvc1/gsm/octvc1_gsm_rc_priv.h | 4 +- octvc1/gsm/octvc1_gsm_version.h | 25 +- octvc1/hw/octvc1_hw_api.h | 147 +---- octvc1/hw/octvc1_hw_api_priv.h | 125 +++- octvc1/hw/octvc1_hw_api_priv_swap.h | 68 ++- octvc1/hw/octvc1_hw_api_swap.h | 76 +-- octvc1/hw/octvc1_hw_base.h | 4 +- octvc1/hw/octvc1_hw_default.h | 73 +-- octvc1/hw/octvc1_hw_default_priv.h | 78 ++- octvc1/hw/octvc1_hw_evt.h | 18 +- octvc1/hw/octvc1_hw_evt_priv.h | 4 +- octvc1/hw/octvc1_hw_evt_priv_swap.h | 4 +- octvc1/hw/octvc1_hw_evt_swap.h | 14 +- octvc1/hw/octvc1_hw_id.h | 11 +- octvc1/hw/octvc1_hw_id_priv.h | 6 +- octvc1/hw/octvc1_hw_rc.h | 29 +- octvc1/hw/octvc1_hw_rc_priv.h | 4 +- octvc1/hw/octvc1_hw_version.h | 25 +- octvc1/irsc/octvc1_irsc_api.h | 559 ++++++++++++++++- octvc1/irsc/octvc1_irsc_api_priv.h | 7 +- octvc1/irsc/octvc1_irsc_api_priv_swap.h | 4 +- octvc1/irsc/octvc1_irsc_api_swap.h | 328 +++++++++- octvc1/irsc/octvc1_irsc_base.h | 5 +- octvc1/irsc/octvc1_irsc_default.h | 341 ++++++++++- octvc1/irsc/octvc1_irsc_default_priv.h | 13 +- octvc1/irsc/octvc1_irsc_evt.h | 33 +- octvc1/irsc/octvc1_irsc_evt_priv.h | 4 +- octvc1/irsc/octvc1_irsc_evt_priv_swap.h | 4 +- octvc1/irsc/octvc1_irsc_evt_swap.h | 22 +- octvc1/irsc/octvc1_irsc_id.h | 85 +-- octvc1/irsc/octvc1_irsc_id_priv.h | 8 +- octvc1/irsc/octvc1_irsc_rc.h | 13 +- octvc1/irsc/octvc1_irsc_rc_priv.h | 8 +- octvc1/irsc/octvc1_irsc_version.h | 25 +- octvc1/job/octvc1_job_api.h | 16 +- octvc1/job/octvc1_job_api_priv.h | 28 +- octvc1/job/octvc1_job_api_priv_swap.h | 22 +- octvc1/job/octvc1_job_api_swap.h | 12 +- octvc1/job/octvc1_job_base.h | 4 +- octvc1/job/octvc1_job_default.h | 17 +- octvc1/job/octvc1_job_default_priv.h | 11 +- octvc1/job/octvc1_job_evt.h | 23 +- octvc1/job/octvc1_job_evt_priv.h | 23 +- octvc1/job/octvc1_job_evt_priv_swap.h | 12 +- octvc1/job/octvc1_job_evt_swap.h | 16 +- octvc1/job/octvc1_job_id.h | 9 +- octvc1/job/octvc1_job_id_priv.h | 6 +- octvc1/job/octvc1_job_rc.h | 4 +- octvc1/job/octvc1_job_rc_priv.h | 4 +- octvc1/job/octvc1_job_version.h | 25 +- octvc1/main/octvc1_main_api.h | 762 ++++++++++++++++++++++-- octvc1/main/octvc1_main_api_priv.h | 250 +++++++- octvc1/main/octvc1_main_api_priv_swap.h | 154 ++++- octvc1/main/octvc1_main_api_swap.h | 435 +++++++++++++- octvc1/main/octvc1_main_base.h | 4 +- octvc1/main/octvc1_main_default.h | 569 +++++++++++++++++- octvc1/main/octvc1_main_default_priv.h | 198 +++++- octvc1/main/octvc1_main_evt.h | 4 +- octvc1/main/octvc1_main_evt_priv.h | 23 +- octvc1/main/octvc1_main_evt_priv_swap.h | 15 +- octvc1/main/octvc1_main_evt_swap.h | 4 +- octvc1/main/octvc1_main_id.h | 40 +- octvc1/main/octvc1_main_id_priv.h | 11 +- octvc1/main/octvc1_main_rc.h | 16 +- octvc1/main/octvc1_main_rc_priv.h | 4 +- octvc1/main/octvc1_main_version.h | 25 +- octvc1/octvc1_api.h | 29 +- octvc1/octvc1_api_swap.h | 13 +- octvc1/octvc1_app.h | 8 +- octvc1/octvc1_base.h | 4 +- octvc1/octvc1_buffer.h | 4 +- octvc1/octvc1_buffer_swap.h | 4 +- octvc1/octvc1_cursor.h | 4 +- octvc1/octvc1_cursor_swap.h | 4 +- octvc1/octvc1_eth.h | 22 +- octvc1/octvc1_eth_swap.h | 15 +- octvc1/octvc1_fifo.h | 4 +- octvc1/octvc1_file.h | 8 +- octvc1/octvc1_file_swap.h | 4 +- octvc1/octvc1_generic_rc.h | 5 +- octvc1/octvc1_handle.h | 22 +- octvc1/octvc1_handle_swap.h | 13 +- octvc1/octvc1_id2string.h | 121 +++- octvc1/octvc1_id2string_priv.h | 29 +- octvc1/octvc1_ip.h | 4 +- octvc1/octvc1_ip_swap.h | 4 +- octvc1/octvc1_ipc.h | 4 +- octvc1/octvc1_ipc_swap.h | 4 +- octvc1/octvc1_lic2string.h | 4 +- octvc1/octvc1_list.h | 44 +- octvc1/octvc1_list_swap.h | 32 +- octvc1/octvc1_log.h | 44 +- octvc1/octvc1_log_swap.h | 13 +- octvc1/octvc1_mac.h | 4 +- octvc1/octvc1_macro.h | 4 +- octvc1/octvc1_module.h | 30 +- octvc1/octvc1_module_swap.h | 15 +- octvc1/octvc1_msg.h | 4 +- octvc1/octvc1_msg_swap.h | 4 +- octvc1/octvc1_priv_swap_hdrs.h | 4 +- octvc1/octvc1_privacy.h | 4 +- octvc1/octvc1_process.h | 31 +- octvc1/octvc1_process_swap.h | 14 +- octvc1/octvc1_radio.h | 65 +- octvc1/octvc1_radio_swap.h | 4 +- octvc1/octvc1_rc2string.h | 30 +- octvc1/octvc1_stream.h | 77 +++ octvc1/octvc1_stream_swap.h | 75 +++ octvc1/octvc1_swap_hdrs.h | 6 +- octvc1/octvc1_tap.h | 9 +- octvc1/octvc1_tap_swap.h | 4 +- octvc1/octvc1_transport.h | 79 +++ octvc1/octvc1_transport_swap.h | 61 ++ octvc1/octvc1_udp.h | 4 +- octvc1/octvc1_user_id.h | 7 +- octvc1/octvc1_user_id_swap.h | 4 +- octvc1/octvc1_vlan.h | 4 +- octvc1/octvc1_vlan_swap.h | 4 +- octvc1/octvocnet_pkt.h | 4 +- octvc1/octvocnet_pkt_swap.h | 4 +- octvc1/pkt_api/octvc1_pkt_api.h | 8 +- octvc1/pkt_api/octvc1_pkt_api_default.h | 4 +- octvc1/pkt_api/octvc1_pkt_api_rc.h | 4 +- octvc1/pkt_api/octvc1_pkt_api_version.h | 10 +- 160 files changed, 5821 insertions(+), 947 deletions(-) create mode 100644 octvc1/octvc1_stream.h create mode 100644 octvc1/octvc1_stream_swap.h create mode 100644 octvc1/octvc1_transport.h create mode 100644 octvc1/octvc1_transport_swap.h diff --git a/octdev_devices.h b/octdev_devices.h index 66021f2..eb06afa 100644 --- a/octdev_devices.h +++ b/octdev_devices.h @@ -2,7 +2,7 @@ File: OCTDEV_DEVICES.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octdev_devices_swap.h b/octdev_devices_swap.h index d05d0c6..7eebfbd 100644 --- a/octdev_devices_swap.h +++ b/octdev_devices_swap.h @@ -2,7 +2,7 @@ File: octdev_devices_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTDEV_DEVICES_SWAP_H__ diff --git a/octdev_macro.h b/octdev_macro.h index 554ddee..90fb91d 100644 --- a/octdev_macro.h +++ b/octdev_macro.h @@ -2,7 +2,7 @@ File: OCTDEV_MACRO.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octdev_opus_rev.h b/octdev_opus_rev.h index ba2d1b7..6e896d3 100644 --- a/octdev_opus_rev.h +++ b/octdev_opus_rev.h @@ -2,7 +2,7 @@ File: OCTDEV_OPUS_REV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octdev_rc_base.h b/octdev_rc_base.h index c568851..9a9e01d 100644 --- a/octdev_rc_base.h +++ b/octdev_rc_base.h @@ -2,7 +2,7 @@ File: OCTDEV_RC_BASE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octdev_types.h b/octdev_types.h index 6b22117..9c2397a 100644 --- a/octdev_types.h +++ b/octdev_types.h @@ -2,7 +2,7 @@ File: OCTDEV_TYPES.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -137,7 +137,10 @@ typedef unsigned char tOCT_UINT8; #define _OCT_ENDIAN_TYPE_BE_ #define _OCT_PLATFORM_SPARC_ /* Look for ARM target */ - #elif defined( __ARMEL__ ) + #elif defined( __ARMEB__ ) || defined( __AARCH64EB__ ) + #define _OCT_ENDIAN_TYPE_BE_ + #define _OCT_PLATFORM_ARM_ + #elif defined( __ARMEL__ )|| defined( __AARCH64EL__ ) #define _OCT_ENDIAN_TYPE_LE_ #define _OCT_PLATFORM_ARM_ /* Look for MIPS target */ @@ -145,6 +148,10 @@ typedef unsigned char tOCT_UINT8; #define _OCT_ENDIAN_TYPE_BE_ #define _OCT_PLATFORM_MIPS_ /* others */ + #elif defined( __BIG_ENDIAN__ ) + #define _OCT_ENDIAN_TYPE_BE_ + #elif defined( __LITTLE_ENDIAN__ ) + #define _OCT_ENDIAN_TYPE_LE_ #elif defined( CPU ) #if CPU==PPC860 #define _OCT_ENDIAN_TYPE_BE_ diff --git a/octdev_types_swap.h b/octdev_types_swap.h index dc95c33..9cae3b4 100644 --- a/octdev_types_swap.h +++ b/octdev_types_swap.h @@ -2,7 +2,7 @@ File: octdev_types_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTDEV_TYPES_SWAP_H__ diff --git a/octoptions.h b/octoptions.h index e3e659d..9bb9f11 100644 --- a/octoptions.h +++ b/octoptions.h @@ -2,7 +2,7 @@ File: octoption.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Compiler conditionnal directives. 'octoptions_default' @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octpkt/octpkt_hdr.h b/octpkt/octpkt_hdr.h index b1794e8..7bdc8c4 100644 --- a/octpkt/octpkt_hdr.h +++ b/octpkt/octpkt_hdr.h @@ -2,7 +2,7 @@ File: OCTPKT_HDR.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octpkt/octpkt_hdr_swap.h b/octpkt/octpkt_hdr_swap.h index 15b8579..5a6d71a 100644 --- a/octpkt/octpkt_hdr_swap.h +++ b/octpkt/octpkt_hdr_swap.h @@ -2,7 +2,7 @@ File: octpkt_hdr_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTPKT_HDR_SWAP_H__ diff --git a/octpkt/octpkt_hdrxl.h b/octpkt/octpkt_hdrxl.h index 6c35cb9..ca4d110 100644 --- a/octpkt/octpkt_hdrxl.h +++ b/octpkt/octpkt_hdrxl.h @@ -2,7 +2,7 @@ File: OCTPKT_HDRXL.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octpkt/octpkt_hdrxl_swap.h b/octpkt/octpkt_hdrxl_swap.h index dea5008..692a54d 100644 --- a/octpkt/octpkt_hdrxl_swap.h +++ b/octpkt/octpkt_hdrxl_swap.h @@ -2,7 +2,7 @@ File: octpkt_hdrxl_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTPKT_HDRXL_SWAP_H__ diff --git a/octvc1/ctrl/octvc1_ctrl_api.h b/octvc1/ctrl/octvc1_ctrl_api.h index aa5e0e2..5cb39e1 100644 --- a/octvc1/ctrl/octvc1_ctrl_api.h +++ b/octvc1/ctrl/octvc1_ctrl_api.h @@ -2,7 +2,7 @@ File: OCTVC1_CTRL_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the CTRL API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/ctrl/octvc1_ctrl_api_priv.h b/octvc1/ctrl/octvc1_ctrl_api_priv.h index 6780946..0f9ec47 100644 --- a/octvc1/ctrl/octvc1_ctrl_api_priv.h +++ b/octvc1/ctrl/octvc1_ctrl_api_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_CTRL_API_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the CTRL API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h b/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h index ecb90da..aaa06cd 100644 --- a/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h +++ b/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_ctrl_api_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/octvc1/ctrl/octvc1_ctrl_api_swap.h b/octvc1/ctrl/octvc1_ctrl_api_swap.h index ff7af6b..62b0ec3 100644 --- a/octvc1/ctrl/octvc1_ctrl_api_swap.h +++ b/octvc1/ctrl/octvc1_ctrl_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_ctrl_api_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_CTRL_API_SWAP_H__ diff --git a/octvc1/ctrl/octvc1_ctrl_base.h b/octvc1/ctrl/octvc1_ctrl_base.h index 7221826..96f5a7d 100644 --- a/octvc1/ctrl/octvc1_ctrl_base.h +++ b/octvc1/ctrl/octvc1_ctrl_base.h @@ -2,7 +2,7 @@ File: OCTVC1_CTRL_BASE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the OCTVC1 API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/ctrl/octvc1_ctrl_id.h b/octvc1/ctrl/octvc1_ctrl_id.h index 563b74c..85ccdb4 100644 --- a/octvc1/ctrl/octvc1_ctrl_id.h +++ b/octvc1/ctrl/octvc1_ctrl_id.h @@ -2,7 +2,7 @@ File: OCTVC1_CTRL_ID.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the CTRL API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/ctrl/octvc1_ctrl_id_priv.h b/octvc1/ctrl/octvc1_ctrl_id_priv.h index e4a3a78..904d4f2 100644 --- a/octvc1/ctrl/octvc1_ctrl_id_priv.h +++ b/octvc1/ctrl/octvc1_ctrl_id_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_CTRL_ID_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the CTRL API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/ctrl/octvc1_ctrl_version.h b/octvc1/ctrl/octvc1_ctrl_version.h index 85d62b2..23094aa 100644 --- a/octvc1/ctrl/octvc1_ctrl_version.h +++ b/octvc1/ctrl/octvc1_ctrl_version.h @@ -2,7 +2,7 @@ File: OCTVC1_CTRL_VERSION.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the version of the CTRL API interface. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,23 +27,24 @@ $Octasic_Revision: $ #ifndef __OCTVC1_CTRL_VERSION_H__ #define __OCTVC1_CTRL_VERSION_H__ +#include "../octvc1_api.h" /* The version ID is separated into the following sections: - bit[31:25]: Major version - bit[24:18]: Minor version - bit[17:11]: Bug fix version - bit[10:0]: Build number + bit[31:27]: Major version + bit[26:21]: Minor version + bit[20:15]: Bug fix version + bit[14:0]: Build number */ #define cOCTVC1_CTRL_VERSION_MAJOR 2 -#define cOCTVC1_CTRL_VERSION_MINOR 9 +#define cOCTVC1_CTRL_VERSION_MINOR 11 #define cOCTVC1_CTRL_VERSION_MAINTENANCE 0 -#define cOCTVC1_CTRL_VERSION_BUILD 1607 +#define cOCTVC1_CTRL_VERSION_BUILD 1927 -#define cOCTVC1_CTRL_VERSION_ID ( (cOCTVC1_CTRL_VERSION_MAJOR << 25) + \ - (cOCTVC1_CTRL_VERSION_MINOR << 18) + \ - (cOCTVC1_CTRL_VERSION_MAINTENANCE << 11) + \ - cOCTVC1_CTRL_VERSION_BUILD ) +#define cOCTVC1_CTRL_VERSION_ID ( (cOCTVC1_CTRL_VERSION_MAJOR << cOCTVC1_API_VERSION_MASK_MAJOR_BIT_OFFSET) + \ + (cOCTVC1_CTRL_VERSION_MINOR << cOCTVC1_API_VERSION_MASK_MINOR_BIT_OFFSET) + \ + (cOCTVC1_CTRL_VERSION_MAINTENANCE << cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_OFFSET) + \ + (cOCTVC1_CTRL_VERSION_BUILD << cOCTVC1_API_VERSION_MASK_BUILD_BIT_OFFSET ) ) #endif /* __OCTVC1_CTRL_VERSION_H__ */ diff --git a/octvc1/gsm/octvc1_gsm_api.h b/octvc1/gsm/octvc1_gsm_api.h index 6609ca0..a947221 100644 --- a/octvc1/gsm/octvc1_gsm_api.h +++ b/octvc1/gsm/octvc1_gsm_api.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the GSM API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -52,6 +52,7 @@ $Revision: $ -------------------------------------------------------------------------------------*/ #define cOCTVC1_GSM_APPLICATION_ID_MODULE_PHY ((0x00)|(cOCTVC1_MODULE_ID_ENUM_GSM<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/gsm/octvc1_gsm_api_priv_swap.h b/octvc1/gsm/octvc1_gsm_api_priv_swap.h index 59e47b8..c036721 100644 --- a/octvc1/gsm/octvc1_gsm_api_priv_swap.h +++ b/octvc1/gsm/octvc1_gsm_api_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_gsm_api_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/octvc1/gsm/octvc1_gsm_api_swap.h b/octvc1/gsm/octvc1_gsm_api_swap.h index 66f3b77..e0c8420 100644 --- a/octvc1/gsm/octvc1_gsm_api_swap.h +++ b/octvc1/gsm/octvc1_gsm_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_gsm_api_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_GSM_API_SWAP_H__ @@ -62,6 +62,15 @@ extern "C" { #define mOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_SWAP( pType ) /* tOCT_UINT8 */ + +#define mOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM_SWAP( pType ) /* tOCT_UINT8 */ + + +#define mOCTVC1_GSM_CAPTURE_TYPE_ENUM_SWAP( pType ) /* tOCT_UINT8 */ + + +#define mOCTVC1_GSM_CAPTURE_STATUS_ENUM_SWAP( pType ) /* tOCT_UINT8 */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_SWAP( pType ){ \ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } @@ -78,6 +87,9 @@ extern "C" { #define mOCTVC1_GSM_STUB_MODE_ENUM_SWAP( pType ) /* tOCT_UINT8 */ +#define mOCTVC1_GSM_CAPTURE_MODE_ENUM_SWAP( pType ) /* tOCT_UINT8 */ + + #define mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( pType ) /* tOCT_UINT8 */ #if defined( _OCT_ENDIAN_TYPE_LE_ ) @@ -311,6 +323,16 @@ extern "C" { #define mOCTVC1_GSM_STUB_CHANNEL_ID_SWAP( pOCTVC1_GSM_STUB_CHANNEL_ID ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_CAPTURE_CHANNEL_ID_SWAP( _f_pParms ){ tOCTVC1_GSM_CAPTURE_CHANNEL_ID * pOCTVC1_GSM_CAPTURE_CHANNEL_ID = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_CAPTURE_CHANNEL_ID)\ + { mOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_SWAP( &((tOCTVC1_GSM_CAPTURE_CHANNEL_ID *)pOCTVC1_GSM_CAPTURE_CHANNEL_ID)->byTimeslotNb ); } \ + { mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( &((tOCTVC1_GSM_CAPTURE_CHANNEL_ID *)pOCTVC1_GSM_CAPTURE_CHANNEL_ID)->bySubChannelNb ); } \ + { mOCTVC1_GSM_CAPTURE_MODE_ENUM_SWAP( &((tOCTVC1_GSM_CAPTURE_CHANNEL_ID *)pOCTVC1_GSM_CAPTURE_CHANNEL_ID)->byCAPTUREMode ); } \ +} +#else +#define mOCTVC1_GSM_CAPTURE_CHANNEL_ID_SWAP( pOCTVC1_GSM_CAPTURE_CHANNEL_ID ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( _f_pParms ){ tOCTVC1_GSM_LOGICAL_CHANNEL_ID * pOCTVC1_GSM_LOGICAL_CHANNEL_ID = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_LOGICAL_CHANNEL_ID)\ { mOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_SWAP( &((tOCTVC1_GSM_LOGICAL_CHANNEL_ID *)pOCTVC1_GSM_LOGICAL_CHANNEL_ID)->byTimeslotNb ); } \ @@ -1302,6 +1324,42 @@ extern "C" { #define mOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD * pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD *)pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD)->Header ); } \ + ((tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD *)pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD)->ulOversample16xEnableFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD *)pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD)->ulOversample16xEnableFlag); \ +} +#else +#define mOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD_SWAP( pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_RSP * pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_RSP *)pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_RSP)->Header ); } \ +} +#else +#define mOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_RSP_SWAP( pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CMD * pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CMD *)pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CMD)->Header ); } \ +} +#else +#define mOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CMD_SWAP( pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP * pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP *)pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP)->Header ); } \ + ((tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP *)pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP)->ulOversample16xEnableFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP *)pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP)->ulOversample16xEnableFlag); \ +} +#else +#define mOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP_SWAP( pOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD * pOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD *)pOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD)->Header ); } \ @@ -1463,6 +1521,73 @@ extern "C" { #define mOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD * pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD)->Header ); } \ + { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD)->TrxId ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP * pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->Header ); } \ + { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->TrxId ); } \ + { mOCTVC1_GSM_CAPTURE_STATUS_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->Status ); } \ + { mOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->tracePoint ); } \ + { mOCTVC1_GSM_CAPTURE_TYPE_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->Type ); } \ + { mOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->TimeslotNb ); } \ + { mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->SubChannelNb ); } \ + ((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->blockCnt = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP)->blockCnt); \ +} +#else +#define mOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD * pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)->Header ); } \ + { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)->TrxId ); } \ + { mOCTVC1_GSM_CAPTURE_MODE_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)->Mode ); } \ + { mOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)->TimeslotNb ); } \ + { mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)->SubChannelNb ); } \ + { mOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)->tracePoint ); } \ + { mOCTVC1_GSM_CAPTURE_TYPE_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)->Type ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP * pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP)->Header ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD * pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD)->Header ); } \ + { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD)->TrxId ); } \ + { mOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD)->TimeslotNb ); } \ + { mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD)->SubChannelNb ); } \ + { mOCTVC1_GSM_CAPTURE_MODE_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD)->Mode ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP * pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP *)pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP)->Header ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA * pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)\ { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ModuleData ); } \ diff --git a/octvc1/gsm/octvc1_gsm_base.h b/octvc1/gsm/octvc1_gsm_base.h index e3e7faa..f6e632f 100644 --- a/octvc1/gsm/octvc1_gsm_base.h +++ b/octvc1/gsm/octvc1_gsm_base.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_BASE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the OCTVC1 API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/gsm/octvc1_gsm_default.h b/octvc1/gsm/octvc1_gsm_default.h index 7a8024d..c0c88d2 100644 --- a/octvc1/gsm/octvc1_gsm_default.h +++ b/octvc1/gsm/octvc1_gsm_default.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_DEFAULT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the GSM API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_GSM_DEFAULT_H__ #define __OCTVC1_GSM_DEFAULT_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_gsm_api.h" @@ -2327,6 +2330,67 @@ extern const tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TA } +/*-------------------------------------------------------------------------- + tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD +----------------------------------------------------------------------------*/ +#ifdef OCTVC1_OPT_DECLARE_DEFAULTS + +const tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD buf_tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD = +{ + { /* Header */ + ((sizeof(tOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CMD)<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_GSM_DEFAULT_PRIV_H__ #define __OCTVC1_GSM_DEFAULT_PRIV_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_gsm_api_priv.h" @@ -36,5 +39,9 @@ $Octasic_Revision: $ /***************************** MODULE_DATA *************************************/ +#ifdef __cplusplus +} +#endif + #endif /* __OCTVC1_GSM_DEFAULT_PRIV_H__ */ diff --git a/octvc1/gsm/octvc1_gsm_evt.h b/octvc1/gsm/octvc1_gsm_evt.h index 41af37b..812007d 100644 --- a/octvc1/gsm/octvc1_gsm_evt.h +++ b/octvc1/gsm/octvc1_gsm_evt.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ File: OCTVC1_GSM_EVT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the GSM API. @@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/gsm/octvc1_gsm_evt_priv.h b/octvc1/gsm/octvc1_gsm_evt_priv.h index 1a4ab3a..e0245d9 100644 --- a/octvc1/gsm/octvc1_gsm_evt_priv.h +++ b/octvc1/gsm/octvc1_gsm_evt_priv.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ File: OCTVC1_GSM_EVT_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the GSM API. @@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/gsm/octvc1_gsm_evt_priv_swap.h b/octvc1/gsm/octvc1_gsm_evt_priv_swap.h index 2448cc4..929492e 100644 --- a/octvc1/gsm/octvc1_gsm_evt_priv_swap.h +++ b/octvc1/gsm/octvc1_gsm_evt_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_gsm_evt_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/octvc1/gsm/octvc1_gsm_evt_swap.h b/octvc1/gsm/octvc1_gsm_evt_swap.h index 32c7169..080f876 100644 --- a/octvc1/gsm/octvc1_gsm_evt_swap.h +++ b/octvc1/gsm/octvc1_gsm_evt_swap.h @@ -2,7 +2,7 @@ File: octvc1_gsm_evt_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_GSM_EVT_SWAP_H__ diff --git a/octvc1/gsm/octvc1_gsm_id.h b/octvc1/gsm/octvc1_gsm_id.h index 1adc180..e5616ff 100644 --- a/octvc1/gsm/octvc1_gsm_id.h +++ b/octvc1/gsm/octvc1_gsm_id.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_ID.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the GSM API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -67,6 +67,8 @@ $Octasic_Revision: $ #define cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID ( 0x01e + cOCTVC1_GSM_CID_BASE ) #define cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID ( 0x01f + cOCTVC1_GSM_CID_BASE ) #define cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID ( 0x020 + cOCTVC1_GSM_CID_BASE ) +#define cOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CID ( 0x021 + cOCTVC1_GSM_CID_BASE ) +#define cOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CID ( 0x022 + cOCTVC1_GSM_CID_BASE ) #define cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID ( 0x035 + cOCTVC1_GSM_CID_BASE ) #define cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID ( 0x036 + cOCTVC1_GSM_CID_BASE ) #define cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID ( 0x037 + cOCTVC1_GSM_CID_BASE ) @@ -75,8 +77,11 @@ $Octasic_Revision: $ #define cOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CID ( 0x03a + cOCTVC1_GSM_CID_BASE ) #define cOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CID ( 0x03b + cOCTVC1_GSM_CID_BASE ) #define cOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CID ( 0x03c + cOCTVC1_GSM_CID_BASE ) +#define cOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CID ( 0x03d + cOCTVC1_GSM_CID_BASE ) +#define cOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CID ( 0x03e + cOCTVC1_GSM_CID_BASE ) +#define cOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CID ( 0x03f + cOCTVC1_GSM_CID_BASE ) -#define cOCTVC1_GSM_CID_MAX (( 0x03c + 1 ) & 0xFFF) +#define cOCTVC1_GSM_CID_MAX (( 0x03f + 1 ) & 0xFFF) /**************************************************************************** Event IDs diff --git a/octvc1/gsm/octvc1_gsm_id_priv.h b/octvc1/gsm/octvc1_gsm_id_priv.h index 9c8c3f5..25995cd 100644 --- a/octvc1/gsm/octvc1_gsm_id_priv.h +++ b/octvc1/gsm/octvc1_gsm_id_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_ID_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the GSM API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/gsm/octvc1_gsm_lic.h b/octvc1/gsm/octvc1_gsm_lic.h index aa5d66a..01e40b8 100644 --- a/octvc1/gsm/octvc1_gsm_lic.h +++ b/octvc1/gsm/octvc1_gsm_lic.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_LIC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the license ids for the GSM API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/gsm/octvc1_gsm_lic_priv.h b/octvc1/gsm/octvc1_gsm_lic_priv.h index d4c4ecb..39ef19b 100644 --- a/octvc1/gsm/octvc1_gsm_lic_priv.h +++ b/octvc1/gsm/octvc1_gsm_lic_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_LIC_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the license ids for the GSM API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/gsm/octvc1_gsm_rc.h b/octvc1/gsm/octvc1_gsm_rc.h index 4cc6e40..a6ec6bd 100644 --- a/octvc1/gsm/octvc1_gsm_rc.h +++ b/octvc1/gsm/octvc1_gsm_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_RC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the GSM API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -46,23 +46,24 @@ $Octasic_Revision: $ /**************************************************************************** TRX return codes ****************************************************************************/ -#define cOCTVC1_GSM_TRX_RC_BASE ( 0x0200 + cOCTVC1_GSM_RC_BASE ) +#define cOCTVC1_GSM_TRX_RC_BASE ( 0x0200 + cOCTVC1_GSM_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_RESOURCE_UNAVAILABLE ( 0x0000 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_ALREADY_OPENED ( 0x0001 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_ID_INVALID ( 0x0002 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_NOT_FOUND ( 0x0003 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_RADIO_INIT ( 0x0004 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_RADIO_CONFIG ( 0x0005 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_RADIO_RESET ( 0x0006 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_RADIO_TERMINATE ( 0x0007 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_CENTRE_FREQ_NOT_SAME_ACROSS_TRX ( 0x0008 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_CARRIER_OFFSET_OUTOF_RANGE ( 0x0009 + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_NOT_PROPERLY_SEPARATED ( 0x000a + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_BCCH_NOT_CONFIGURED ( 0x000b + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_CLOSE_NONPRIMARY_FIRST ( 0x000c + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_PARAMS_INVALID ( 0x000d + cOCTVC1_GSM_TRX_RC_BASE ) -#define cOCTVC1_GSM_RC_TRX_PRIMARY_ONLY_BCCH_CONFIGURED ( 0x000e + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_RESOURCE_UNAVAILABLE ( 0x0000 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_ALREADY_OPENED ( 0x0001 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_ID_INVALID ( 0x0002 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_NOT_FOUND ( 0x0003 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_RADIO_INIT ( 0x0004 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_RADIO_CONFIG ( 0x0005 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_RADIO_RESET ( 0x0006 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_RADIO_TERMINATE ( 0x0007 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_CENTRE_FREQ_NOT_SAME_ACROSS_TRX ( 0x0008 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_CARRIER_OFFSET_OUTOF_RANGE ( 0x0009 + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_NOT_PROPERLY_SEPARATED ( 0x000a + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_BCCH_NOT_CONFIGURED ( 0x000b + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_CLOSE_NONPRIMARY_FIRST ( 0x000c + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_PARAMS_INVALID ( 0x000d + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_PRIMARY_ONLY_BCCH_CONFIGURED ( 0x000e + cOCTVC1_GSM_TRX_RC_BASE ) +#define cOCTVC1_GSM_RC_TRX_PRE_CONFIG_OVERSAMPLE_SELECTION_NOT_DONE ( 0x000f + cOCTVC1_GSM_TRX_RC_BASE ) /**************************************************************************** PHYSICAL_CHANNEL return codes @@ -96,6 +97,13 @@ $Octasic_Revision: $ #define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_SAPI_INVALID ( 0x0005 + cOCTVC1_GSM_LOGICAL_CHANNEL_RC_BASE ) #define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_BCCH_BSIC_INVALID ( 0x0006 + cOCTVC1_GSM_LOGICAL_CHANNEL_RC_BASE ) +/**************************************************************************** + TEST_MODULE return codes + ****************************************************************************/ +#define cOCTVC1_GSM_TEST_MODULE_RC_BASE ( 0x0420 + cOCTVC1_GSM_RC_BASE ) + +#define cOCTVC1_GSM_RC_TEST_MODULE_GSM_MODULE_NOT_STARTED ( 0x0000 + cOCTVC1_GSM_TEST_MODULE_RC_BASE ) + /**************************************************************************** Validate return codes ****************************************************************************/ diff --git a/octvc1/gsm/octvc1_gsm_rc_priv.h b/octvc1/gsm/octvc1_gsm_rc_priv.h index 77f65b4..e65b1fe 100644 --- a/octvc1/gsm/octvc1_gsm_rc_priv.h +++ b/octvc1/gsm/octvc1_gsm_rc_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_RC_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the GSM API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/gsm/octvc1_gsm_version.h b/octvc1/gsm/octvc1_gsm_version.h index f59c6fd..1483663 100644 --- a/octvc1/gsm/octvc1_gsm_version.h +++ b/octvc1/gsm/octvc1_gsm_version.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_VERSION.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the version of the GSM API interface. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,23 +27,24 @@ $Octasic_Revision: $ #ifndef __OCTVC1_GSM_VERSION_H__ #define __OCTVC1_GSM_VERSION_H__ +#include "../octvc1_api.h" /* The version ID is separated into the following sections: - bit[31:25]: Major version - bit[24:18]: Minor version - bit[17:11]: Bug fix version - bit[10:0]: Build number + bit[31:27]: Major version + bit[26:21]: Minor version + bit[20:15]: Bug fix version + bit[14:0]: Build number */ #define cOCTVC1_GSM_VERSION_MAJOR 2 -#define cOCTVC1_GSM_VERSION_MINOR 9 +#define cOCTVC1_GSM_VERSION_MINOR 11 #define cOCTVC1_GSM_VERSION_MAINTENANCE 0 -#define cOCTVC1_GSM_VERSION_BUILD 1607 +#define cOCTVC1_GSM_VERSION_BUILD 1927 -#define cOCTVC1_GSM_VERSION_ID ( (cOCTVC1_GSM_VERSION_MAJOR << 25) + \ - (cOCTVC1_GSM_VERSION_MINOR << 18) + \ - (cOCTVC1_GSM_VERSION_MAINTENANCE << 11) + \ - cOCTVC1_GSM_VERSION_BUILD ) +#define cOCTVC1_GSM_VERSION_ID ( (cOCTVC1_GSM_VERSION_MAJOR << cOCTVC1_API_VERSION_MASK_MAJOR_BIT_OFFSET) + \ + (cOCTVC1_GSM_VERSION_MINOR << cOCTVC1_API_VERSION_MASK_MINOR_BIT_OFFSET) + \ + (cOCTVC1_GSM_VERSION_MAINTENANCE << cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_OFFSET) + \ + (cOCTVC1_GSM_VERSION_BUILD << cOCTVC1_API_VERSION_MASK_BUILD_BIT_OFFSET ) ) #endif /* __OCTVC1_GSM_VERSION_H__ */ diff --git a/octvc1/hw/octvc1_hw_api.h b/octvc1/hw/octvc1_hw_api.h index 352988e..a7b8d0a 100644 --- a/octvc1/hw/octvc1_hw_api.h +++ b/octvc1/hw/octvc1_hw_api.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the HW API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -451,7 +451,7 @@ typedef struct ulRxAverageBytePerSecond Average byte receive per seconds ulRxAveragePeriodUs - Average Time in micro second between two receive + Average Time in microseconds between two receive Frequency Current frequency -------------------------------------------------------------------------------------*/ @@ -477,7 +477,7 @@ typedef struct ulTxAverageBytePerSecond Average byte receive per seconds ulTxAveragePeriodUs - Average Time in micro second between two send + Average Time in microseconds between two send Frequency Current frequency -------------------------------------------------------------------------------------*/ @@ -525,27 +525,14 @@ typedef struct /* Base on config file informations. */ /*------------------------------------------------------------------------------------- - Clock Sync Manager Source Selection. + Clock Sync Manager DAC State. -------------------------------------------------------------------------------------*/ -#define tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM tOCT_UINT32 +#define tOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM tOCT_UINT32 -#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM_AUTOSELECT 0 /* Clock Source is selected by the PHY. */ - /* Base on config file informations. */ -#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM_CONFIG_FILE 1 /* Clock Source should be selected by the host application. */ - /* Host did not specify the source yet. */ - /* Expecting rate is defined by config file. */ -#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM_HOST_APPLICATION 2 /* Clock Source was selected by the host application. */ - /* Host did specify the source through API call. */ - -/*------------------------------------------------------------------------------------- - Clock Sync manager sync source state --------------------------------------------------------------------------------------*/ -#define tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM tOCT_UINT32 - -#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_INVALID 0 /* The clock source is not valid. */ - /* (Ex: GPS is not available). */ -#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_VALID 1 /* The clock source is valid. */ -#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_UNSPECIFIED 2 /* The clock source state was never specified by the host application. */ +#define cOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_UNUSED 0 /* Clock Sync Manager DAC mechanism is not used. */ +#define cOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_MASTER 1 /* Clock Sync Manager DAC mechanism is controled by the process. */ +#define cOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_SLAVE 2 /* Clock Sync Manager DAC mechanism is controled by another DSP. */ +#define cOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_FREE_RUNNING 3 /* Clock Sync Manager is disable. Clock asservissement is done externally. */ /*------------------------------------------------------------------------------------- Clock Sync manager state @@ -1216,14 +1203,13 @@ typedef struct OCTVC1 Message Header ulClkSourceRef Selected source for reference clock - ulClkSourceSelection - Clock source selection mode + ulMaxDriftDurationUs -------------------------------------------------------------------------------------*/ typedef struct { - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM ulClkSourceRef; - tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM ulClkSourceSelection; + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM ulClkSourceRef; + tOCT_INT32 ulMaxDriftDurationUs; } tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP; @@ -1251,116 +1237,25 @@ typedef struct OCTVC1 Message Header ulState Clock sync manager state - lClockError - Accumulated error on the tracked clock's control loop - lLastMeasuredError - The last clock error that got injected in the control loop - lDroppedCycles - Number of cycles (at ulPllFreqHz) that have been dropped by the control loop - This occurs when there a big gaps of the reference clock in the frequency - measurement unit, - which are likely caused by changes in the reference clock. - ulPllFreqHz - Frequency provided to the comparator and generators. - ulPllFractionalFreqHz - Fractional part of ulPllFreqHz. - ulSlipCnt - Number of times values exceeded the synchronization threshold while in the sync - state - ulSyncLossCnt - Number of times the clock manager left the synchronized state - ulSourceState - Clock source state + ulDacState + DAC state ulDacValue - Curent DAC value + Current DAC value ulOwnerProcessUid - ulFrequencyCorrectionFlag - Set to cOCT_TRUE when frequency correction is applied + ulDriftElapseTimeUs + Last calculated drift elapse time in microseconds. -------------------------------------------------------------------------------------*/ typedef struct { tOCTVC1_MSG_HEADER Header; tOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM ulState; - tOCT_INT32 lClockError; - tOCT_INT32 lLastMeasuredError; - tOCT_INT32 lDroppedCycles; - tOCT_UINT32 ulPllFreqHz; - tOCT_UINT32 ulPllFractionalFreqHz; - tOCT_UINT32 ulSlipCnt; - tOCT_UINT32 ulSyncLossCnt; - tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM ulSourceState; + tOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM ulDacState; tOCT_UINT32 ulDacValue; tOCTVC1_USER_ID_PROCESS_ENUM ulOwnerProcessUid; - tOCT_BOOL32 ulFrequencyCorrectionFlag; + tOCT_UINT32 ulDriftElapseTimeUs; } tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP; -/*------------------------------------------------------------------------------------- - tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP - - Members: - Header - OCTVC1 Message Header - ulClkSourceRef - Selected source for reference clock - ulSourceState - Selected source for reference clock --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM ulClkSourceRef; - tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM ulSourceState; - -} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD - - Members: - Header - OCTVC1 Message Header - ulClkSourceRef - Default: cOCTVC1_DO_NOT_MODIFY - Selected source for reference clock - ulSourceState - Default: cOCTVC1_DO_NOT_MODIFY - Selected source for reference clock --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM ulClkSourceRef; - tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM ulSourceState; - -} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP; - /*------------------------------------------------------------------------------------- tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD diff --git a/octvc1/hw/octvc1_hw_api_priv.h b/octvc1/hw/octvc1_hw_api_priv.h index 2b9081f..ce79c9a 100644 --- a/octvc1/hw/octvc1_hw_api_priv.h +++ b/octvc1/hw/octvc1_hw_api_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_API_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the HW API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -89,6 +89,8 @@ typedef struct Members: Header OCTVC1 Message Header + ulClkSourceRef + Selected source for reference clock ulDacInitValue Default: 0x00007600 DAC initial value. @@ -102,14 +104,18 @@ typedef struct reference. ulFrequencyCorrectionFlag Set to cOCT_TRUE when frequency correction should be applied. + ulMaxDriftDurationUs + Default: 40 -------------------------------------------------------------------------------------*/ typedef struct { - tOCTVC1_MSG_HEADER Header; - tOCT_UINT32 ulDacInitValue; - tOCT_UINT32 ulSyncWindowSize; - tOCT_INT32 lSyncThreshold; - tOCT_BOOL32 ulFrequencyCorrectionFlag; + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM ulClkSourceRef; + tOCT_UINT32 ulDacInitValue; + tOCT_UINT32 ulSyncWindowSize; + tOCT_INT32 lSyncThreshold; + tOCT_BOOL32 ulFrequencyCorrectionFlag; + tOCT_INT32 ulMaxDriftDurationUs; } tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD; @@ -152,6 +158,111 @@ typedef struct } tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_RSP; +/*------------------------------------------------------------------------------------- + tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD + + Members: + Header + OCTVC1 Message Header + ulState + Clock sync manager state + ulDacState + DAC state +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM ulState; + tOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM ulDacState; + +} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD + + Members: + Header + OCTVC1 Message Header + ulResetStatsFlag + Statistics counters will be reset to zero after the current values are returned. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_BOOL32 ulResetStatsFlag; + +} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP + + Members: + Header + OCTVC1 Message Header + ulState + Clock sync manager state + ulAutoSelectFlag + Set to true, when the clock source was select through GPIO. + lClockError + Accumulated error on the tracked clock's control loop + lLastMeasuredError + The last clock error that got injected in the control loop + lDroppedCycles + Number of cycles (at ulPllFreqHz) that have been dropped by the control loop + This occurs when there a big gaps of the reference clock in the frequency + measurement unit, + which are likely caused by changes in the reference clock. + ulPllFreqHz + Frequency provided to the comparator and generators. + ulPllFractionalFreqHz + Fractional part of ulPllFreqHz. + ulSlipCnt + Number of times values exceeded the synchronization threshold while in the sync + state + ulSyncLossCnt + Number of times the clock manager left the synchronized state + ulDacState + DAC state + ulDacValue + Current DAC value + ulOwnerProcessUid + ulFrequencyCorrectionFlag + Set to cOCT_TRUE when frequency correction is applied + ulDriftElapseTimeUs +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM ulState; + tOCT_BOOL32 ulAutoSelectFlag; + tOCT_INT32 lClockError; + tOCT_INT32 lLastMeasuredError; + tOCT_INT32 lDroppedCycles; + tOCT_UINT32 ulPllFreqHz; + tOCT_UINT32 ulPllFractionalFreqHz; + tOCT_UINT32 ulSlipCnt; + tOCT_UINT32 ulSyncLossCnt; + tOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM ulDacState; + tOCT_UINT32 ulDacValue; + tOCTVC1_USER_ID_PROCESS_ENUM ulOwnerProcessUid; + tOCT_BOOL32 ulFrequencyCorrectionFlag; + tOCT_UINT32 ulDriftElapseTimeUs; + +} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP; + /*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ #include "octvc1_hw_evt_priv.h" diff --git a/octvc1/hw/octvc1_hw_api_priv_swap.h b/octvc1/hw/octvc1_hw_api_priv_swap.h index d7a1ccd..51b0ab5 100644 --- a/octvc1/hw/octvc1_hw_api_priv_swap.h +++ b/octvc1/hw/octvc1_hw_api_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_hw_api_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -58,6 +58,7 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->Header ); } \ + { mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->ulClkSourceRef ); } \ ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->ulDacInitValue = \ mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->ulDacInitValue); \ ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->ulSyncWindowSize = \ @@ -66,6 +67,8 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->lSyncThreshold); \ ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->ulFrequencyCorrectionFlag = \ mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->ulFrequencyCorrectionFlag); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->ulMaxDriftDurationUs = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD)->ulMaxDriftDurationUs); \ } #else #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD ) @@ -95,6 +98,67 @@ extern "C" { #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_RSP_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD)->Header ); } \ + { mOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD)->ulState ); } \ + { mOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD)->ulDacState ); } \ +} +#else +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP)->Header ); } \ +} +#else +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD)->Header ); } \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD)->ulResetStatsFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD)->ulResetStatsFlag); \ +} +#else +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->Header ); } \ + { mOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulState ); } \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulAutoSelectFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulAutoSelectFlag); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->lClockError = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->lClockError); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->lLastMeasuredError = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->lLastMeasuredError); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->lDroppedCycles = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->lDroppedCycles); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulPllFreqHz = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulPllFreqHz); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulPllFractionalFreqHz = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulPllFractionalFreqHz); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulSlipCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulSlipCnt); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulSyncLossCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulSyncLossCnt); \ + { mOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulDacState ); } \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulDacValue = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulDacValue); \ + { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulOwnerProcessUid ); } \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulFrequencyCorrectionFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulFrequencyCorrectionFlag); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulDriftElapseTimeUs = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP)->ulDriftElapseTimeUs); \ +} +#else +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/hw/octvc1_hw_api_swap.h b/octvc1/hw/octvc1_hw_api_swap.h index a45921e..845d679 100644 --- a/octvc1/hw/octvc1_hw_api_swap.h +++ b/octvc1/hw/octvc1_hw_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_hw_api_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_HW_API_SWAP_H__ @@ -319,20 +319,11 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */ #if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM_SWAP( pType ){ \ +#define mOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_SWAP( pType ){ \ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } #else -#define mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM_SWAP( pType ) - -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_SWAP( pType ){ \ - *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } -#else - -#define mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_SWAP( pType ) +#define mOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_SWAP( pType ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ @@ -730,7 +721,8 @@ extern "C" { #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP)->Header ); } \ { mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP)->ulClkSourceRef ); } \ - { mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_SELECTION_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP)->ulClkSourceSelection ); } \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP)->ulMaxDriftDurationUs = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP)->ulMaxDriftDurationUs); \ } #else #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP ) @@ -750,67 +742,17 @@ extern "C" { #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->Header ); } \ { mOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulState ); } \ - ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lClockError = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lClockError); \ - ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lLastMeasuredError = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lLastMeasuredError); \ - ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lDroppedCycles = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lDroppedCycles); \ - ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulPllFreqHz = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulPllFreqHz); \ - ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulPllFractionalFreqHz = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulPllFractionalFreqHz); \ - ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulSlipCnt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulSlipCnt); \ - ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulSyncLossCnt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulSyncLossCnt); \ - { mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulSourceState ); } \ + { mOCTVC1_HW_CLOCK_SYNC_MGR_DAC_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulDacState ); } \ ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulDacValue = \ mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulDacValue); \ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulOwnerProcessUid ); } \ - ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulFrequencyCorrectionFlag = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulFrequencyCorrectionFlag); \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulDriftElapseTimeUs = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulDriftElapseTimeUs); \ } #else #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD)\ - { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD)->Header ); } \ -} -#else -#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP)\ - { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP)->Header ); } \ - { mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP)->ulClkSourceRef ); } \ - { mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP)->ulSourceState ); } \ -} -#else -#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD)\ - { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD)->Header ); } \ - { mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD)->ulClkSourceRef ); } \ - { mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD)->ulSourceState ); } \ -} -#else -#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP)\ - { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP)->Header ); } \ -} -#else -#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_RSP ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD * pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->Header ); } \ diff --git a/octvc1/hw/octvc1_hw_base.h b/octvc1/hw/octvc1_hw_base.h index ccf2332..8cfc583 100644 --- a/octvc1/hw/octvc1_hw_base.h +++ b/octvc1/hw/octvc1_hw_base.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_BASE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the OCTVC1 API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/hw/octvc1_hw_default.h b/octvc1/hw/octvc1_hw_default.h index edf9117..8372d53 100644 --- a/octvc1/hw/octvc1_hw_default.h +++ b/octvc1/hw/octvc1_hw_default.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_DEFAULT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the HW API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_HW_DEFAULT_H__ #define __OCTVC1_HW_DEFAULT_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_hw_api.h" @@ -631,68 +634,6 @@ extern const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CMD *g_pOctDef_tOCTVC1_HW_MSG_C } -/*-------------------------------------------------------------------------- - tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD -----------------------------------------------------------------------------*/ -#ifdef OCTVC1_OPT_DECLARE_DEFAULTS - -const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD buf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD = -{ - { /* Header */ - ((sizeof(tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD)<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_HW_DEFAULT_PRIV_H__ #define __OCTVC1_HW_DEFAULT_PRIV_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_hw_api_priv.h" @@ -81,10 +84,12 @@ const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD buf_tOCTVC1_HW_MSG_CLOCK_S 0, /* ulReturnCode */ 0 /* ulUserInfo */ }, + 0, /* ulClkSourceRef */ 0x00007600, /* ulDacInitValue */ 7, /* ulSyncWindowSize */ 10, /* lSyncThreshold */ - 0 /* ulFrequencyCorrectionFlag */ + 0, /* ulFrequencyCorrectionFlag */ + 40 /* ulMaxDriftDurationUs */ }; const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CMD = @@ -130,5 +135,72 @@ extern const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CMD *g_pOctDef_tOCTVC1_H } +/*-------------------------------------------------------------------------- + tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD +----------------------------------------------------------------------------*/ +#ifdef OCTVC1_OPT_DECLARE_DEFAULTS + +const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD buf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD = +{ + { /* Header */ + ((sizeof(tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD)<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -145,6 +145,20 @@ typedef struct } tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EVT; +/*------------------------------------------------------------------------------------- + tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT + + Members: + Header + ulDriftElapseTimeUs +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_EVENT_HEADER Header; + tOCT_UINT32 ulDriftElapseTimeUs; + +} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT; + #endif /* __OCTVC1_HW_EVT_H__ */ diff --git a/octvc1/hw/octvc1_hw_evt_priv.h b/octvc1/hw/octvc1_hw_evt_priv.h index 84fe046..34facd3 100644 --- a/octvc1/hw/octvc1_hw_evt_priv.h +++ b/octvc1/hw/octvc1_hw_evt_priv.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ File: OCTVC1_HW_EVT_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the HW API. @@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/hw/octvc1_hw_evt_priv_swap.h b/octvc1/hw/octvc1_hw_evt_priv_swap.h index 31fcce9..2e266a4 100644 --- a/octvc1/hw/octvc1_hw_evt_priv_swap.h +++ b/octvc1/hw/octvc1_hw_evt_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_hw_evt_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/octvc1/hw/octvc1_hw_evt_swap.h b/octvc1/hw/octvc1_hw_evt_swap.h index 62c4f0c..4afc129 100644 --- a/octvc1/hw/octvc1_hw_evt_swap.h +++ b/octvc1/hw/octvc1_hw_evt_swap.h @@ -2,7 +2,7 @@ File: octvc1_hw_evt_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_HW_EVT_SWAP_H__ @@ -107,6 +107,16 @@ extern "C" { #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EVT_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EVT ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT)\ + { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT)->Header ); } \ + ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT)->ulDriftElapseTimeUs = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT)->ulDriftElapseTimeUs); \ +} +#else +#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EVT ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/hw/octvc1_hw_id.h b/octvc1/hw/octvc1_hw_id.h index d4eb74a..eed9fa4 100644 --- a/octvc1/hw/octvc1_hw_id.h +++ b/octvc1/hw/octvc1_hw_id.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_ID.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the HW API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -53,14 +53,12 @@ $Octasic_Revision: $ #define cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CALIB_CID ( 0x011 + cOCTVC1_HW_CID_BASE ) #define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID ( 0x012 + cOCTVC1_HW_CID_BASE ) #define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID ( 0x013 + cOCTVC1_HW_CID_BASE ) -#define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID ( 0x014 + cOCTVC1_HW_CID_BASE ) -#define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID ( 0x015 + cOCTVC1_HW_CID_BASE ) #define cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID ( 0x018 + cOCTVC1_HW_CID_BASE ) #define cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CID ( 0x019 + cOCTVC1_HW_CID_BASE ) #define cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_FRONT_END_CID ( 0x01b + cOCTVC1_HW_CID_BASE ) #define cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_FRONT_END_CID ( 0x01c + cOCTVC1_HW_CID_BASE ) -#define cOCTVC1_HW_CID_MAX (( 0x01c + 1 ) & 0xFFF) +#define cOCTVC1_HW_CID_MAX (( 0x01d + 1 ) & 0xFFF) /**************************************************************************** Event IDs @@ -70,8 +68,9 @@ $Octasic_Revision: $ #define cOCTVC1_HW_MSG_RF_PORT_STATUS_CHANGE_EID ( 0x0003 + cOCTVC1_HW_EID_BASE ) #define cOCTVC1_HW_MSG_RF_PORT_ANTENNA_RX_CONFIG_STATUS_CHANGE_EID ( 0x0004 + cOCTVC1_HW_EID_BASE ) #define cOCTVC1_HW_MSG_RF_PORT_ANTENNA_TX_CONFIG_STATUS_CHANGE_EID ( 0x0005 + cOCTVC1_HW_EID_BASE ) +#define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EID ( 0x0006 + cOCTVC1_HW_EID_BASE ) -#define cOCTVC1_HW_EID_MAX (( 0x0005 + 1 ) & 0xFFFF) +#define cOCTVC1_HW_EID_MAX (( 0x0006 + 1 ) & 0xFFFF) #endif /* __OCTVC1_HW_ID_H__ */ diff --git a/octvc1/hw/octvc1_hw_id_priv.h b/octvc1/hw/octvc1_hw_id_priv.h index fc3c636..158ecce 100644 --- a/octvc1/hw/octvc1_hw_id_priv.h +++ b/octvc1/hw/octvc1_hw_id_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_ID_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the HW API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -38,6 +38,8 @@ $Octasic_Revision: $ #define cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID ( 0x008 + cOCTVC1_HW_CID_BASE ) #define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID ( 0x016 + cOCTVC1_HW_CID_BASE ) #define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID ( 0x017 + cOCTVC1_HW_CID_BASE ) +#define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CID ( 0x01a + cOCTVC1_HW_CID_BASE ) +#define cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CID ( 0x01d + cOCTVC1_HW_CID_BASE ) /**************************************************************************** Event IDs diff --git a/octvc1/hw/octvc1_hw_rc.h b/octvc1/hw/octvc1_hw_rc.h index e7e9d54..2399320 100644 --- a/octvc1/hw/octvc1_hw_rc.h +++ b/octvc1/hw/octvc1_hw_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_RC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the HW API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -61,19 +61,20 @@ $Octasic_Revision: $ /**************************************************************************** CLOCK_SYNC_MGR return codes ****************************************************************************/ -#define cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ( 0x0050 + cOCTVC1_HW_RC_BASE ) +#define cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ( 0x0050 + cOCTVC1_HW_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_ALREADY_OPEN ( 0x0000 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_OPEN_ERROR ( 0x0001 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_CLOSE_ERROR ( 0x0002 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_PCB_INFO ( 0x0003 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_OPEN_ERROR ( 0x0004 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_OPEN_ERROR ( 0x0005 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_CLOSE_ERROR ( 0x0006 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_CLOSE_ERROR ( 0x0007 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_STATS_ERROR ( 0x0008 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_SUPPORTED ( 0x0009 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) -#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_OPENED ( 0x000A + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_ALREADY_OPEN ( 0x0000 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_OPEN_ERROR ( 0x0001 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_CLOSE_ERROR ( 0x0002 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_PCB_INFO ( 0x0003 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_OPEN_ERROR ( 0x0004 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_OPEN_ERROR ( 0x0005 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_CLOSE_ERROR ( 0x0006 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_CLOSE_ERROR ( 0x0007 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_STATS_ERROR ( 0x0008 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_SUPPORTED ( 0x0009 + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_OPENED ( 0x000A + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) +#define cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_CLOCK_SRC_REF_ON_FREE_RUN ( 0x000B + cOCTVC1_HW_CLOCK_SYNC_MGR_RC_BASE ) /* Free running DAC_TYPE is only compatible with 1PPS clock src */ /**************************************************************************** Validate return codes diff --git a/octvc1/hw/octvc1_hw_rc_priv.h b/octvc1/hw/octvc1_hw_rc_priv.h index 36db7ed..9421444 100644 --- a/octvc1/hw/octvc1_hw_rc_priv.h +++ b/octvc1/hw/octvc1_hw_rc_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_RC_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the HW API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/hw/octvc1_hw_version.h b/octvc1/hw/octvc1_hw_version.h index 4054983..67cf89e 100644 --- a/octvc1/hw/octvc1_hw_version.h +++ b/octvc1/hw/octvc1_hw_version.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_VERSION.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the version of the HW API interface. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,23 +27,24 @@ $Octasic_Revision: $ #ifndef __OCTVC1_HW_VERSION_H__ #define __OCTVC1_HW_VERSION_H__ +#include "../octvc1_api.h" /* The version ID is separated into the following sections: - bit[31:25]: Major version - bit[24:18]: Minor version - bit[17:11]: Bug fix version - bit[10:0]: Build number + bit[31:27]: Major version + bit[26:21]: Minor version + bit[20:15]: Bug fix version + bit[14:0]: Build number */ #define cOCTVC1_HW_VERSION_MAJOR 2 -#define cOCTVC1_HW_VERSION_MINOR 9 +#define cOCTVC1_HW_VERSION_MINOR 11 #define cOCTVC1_HW_VERSION_MAINTENANCE 0 -#define cOCTVC1_HW_VERSION_BUILD 1607 +#define cOCTVC1_HW_VERSION_BUILD 1927 -#define cOCTVC1_HW_VERSION_ID ( (cOCTVC1_HW_VERSION_MAJOR << 25) + \ - (cOCTVC1_HW_VERSION_MINOR << 18) + \ - (cOCTVC1_HW_VERSION_MAINTENANCE << 11) + \ - cOCTVC1_HW_VERSION_BUILD ) +#define cOCTVC1_HW_VERSION_ID ( (cOCTVC1_HW_VERSION_MAJOR << cOCTVC1_API_VERSION_MASK_MAJOR_BIT_OFFSET) + \ + (cOCTVC1_HW_VERSION_MINOR << cOCTVC1_API_VERSION_MASK_MINOR_BIT_OFFSET) + \ + (cOCTVC1_HW_VERSION_MAINTENANCE << cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_OFFSET) + \ + (cOCTVC1_HW_VERSION_BUILD << cOCTVC1_API_VERSION_MASK_BUILD_BIT_OFFSET ) ) #endif /* __OCTVC1_HW_VERSION_H__ */ diff --git a/octvc1/irsc/octvc1_irsc_api.h b/octvc1/irsc/octvc1_irsc_api.h index 9ff1f6b..ec2128d 100644 --- a/octvc1/irsc/octvc1_irsc_api.h +++ b/octvc1/irsc/octvc1_irsc_api.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the IRSC API. OCTVC1 Internal Resources @@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -46,6 +46,7 @@ $Revision: $ #include "../octvc1_api.h" #include "../octvc1_module.h" #include "../octvc1_user_id.h" +#include "../octvc1_stream.h" #include "../octvc1_tap.h" #include "octvc1_irsc_id.h" @@ -206,6 +207,7 @@ typedef struct #define cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_DISABLE 0 #define cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_STOP 1 #define cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_START 2 +#define cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_PAUSE 3 /*------------------------------------------------------------------------------------- Tap state. @@ -246,30 +248,9 @@ typedef struct } tOCTVC1_IRSC_APPLICATION_TAP_INFO; -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_STREAM_STATS - Stream stats - - Members: - ulPacketCnt - ulDropCnt - ulOverflowCnt - ulRetryCnt - ulMissCnt --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT32 ulPacketCnt; - tOCT_UINT32 ulDropCnt; - tOCT_UINT32 ulOverflowCnt; - tOCT_UINT32 ulRetryCnt; - tOCT_UINT32 ulMissCnt; - -} tOCTVC1_IRSC_STREAM_STATS; - /*------------------------------------------------------------------------------------- tOCTVC1_IRSC_APPLICATION_TAP_STATS - API Command stats + TAP Command stats Members: ulState @@ -283,13 +264,13 @@ typedef struct tOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM ulState; tOCTVC1_INDEX ulFilterIndex; tOCT_UINT32 ulUserId; - tOCTVC1_IRSC_STREAM_STATS Stream; + tOCTVC1_STREAM_STATS Stream; } tOCTVC1_IRSC_APPLICATION_TAP_STATS; /*------------------------------------------------------------------------------------- tOCTVC1_IRSC_APPLICATION_TAP_START - API Command stats + Activate an application tap Members: ulMode @@ -307,6 +288,8 @@ typedef struct Default: cOCT_FALSE If true, Retry events will be sent when blocks are missing. Blocks will be dropped to ensure they are not kept out of sequence. + ulPauseOnStartFlag + May specify to pause the TAP on start. -------------------------------------------------------------------------------------*/ typedef struct { @@ -315,6 +298,7 @@ typedef struct tOCTVC1_INDEX ulFilterIndex; tOCT_UINT32 ulUserId; tOCT_BOOL32 ulRetryEnableFlag; + tOCT_BOOL32 ulPauseOnStartFlag; } tOCTVC1_IRSC_APPLICATION_TAP_START; @@ -326,6 +310,7 @@ typedef struct /*------------------------------------------------------------------------------------- IRSC Router -------------------------------------------------------------------------------------*/ +#define cOCTVC1_IRSC_ROUTER_STREAMER_LIMIT_BANDWIDTH_DISABLE 0xFFFFFFFF #define cOCTVC1_IRSC_ROUTER_MAX_INTERFACE 24 /*------------------------------------------------------------------------------------- @@ -456,6 +441,113 @@ typedef struct } tOCTVC1_IRSC_ROUTER_STATS; +/*------------------------------------------------------------------------------------- + Process related definitions. +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS_RECENT_MISSES_NUM 8 /* L1 cache misses history number. */ + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS + Process cache memory stats + + Members: + ulL1MaxSize + Maximum L1 memory size for cache fetching + ulL1UserLockedSize + L1 memory currently locked by user + ulL1CodeSize + Code cache size in bytes + ulL1DataSize + Data cache size in bytes + ulL1MissCnt + Not in L1 memory + ulTlbMissCnt + In L1 memory but not in TLB + ulL1CodeFetchCnt + Code cache line fetch + ulL1DataReadCnt + Data cache line fetch + ulL1DataWriteCnt + Data cache line fetch + aulRecentMisses + The most recent L1 misses +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulL1MaxSize; + tOCT_UINT32 ulL1UserLockedSize; + tOCT_UINT32 ulL1CodeSize; + tOCT_UINT32 ulL1DataSize; + tOCT_UINT32 ulL1MissCnt; + tOCT_UINT32 ulTlbMissCnt; + tOCT_UINT32 ulL1CodeFetchCnt; + tOCT_UINT32 ulL1DataReadCnt; + tOCT_UINT32 ulL1DataWriteCnt; + tOCT_UINT32 aulRecentMisses[cOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS_RECENT_MISSES_NUM]; + +} tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS + Process heap memory stats + + Members: + ulUsedSize + Used heap memory size in bytes + ulFreeSize + Free heap memory size in bytes + ulFreeLargestSize + Free largest heap memory block size + ulUsedBlocNum + Used heap memory block number + ulFreeBlocNum + Free heap memory block number +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulUsedSize; + tOCT_UINT32 ulFreeSize; + tOCT_UINT32 ulFreeLargestSize; + tOCT_UINT32 ulUsedBlocNum; + tOCT_UINT32 ulFreeBlocNum; + +} tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS + Process heap memory stats + + Members: + ulFreeSize + Current Free size + ulUnusedSize + Stack size allocation that was never used. + Available when called with ulStackScanFlag to true +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulFreeSize; + tOCT_UINT32 ulUnusedSize; + +} tOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS + Process heap memory stats + + Members: + ulTotalSize + Total scratch pad size in bytes. Allocate in local memory + ulMaxUsedSize + Max Used scratch pad size in bytes +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulTotalSize; + tOCT_UINT32 ulMaxUsedSize; + +} tOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS; + /***************************** METHODS *************************************/ /*------------------------------------------------------------------------------------- tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD @@ -489,6 +581,23 @@ typedef struct Process file name. ulModuleId Module Id. + ulRouterIfEnableFlag + Router Interface enable flag + if cOCT_TRUE, an router internal is enable between this process and router + Router interface allow this core send directly API event, send/receive + MODULE_DATA + ulIpcPortMax + Maximum number of ipc port + ulIpcFifoMax + Maximum number of ipc fifo + ulTaskMax + Maximum number of task + ulUserIpcPortMax + Maximum number of user ipc port + ulUserIpcFifoMax + Maximum number of user ipc fifo + ulUserTaskMax + Maximum number of user task -------------------------------------------------------------------------------------*/ typedef struct { @@ -498,6 +607,13 @@ typedef struct tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */ tOCT_INT8 szProcessImageName[(cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */ tOCT_UINT32 ulModuleId; + tOCT_BOOL32 ulRouterIfEnableFlag; + tOCT_UINT32 ulIpcPortMax; + tOCT_UINT32 ulIpcFifoMax; + tOCT_UINT32 ulTaskMax; + tOCT_UINT32 ulUserIpcPortMax; + tOCT_UINT32 ulUserIpcFifoMax; + tOCT_UINT32 ulUserTaskMax; } tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP; @@ -539,6 +655,8 @@ typedef struct State Current process state. ulTotalCacheMissCnt + ulTaskScratchPadLeakCnt + Number of tasks with scratchpad leak flag trigged Error Process Error -------------------------------------------------------------------------------------*/ @@ -548,6 +666,7 @@ typedef struct tOCTVC1_HANDLE_OBJECT hProcess; tOCTVC1_PROCESS_STATE_ENUM State; tOCT_UINT32 ulTotalCacheMissCnt; + tOCT_UINT32 ulTaskScratchPadLeakCnt; tOCTVC1_PROCESS_ERROR Error; } tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP; @@ -1537,6 +1656,46 @@ typedef struct } tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP; +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP + + Members: + Header + OCTVC1 Message Header + ulLimitBandwidthMbps + Maximal limit that target application will stream out data + ulToHostStreamSequenceIdInterval + For stream target to host, define the interval that host by send data packet + acknowledgement. + Presently, only apply on file stream transfer + ulToHostStreamInitialPktCnt + For stream target to host, define initial number of packet the stream will send + to host before waiting acknowledgement. + Most be egal or greater that ulToHostStreamSequenceIdInterval . + Presently, only apply on file stream transfer +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 ulLimitBandwidthMbps; + tOCT_UINT32 ulToHostStreamSequenceIdInterval; + tOCT_UINT32 ulToHostStreamInitialPktCnt; + +} tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP; + /*------------------------------------------------------------------------------------- tOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD This command retrieves the system global statistics. @@ -1573,6 +1732,354 @@ typedef struct } tOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_RSP; +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD + + Members: + Header + OCTVC1 Message Header + ulLimitBandwidthMbps + Range: [50..1000],cOCTVC1_IRSC_ROUTER_STREAMER_LIMIT_BANDWIDTH_DISABLE + Default: cOCTVC1_DO_NOT_MODIFY + Maximal limit that target application will stream out data + Set to cOCTVC1_IRSC_ROUTER_STREAMER_LIMIT_BANDWIDTH_DISABLE to disable + Bandwidth limitation + ulToHostStreamSequenceIdInterval + Range: [10..500] + Default: cOCTVC1_DO_NOT_MODIFY + For stream target to host, define the interval that host by send data packet + acknowledgement. + Presently, only apply on file stream transfer + ulToHostStreamInitialPktCnt + Range: [10..500] + Default: cOCTVC1_DO_NOT_MODIFY + For stream target to host, initial number of packet the stream will send to + host before waiting acknowledgement. + Most be egal or greater that ulToHostStreamSequenceIdInterval . + Attention, host application must have appropriated ethernet configuration. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 ulLimitBandwidthMbps; + tOCT_UINT32 ulToHostStreamSequenceIdInterval; + tOCT_UINT32 ulToHostStreamInitialPktCnt; + +} tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD + Retreive the memory statistics + + Members: + Header + OCTVC1 Message Header + hProcess + ulStackScanFlag + Default: cOCT_FALSE + If true, the stack will be scan to find the maximum amount of stack used in + this process. + Attention, the stack scan can take more than 1ms of execution in the process. + ulScratchPadResetFlag + Default: cOCT_FALSE + If true, the max used size will be reset. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCT_BOOL32 ulStackScanFlag; + tOCT_BOOL32 ulScratchPadResetFlag; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + Stack + Stack stats + Heap + Heap stats + ScratchPad + ScratchPad stats + Cache + Cache system stats +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS Stack; + tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS Heap; + tOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS ScratchPad; + tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS Cache; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD + + Members: + Header + OCTVC1 Message Header + SubObjectIdGet + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP + + Members: + Header + OCTVC1 Message Header + SubObjectIdGet + Object cursor + ObjectNameList + Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet; + tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME ObjectNameList; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulIndex + Resource index +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulIndex; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulIndex + Resource index + Resource +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulIndex; + tOCTVC1_RESOURCE Resource; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD + + Members: + Header + OCTVC1 Message Header + SubObjectIdGet + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP + + Members: + Header + OCTVC1 Message Header + SubObjectIdGet + Object cursor + ObjectNameList + Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet; + tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME ObjectNameList; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulIndex + Resource index +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulIndex; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulIndex + Resource index + Resource +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulIndex; + tOCTVC1_RESOURCE Resource; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD + + Members: + Header + OCTVC1 Message Header + hTapId + Default: cOCTVC1_HANDLE_INVALID + Tap handle identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + +} tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP + + Members: + Header + OCTVC1 Message Header + hTapId +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + +} tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD + + Members: + Header + OCTVC1 Message Header + hTapId + Default: cOCTVC1_HANDLE_INVALID + Tap handle identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + +} tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP + + Members: + Header + OCTVC1 Message Header + hTapId +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + +} tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP; + + +/***************************** MODULE_DATA *************************************/ +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA + + Members: + ModuleData + OCTVC1 Module Data + hStream + Contains an Object Handle of stream + This handle will also be placed in DataHeader.VocNetHeader.hLogicalObj + of the tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER at the header of each data packet + sent. + hOwner + Contains an Object Handle of the object responsable for the stream object + (hLogicalObj) + ulDataSize + ulSequenceId + In the case of a retry, request data starting from this Sequence ID + ulRetryFlag + Indicates if this event is a retry request +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MODULE_DATA ModuleData; + tOCTVC1_HANDLE_OBJECT hStream; + tOCTVC1_HANDLE_OBJECT hOwner; + tOCT_UINT32 ulDataSize; + tOCT_UINT32 ulSequenceId; + tOCT_BOOL32 ulRetryFlag; + +} tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA; + /*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ #include "octvc1_irsc_evt.h" diff --git a/octvc1/irsc/octvc1_irsc_api_priv.h b/octvc1/irsc/octvc1_irsc_api_priv.h index cf2753e..0d70374 100644 --- a/octvc1/irsc/octvc1_irsc_api_priv.h +++ b/octvc1/irsc/octvc1_irsc_api_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_API_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the IRSC API. OCTVC1 Internal Resources @@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -41,8 +41,11 @@ $Revision: $ + /***************************** METHODS *************************************/ +/***************************** MODULE_DATA *************************************/ + /*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ #include "octvc1_irsc_evt_priv.h" diff --git a/octvc1/irsc/octvc1_irsc_api_priv_swap.h b/octvc1/irsc/octvc1_irsc_api_priv_swap.h index 1357faa..6aa0bb0 100644 --- a/octvc1/irsc/octvc1_irsc_api_priv_swap.h +++ b/octvc1/irsc/octvc1_irsc_api_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_irsc_api_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/octvc1/irsc/octvc1_irsc_api_swap.h b/octvc1/irsc/octvc1_irsc_api_swap.h index 380918f..0983d5d 100644 --- a/octvc1/irsc/octvc1_irsc_api_swap.h +++ b/octvc1/irsc/octvc1_irsc_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_irsc_api_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_IRSC_API_SWAP_H__ @@ -155,23 +155,6 @@ extern "C" { #define mOCTVC1_IRSC_APPLICATION_TAP_INFO_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_INFO ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_IRSC_STREAM_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_STREAM_STATS * pOCTVC1_IRSC_STREAM_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_STREAM_STATS)\ - ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulPacketCnt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulPacketCnt); \ - ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulDropCnt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulDropCnt); \ - ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulOverflowCnt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulOverflowCnt); \ - ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulRetryCnt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulRetryCnt); \ - ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulMissCnt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulMissCnt); \ -} -#else -#define mOCTVC1_IRSC_STREAM_STATS_SWAP( pOCTVC1_IRSC_STREAM_STATS ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_IRSC_APPLICATION_TAP_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_APPLICATION_TAP_STATS * pOCTVC1_IRSC_APPLICATION_TAP_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_APPLICATION_TAP_STATS)\ { mOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulState ); } \ @@ -179,7 +162,7 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulFilterIndex); \ ((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulUserId = \ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulUserId); \ - { mOCTVC1_IRSC_STREAM_STATS_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->Stream ); } \ + { mOCTVC1_STREAM_STATS_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->Stream ); } \ } #else #define mOCTVC1_IRSC_APPLICATION_TAP_STATS_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_STATS ) @@ -196,6 +179,8 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulUserId); \ ((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulRetryEnableFlag = \ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulRetryEnableFlag); \ + ((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulPauseOnStartFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulPauseOnStartFlag); \ } #else #define mOCTVC1_IRSC_APPLICATION_TAP_START_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_START ) @@ -288,6 +273,75 @@ extern "C" { #define mOCTVC1_IRSC_ROUTER_STATS_SWAP( pOCTVC1_IRSC_ROUTER_STATS ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS * pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)\ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1MaxSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1MaxSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1UserLockedSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1UserLockedSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1CodeSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1CodeSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1DataSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1DataSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1MissCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1MissCnt); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulTlbMissCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulTlbMissCnt); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1CodeFetchCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1CodeFetchCnt); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1DataReadCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1DataReadCnt); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1DataWriteCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->ulL1DataWriteCnt); \ + { tOCT_UINT32 iOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS; \ + for( iOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS=0; \ + iOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS<(cOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS_RECENT_MISSES_NUM);iOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS++ ) \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->aulRecentMisses[iOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS] = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS)->aulRecentMisses[iOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS]);}\ +} +#else +#define mOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS_SWAP( pOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS * pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)\ + ((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulUsedSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulUsedSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulFreeSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulFreeSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulFreeLargestSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulFreeLargestSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulUsedBlocNum = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulUsedBlocNum); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulFreeBlocNum = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS)->ulFreeBlocNum); \ +} +#else +#define mOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS_SWAP( pOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS * pOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS)\ + ((tOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS)->ulFreeSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS)->ulFreeSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS)->ulUnusedSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS)->ulUnusedSize); \ +} +#else +#define mOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS_SWAP( pOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS * pOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS)\ + ((tOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS)->ulTotalSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS)->ulTotalSize); \ + ((tOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS)->ulMaxUsedSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS *)pOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS)->ulMaxUsedSize); \ +} +#else +#define mOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS_SWAP( pOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_IRSC_MSG_PROCESS_INFO_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD * pOCTVC1_IRSC_MSG_PROCESS_INFO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_INFO_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD *)pOCTVC1_IRSC_MSG_PROCESS_INFO_CMD)->Header ); } \ @@ -306,6 +360,20 @@ extern "C" { { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulUserId ); } \ ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulModuleId = \ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulModuleId); \ + ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulRouterIfEnableFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulRouterIfEnableFlag); \ + ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulIpcPortMax = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulIpcPortMax); \ + ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulIpcFifoMax = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulIpcFifoMax); \ + ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulTaskMax = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulTaskMax); \ + ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulUserIpcPortMax = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulUserIpcPortMax); \ + ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulUserIpcFifoMax = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulUserIpcFifoMax); \ + ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulUserTaskMax = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulUserTaskMax); \ } #else #define mOCTVC1_IRSC_MSG_PROCESS_INFO_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP ) @@ -335,6 +403,8 @@ extern "C" { { mOCTVC1_PROCESS_STATE_ENUM_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->State ); } \ ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->ulTotalCacheMissCnt = \ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->ulTotalCacheMissCnt); \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->ulTaskScratchPadLeakCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->ulTaskScratchPadLeakCnt); \ { mOCTVC1_PROCESS_ERROR_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->Error ); } \ } #else @@ -914,6 +984,28 @@ extern "C" { #define mOCTVC1_IRSC_MSG_ROUTER_STATS_RSP_SWAP( pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD * pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD *)pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD)->Header ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD_SWAP( pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP * pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP)->ulLimitBandwidthMbps = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP)->ulLimitBandwidthMbps); \ + ((tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP)->ulToHostStreamSequenceIdInterval = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP)->ulToHostStreamSequenceIdInterval); \ + ((tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP)->ulToHostStreamInitialPktCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP)->ulToHostStreamInitialPktCnt); \ +} +#else +#define mOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP_SWAP( pOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD * pOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD)->Header ); } \ @@ -936,6 +1028,202 @@ extern "C" { #define mOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD * pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *)pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *)pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)->ulLimitBandwidthMbps = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *)pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)->ulLimitBandwidthMbps); \ + ((tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *)pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)->ulToHostStreamSequenceIdInterval = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *)pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)->ulToHostStreamSequenceIdInterval); \ + ((tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *)pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)->ulToHostStreamInitialPktCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *)pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)->ulToHostStreamInitialPktCnt); \ +} +#else +#define mOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD_SWAP( pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP * pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP *)pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP)->Header ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP_SWAP( pOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD * pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)->hProcess = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)->hProcess); \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)->ulStackScanFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)->ulStackScanFlag); \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)->ulScratchPadResetFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)->ulScratchPadResetFlag); \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD_SWAP( pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP * pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP)->hProcess = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP)->hProcess); \ + { mOCTVC1_IRSC_PROCESS_MEMORY_STACK_STATS_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP)->Stack ); } \ + { mOCTVC1_IRSC_PROCESS_MEMORY_HEAP_STATS_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP)->Heap ); } \ + { mOCTVC1_IRSC_PROCESS_MEMORY_SCRATCH_PAD_STATS_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP)->ScratchPad ); } \ + { mOCTVC1_IRSC_PROCESS_MEMORY_CACHE_STATS_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP)->Cache ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD * pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD)->SubObjectIdGet ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD_SWAP( pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP * pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP)->SubObjectIdGet ); } \ + { mOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP)->ObjectNameList ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD * pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD)->hProcess = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD)->hProcess); \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD)->ulIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD)->ulIndex); \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD_SWAP( pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP * pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP)->hProcess = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP)->hProcess); \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP)->ulIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP)->ulIndex); \ + { mOCTVC1_RESOURCE_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP)->Resource ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD * pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD)->SubObjectIdGet ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD_SWAP( pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP * pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP)->SubObjectIdGet ); } \ + { mOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP)->ObjectNameList ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD * pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD)->hProcess = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD)->hProcess); \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD)->ulIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD)->ulIndex); \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD_SWAP( pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP * pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP)->hProcess = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP)->hProcess); \ + ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP)->ulIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP)->ulIndex); \ + { mOCTVC1_RESOURCE_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP)->Resource ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD * pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD)->hTapId); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP * pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP)->hTapId); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD * pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD)->hTapId); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP * pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP)->hTapId); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA * pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)\ + { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->ModuleData ); } \ + ((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->hStream = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->hStream); \ + ((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->hOwner = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->hOwner); \ + ((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->ulDataSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->ulDataSize); \ + ((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->ulSequenceId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->ulSequenceId); \ + ((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->ulRetryFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *)pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)->ulRetryFlag); \ +} +#else +#define mOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA_SWAP( pOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/irsc/octvc1_irsc_base.h b/octvc1/irsc/octvc1_irsc_base.h index d500055..cfa4760 100644 --- a/octvc1/irsc/octvc1_irsc_base.h +++ b/octvc1/irsc/octvc1_irsc_base.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_BASE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the OCTVC1 API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -43,6 +43,7 @@ $Octasic_Revision: $ /* Module: IRSC */ #define cOCTVC1_IRSC_CID_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_CID_BASE ) #define cOCTVC1_IRSC_EID_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_EID_BASE ) +#define cOCTVC1_IRSC_MID_BASE ( (cOCTVC1_IRSC_UID << 24) ) #define cOCTVC1_IRSC_RC_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_RC_BASE ) #endif /* __OCTVC1_IRSC_BASE_H__ */ diff --git a/octvc1/irsc/octvc1_irsc_default.h b/octvc1/irsc/octvc1_irsc_default.h index 6aec3d7..88edac0 100644 --- a/octvc1/irsc/octvc1_irsc_default.h +++ b/octvc1/irsc/octvc1_irsc_default.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_DEFAULT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the IRSC API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_IRSC_DEFAULT_H__ #define __OCTVC1_IRSC_DEFAULT_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_irsc_api.h" @@ -831,7 +834,8 @@ const tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD buf_tOCTVC1_IRSC_MSG_APPLICATIO cOCTVC1_IRSC_APPLICATION_TRANSPORT_MAX_DATA_SIZE, /* ulMaxTransportDataSize */ cOCTVC1_INDEX_INVALID, /* ulFilterIndex */ 0, /* ulUserId */ - cOCT_FALSE /* ulRetryEnableFlag */ + cOCT_FALSE, /* ulRetryEnableFlag */ + 0 /* ulPauseOnStartFlag */ } }; @@ -939,6 +943,36 @@ extern const tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTE } +/*-------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD +----------------------------------------------------------------------------*/ +#ifdef OCTVC1_OPT_DECLARE_DEFAULTS + +const tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD buf_tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD = +{ + { /* Header */ + ((sizeof(tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD)<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_IRSC_DEFAULT_PRIV_H__ #define __OCTVC1_IRSC_DEFAULT_PRIV_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_irsc_api_priv.h" @@ -34,5 +37,11 @@ $Octasic_Revision: $ /***************************** COMMAND DEFAULT *****************************/ +/***************************** MODULE_DATA *************************************/ + +#ifdef __cplusplus +} +#endif + #endif /* __OCTVC1_IRSC_DEFAULT_PRIV_H__ */ diff --git a/octvc1/irsc/octvc1_irsc_evt.h b/octvc1/irsc/octvc1_irsc_evt.h index 8756382..36e1ac0 100644 --- a/octvc1/irsc/octvc1_irsc_evt.h +++ b/octvc1/irsc/octvc1_irsc_evt.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ File: OCTVC1_IRSC_EVT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the IRSC API. @@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -48,35 +48,6 @@ typedef struct } tOCTVC1_IRSC_MSG_PROCESS_DUMP_EVT; -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT - - Members: - Header - hTapId - ulDataSize - hLogicalObj - Contains an Object Handle for the Tap that has been started - This handle will also be placed in - DataHeader.VocNetHeader.hLogicalObj.aulHandle[0] - of the tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER at the header of each data packet - sent. - ulSequenceId - In the case of a retry, request data starting from this Sequence ID - ulRetryFlag - Indicates if this event is a retry request --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_EVENT_HEADER Header; - tOCT_UINT32 hTapId; - tOCT_UINT32 ulDataSize; - tOCTVC1_HANDLE_OBJECT hLogicalObj; - tOCT_UINT32 ulSequenceId; - tOCT_BOOL32 ulRetryFlag; - -} tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT; - #endif /* __OCTVC1_IRSC_EVT_H__ */ diff --git a/octvc1/irsc/octvc1_irsc_evt_priv.h b/octvc1/irsc/octvc1_irsc_evt_priv.h index 0d638eb..2253b44 100644 --- a/octvc1/irsc/octvc1_irsc_evt_priv.h +++ b/octvc1/irsc/octvc1_irsc_evt_priv.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ File: OCTVC1_IRSC_EVT_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the IRSC API. @@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/irsc/octvc1_irsc_evt_priv_swap.h b/octvc1/irsc/octvc1_irsc_evt_priv_swap.h index f436f4d..c9023bc 100644 --- a/octvc1/irsc/octvc1_irsc_evt_priv_swap.h +++ b/octvc1/irsc/octvc1_irsc_evt_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_irsc_evt_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/octvc1/irsc/octvc1_irsc_evt_swap.h b/octvc1/irsc/octvc1_irsc_evt_swap.h index bb63506..5765e80 100644 --- a/octvc1/irsc/octvc1_irsc_evt_swap.h +++ b/octvc1/irsc/octvc1_irsc_evt_swap.h @@ -2,7 +2,7 @@ File: octvc1_irsc_evt_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_IRSC_EVT_SWAP_H__ @@ -45,24 +45,6 @@ extern "C" { #define mOCTVC1_IRSC_MSG_PROCESS_DUMP_EVT_SWAP( pOCTVC1_IRSC_MSG_PROCESS_DUMP_EVT ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT * pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)\ - { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->Header ); } \ - ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->hTapId = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->hTapId); \ - ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulDataSize = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulDataSize); \ - ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->hLogicalObj = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->hLogicalObj); \ - ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulSequenceId = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulSequenceId); \ - ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulRetryFlag = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulRetryFlag); \ -} -#else -#define mOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - #ifdef __cplusplus } diff --git a/octvc1/irsc/octvc1_irsc_id.h b/octvc1/irsc/octvc1_irsc_id.h index 9d77931..1d60e53 100644 --- a/octvc1/irsc/octvc1_irsc_id.h +++ b/octvc1/irsc/octvc1_irsc_id.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_ID.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the IRSC API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -35,45 +35,60 @@ $Octasic_Revision: $ /**************************************************************************** Command IDs ****************************************************************************/ -#define cOCTVC1_IRSC_MSG_PROCESS_INFO_CID ( 0x001 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_PROCESS_STATS_CID ( 0x002 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_PROCESS_LIST_CID ( 0x003 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID ( 0x004 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID ( 0x005 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID ( 0x006 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID ( 0x007 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID ( 0x008 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID ( 0x009 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID ( 0x00a + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID ( 0x00b + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID ( 0x00c + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID ( 0x00d + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID ( 0x00e + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID ( 0x00f + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID ( 0x010 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID ( 0x011 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID ( 0x012 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID ( 0x013 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID ( 0x014 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID ( 0x015 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID ( 0x016 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID ( 0x017 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID ( 0x018 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID ( 0x019 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID ( 0x01a + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_ROUTER_INFO_CID ( 0x01b + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_ROUTER_STATS_CID ( 0x01c + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CID ( 0x01d + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_INFO_CID ( 0x001 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_STATS_CID ( 0x002 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_LIST_CID ( 0x003 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID ( 0x004 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID ( 0x005 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID ( 0x006 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID ( 0x007 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID ( 0x008 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID ( 0x009 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID ( 0x00a + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID ( 0x00b + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID ( 0x00c + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID ( 0x00d + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID ( 0x00e + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID ( 0x00f + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID ( 0x010 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID ( 0x011 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID ( 0x012 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID ( 0x013 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID ( 0x014 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID ( 0x015 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID ( 0x016 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID ( 0x017 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID ( 0x018 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID ( 0x019 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID ( 0x01a + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_ROUTER_INFO_CID ( 0x01b + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_ROUTER_STATS_CID ( 0x01c + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CID ( 0x01d + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CID ( 0x01e + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CID ( 0x01f + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CID ( 0x020 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CID ( 0x021 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CID ( 0x022 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CID ( 0x023 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CID ( 0x024 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CID ( 0x026 + cOCTVC1_IRSC_CID_BASE ) +#define cOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CID ( 0x027 + cOCTVC1_IRSC_CID_BASE ) -#define cOCTVC1_IRSC_CID_MAX (( 0x01d + 1 ) & 0xFFF) +#define cOCTVC1_IRSC_CID_MAX (( 0x027 + 1 ) & 0xFFF) /**************************************************************************** Event IDs ****************************************************************************/ -#define cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID ( 0x0001 + cOCTVC1_IRSC_EID_BASE ) -#define cOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EID ( 0x0002 + cOCTVC1_IRSC_EID_BASE ) +#define cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID ( 0x0001 + cOCTVC1_IRSC_EID_BASE ) -#define cOCTVC1_IRSC_EID_MAX (( 0x0002 + 1 ) & 0xFFFF) +#define cOCTVC1_IRSC_EID_MAX (( 0x0001 + 1 ) & 0xFFFF) + +/**************************************************************************** + Module Data IDs + ****************************************************************************/ +#define cOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MID ( 0x0000 + cOCTVC1_IRSC_MID_BASE ) + +#define cOCTVC1_IRSC_MID_MAX (( 0x0000 + 1 ) & 0xFFFF) #endif /* __OCTVC1_IRSC_ID_H__ */ diff --git a/octvc1/irsc/octvc1_irsc_id_priv.h b/octvc1/irsc/octvc1_irsc_id_priv.h index e3a7c2c..667e2d4 100644 --- a/octvc1/irsc/octvc1_irsc_id_priv.h +++ b/octvc1/irsc/octvc1_irsc_id_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_ID_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the IRSC API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -40,6 +40,10 @@ $Octasic_Revision: $ Event IDs ****************************************************************************/ +/**************************************************************************** + Module Data IDs + ****************************************************************************/ + #endif /* __OCTVC1_IRSC_ID_PRIV_H__ */ diff --git a/octvc1/irsc/octvc1_irsc_rc.h b/octvc1/irsc/octvc1_irsc_rc.h index 21d414f..5a5db55 100644 --- a/octvc1/irsc/octvc1_irsc_rc.h +++ b/octvc1/irsc/octvc1_irsc_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_RC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the IRSC API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -65,5 +65,14 @@ $Octasic_Revision: $ #define cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_ALREADY_START ( 0x0004 + cOCTVC1_IRSC_API_COMMAND_RC_BASE ) #define cOCTVC1_IRSC_RC_API_COMMAND_INTERNAL_ERROR ( 0x0005 + cOCTVC1_IRSC_API_COMMAND_RC_BASE ) +/**************************************************************************** + Validate return codes + ****************************************************************************/ +#define cOCTVC1_IRSC_AUTO_VALIDATE_RC_BASE ( 0xF000 + cOCTVC1_IRSC_RC_BASE ) + +#define cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_LIMIT_BANDWIDTH_MBPS ( 0x1 + cOCTVC1_IRSC_AUTO_VALIDATE_RC_BASE ) +#define cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_TO_HOST_STREAM_SEQUENCE_ID_INTERVAL ( 0x2 + cOCTVC1_IRSC_AUTO_VALIDATE_RC_BASE ) +#define cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_TO_HOST_STREAM_INITIAL_PKT_CNT ( 0x3 + cOCTVC1_IRSC_AUTO_VALIDATE_RC_BASE ) + #endif /* OCTVC1_IRSC_RC_H__ */ diff --git a/octvc1/irsc/octvc1_irsc_rc_priv.h b/octvc1/irsc/octvc1_irsc_rc_priv.h index cfdf460..91328bd 100644 --- a/octvc1/irsc/octvc1_irsc_rc_priv.h +++ b/octvc1/irsc/octvc1_irsc_rc_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_RC_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the IRSC API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -36,5 +36,9 @@ $Octasic_Revision: $ IRSC return codes ****************************************************************************/ +/**************************************************************************** + Validate return codes + ****************************************************************************/ + #endif /* OCTVC1_IRSC_RC_PRIV_H__ */ diff --git a/octvc1/irsc/octvc1_irsc_version.h b/octvc1/irsc/octvc1_irsc_version.h index 92c8b44..9c6eed1 100644 --- a/octvc1/irsc/octvc1_irsc_version.h +++ b/octvc1/irsc/octvc1_irsc_version.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_VERSION.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the version of the IRSC API interface. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,23 +27,24 @@ $Octasic_Revision: $ #ifndef __OCTVC1_IRSC_VERSION_H__ #define __OCTVC1_IRSC_VERSION_H__ +#include "../octvc1_api.h" /* The version ID is separated into the following sections: - bit[31:25]: Major version - bit[24:18]: Minor version - bit[17:11]: Bug fix version - bit[10:0]: Build number + bit[31:27]: Major version + bit[26:21]: Minor version + bit[20:15]: Bug fix version + bit[14:0]: Build number */ #define cOCTVC1_IRSC_VERSION_MAJOR 2 -#define cOCTVC1_IRSC_VERSION_MINOR 9 +#define cOCTVC1_IRSC_VERSION_MINOR 11 #define cOCTVC1_IRSC_VERSION_MAINTENANCE 0 -#define cOCTVC1_IRSC_VERSION_BUILD 1607 +#define cOCTVC1_IRSC_VERSION_BUILD 1927 -#define cOCTVC1_IRSC_VERSION_ID ( (cOCTVC1_IRSC_VERSION_MAJOR << 25) + \ - (cOCTVC1_IRSC_VERSION_MINOR << 18) + \ - (cOCTVC1_IRSC_VERSION_MAINTENANCE << 11) + \ - cOCTVC1_IRSC_VERSION_BUILD ) +#define cOCTVC1_IRSC_VERSION_ID ( (cOCTVC1_IRSC_VERSION_MAJOR << cOCTVC1_API_VERSION_MASK_MAJOR_BIT_OFFSET) + \ + (cOCTVC1_IRSC_VERSION_MINOR << cOCTVC1_API_VERSION_MASK_MINOR_BIT_OFFSET) + \ + (cOCTVC1_IRSC_VERSION_MAINTENANCE << cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_OFFSET) + \ + (cOCTVC1_IRSC_VERSION_BUILD << cOCTVC1_API_VERSION_MASK_BUILD_BIT_OFFSET ) ) #endif /* __OCTVC1_IRSC_VERSION_H__ */ diff --git a/octvc1/job/octvc1_job_api.h b/octvc1/job/octvc1_job_api.h index 2bf3c56..3a34729 100644 --- a/octvc1/job/octvc1_job_api.h +++ b/octvc1/job/octvc1_job_api.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the JOB API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -52,8 +52,8 @@ $Revision: $ #define cOCTVC1_JOB_RUNNER_JOB_MAX_OBJ 8 /* Maximum object handle to pass as job parameter. */ #define cOCTVC1_JOB_RUNNER_JOB_STATS_MAX_LENGTH 128 /* Maximum number of char in szStats. */ #define cOCTVC1_JOB_RUNNER_JOB_RESULT_MAX_LENGTH 128 /* Maximum number of char in szStats. */ -#define cOCTVC1_JOB_PACKAGE_NAME_MAX_LENGTH 15 -#define cOCTVC1_JOB_SUITE_NAME_MAX_LENGTH 15 +#define cOCTVC1_JOB_PACKAGE_NAME_MAX_LENGTH 31 +#define cOCTVC1_JOB_SUITE_NAME_MAX_LENGTH 31 #define cOCTVC1_JOB_RUNNER_CASE_PENDING_PULSE_COUNT_FOREVER 0xFFFFFFFF /* Pending pulse forever */ #define cOCTVC1_JOB_RUNNER_CASE_STATS_MAX_LENGTH 1023 /* Maximum number of char in szStats. */ @@ -1655,14 +1655,14 @@ typedef struct ulRunnerCaseLevel Specify the runner level. Some job may change the number of iteration base on this setting. - fSendStateChangeEvt + ulSendStateChangeEvtFlag Specify to send runner executor state change events. -------------------------------------------------------------------------------------*/ typedef struct { tOCTVC1_MSG_HEADER Header; tOCTVC1_JOB_RUNNER_CASE_LEVEL_ENUM ulRunnerCaseLevel; - tOCT_BOOL32 fSendStateChangeEvt; + tOCT_BOOL32 ulSendStateChangeEvtFlag; } tOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP; @@ -1676,7 +1676,7 @@ typedef struct Default: cOCTVC1_DO_NOT_MODIFY Specify the runner level. Some job may change the number of iteration base on this setting. - fSendStateChangeEvt + ulSendStateChangeEvtFlag Default: cOCTVC1_DO_NOT_MODIFY Specify to send runner executor state change events. -------------------------------------------------------------------------------------*/ @@ -1684,7 +1684,7 @@ typedef struct { tOCTVC1_MSG_HEADER Header; tOCTVC1_JOB_RUNNER_CASE_LEVEL_ENUM ulRunnerCaseLevel; - tOCT_BOOL32 fSendStateChangeEvt; + tOCT_BOOL32 ulSendStateChangeEvtFlag; } tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD; diff --git a/octvc1/job/octvc1_job_api_priv.h b/octvc1/job/octvc1_job_api_priv.h index 1dead23..b322e92 100644 --- a/octvc1/job/octvc1_job_api_priv.h +++ b/octvc1/job/octvc1_job_api_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_API_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the JOB API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -36,6 +36,30 @@ $Revision: $ /************************ COMMON DEFINITIONS *******************************/ +/*------------------------------------------------------------------------------------- + tOCTVC1_JOB_UNIT_TEST_STATE_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_JOB_UNIT_TEST_STATE_ENUM tOCT_UINT32 + +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_LOGGER_START 0 +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_LOGGER_END 1 +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_PACKAGE_START 2 +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_PACKAGE_END 3 +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_SUITE_START 4 +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_SUITE_END 5 +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_CASE_START 6 +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_CASE_END 7 +#define cOCTVC1_JOB_UNIT_TEST_STATE_ENUM_CASE_ITERATION 8 + +/*------------------------------------------------------------------------------------- + tOCTVC1_JOB_UNIT_TEST_RESULT_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_JOB_UNIT_TEST_RESULT_ENUM tOCT_UINT32 + +#define cOCTVC1_JOB_UNIT_TEST_RESULT_ENUM_PASS 0 +#define cOCTVC1_JOB_UNIT_TEST_RESULT_ENUM_SKIP 1 +#define cOCTVC1_JOB_UNIT_TEST_RESULT_ENUM_ERROR 2 + /***************************** METHODS *************************************/ /*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ diff --git a/octvc1/job/octvc1_job_api_priv_swap.h b/octvc1/job/octvc1_job_api_priv_swap.h index 370641b..94e1d55 100644 --- a/octvc1/job/octvc1_job_api_priv_swap.h +++ b/octvc1/job/octvc1_job_api_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_job_api_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -33,6 +33,24 @@ extern "C" { /********************************* MACROS **********************************/ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_JOB_UNIT_TEST_STATE_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_JOB_UNIT_TEST_STATE_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_JOB_UNIT_TEST_RESULT_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_JOB_UNIT_TEST_RESULT_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/job/octvc1_job_api_swap.h b/octvc1/job/octvc1_job_api_swap.h index 82d05ec..09dd6b9 100644 --- a/octvc1/job/octvc1_job_api_swap.h +++ b/octvc1/job/octvc1_job_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_job_api_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_JOB_API_SWAP_H__ @@ -985,8 +985,8 @@ extern "C" { #define mOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP_SWAP( _f_pParms ){ tOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP * pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP *)pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP)->Header ); } \ { mOCTVC1_JOB_RUNNER_CASE_LEVEL_ENUM_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP *)pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP)->ulRunnerCaseLevel ); } \ - ((tOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP *)pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP)->fSendStateChangeEvt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP *)pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP)->fSendStateChangeEvt); \ + ((tOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP *)pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP)->ulSendStateChangeEvtFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP *)pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP)->ulSendStateChangeEvtFlag); \ } #else #define mOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP_SWAP( pOCTVC1_JOB_MSG_RUNNER_INFO_CONFIGURATION_RSP ) @@ -996,8 +996,8 @@ extern "C" { #define mOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD_SWAP( _f_pParms ){ tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD * pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD *)pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD)->Header ); } \ { mOCTVC1_JOB_RUNNER_CASE_LEVEL_ENUM_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD *)pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD)->ulRunnerCaseLevel ); } \ - ((tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD *)pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD)->fSendStateChangeEvt = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD *)pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD)->fSendStateChangeEvt); \ + ((tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD *)pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD)->ulSendStateChangeEvtFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD *)pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD)->ulSendStateChangeEvtFlag); \ } #else #define mOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD_SWAP( pOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD ) diff --git a/octvc1/job/octvc1_job_base.h b/octvc1/job/octvc1_job_base.h index a73171b..60cc202 100644 --- a/octvc1/job/octvc1_job_base.h +++ b/octvc1/job/octvc1_job_base.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_BASE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the OCTVC1 API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/job/octvc1_job_default.h b/octvc1/job/octvc1_job_default.h index 0aa2ee6..fbd614b 100644 --- a/octvc1/job/octvc1_job_default.h +++ b/octvc1/job/octvc1_job_default.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_DEFAULT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the JOB API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_JOB_DEFAULT_H__ #define __OCTVC1_JOB_DEFAULT_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_job_api.h" @@ -144,10 +147,10 @@ const tOCTVC1_JOB_MSG_UNITS_FIND_CMD buf_tOCTVC1_JOB_MSG_UNITS_FIND_CMD = 0 /* ulUserInfo */ }, { /* szPackageName */ - 0, /* szPackageName[0..15] */ + 0, /* szPackageName[0..31] */ }, { /* szSuiteName */ - 0, /* szSuiteName[0..15] */ + 0, /* szSuiteName[0..31] */ }, { /* szCaseName */ 0, /* szCaseName[0..31] */ @@ -1301,7 +1304,7 @@ const tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD buf_tOCTVC1_JOB_MSG_RUNNER 0 /* ulUserInfo */ }, cOCTVC1_DO_NOT_MODIFY, /* ulRunnerCaseLevel */ - cOCTVC1_DO_NOT_MODIFY /* fSendStateChangeEvt */ + cOCTVC1_DO_NOT_MODIFY /* ulSendStateChangeEvtFlag */ }; const tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD *g_pOctDef_tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD = @@ -1317,5 +1320,9 @@ extern const tOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CMD *g_pOctDef_tOCTVC1_ } +#ifdef __cplusplus +} +#endif + #endif /* __OCTVC1_JOB_DEFAULT_H__ */ diff --git a/octvc1/job/octvc1_job_default_priv.h b/octvc1/job/octvc1_job_default_priv.h index 7afbfce..481fb0e 100644 --- a/octvc1/job/octvc1_job_default_priv.h +++ b/octvc1/job/octvc1_job_default_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_DEFAULT_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the JOB API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_JOB_DEFAULT_PRIV_H__ #define __OCTVC1_JOB_DEFAULT_PRIV_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_job_api_priv.h" @@ -34,5 +37,9 @@ $Octasic_Revision: $ /***************************** COMMAND DEFAULT *****************************/ +#ifdef __cplusplus +} +#endif + #endif /* __OCTVC1_JOB_DEFAULT_PRIV_H__ */ diff --git a/octvc1/job/octvc1_job_evt.h b/octvc1/job/octvc1_job_evt.h index e4f46ae..42ef712 100644 --- a/octvc1/job/octvc1_job_evt.h +++ b/octvc1/job/octvc1_job_evt.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ File: OCTVC1_JOB_EVT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the JOB API. @@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -66,6 +66,25 @@ typedef struct } tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_STATE_CHANGE_EVT; +/*------------------------------------------------------------------------------------- + tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT + + Members: + Header + OCTVC1 Event Header + hExecutor + Executor handle identifier. + hRunnerCase + Job case identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_EVENT_HEADER Header; + tOCTVC1_HANDLE_OBJECT hExecutor; + tOCTVC1_HANDLE_OBJECT hRunnerCase; + +} tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT; + #endif /* __OCTVC1_JOB_EVT_H__ */ diff --git a/octvc1/job/octvc1_job_evt_priv.h b/octvc1/job/octvc1_job_evt_priv.h index 8dbe9a4..7194151 100644 --- a/octvc1/job/octvc1_job_evt_priv.h +++ b/octvc1/job/octvc1_job_evt_priv.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ File: OCTVC1_JOB_EVT_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the JOB API. @@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -35,17 +35,30 @@ $Octasic_Revision: $ /***************************** NOTIFICATIONS **********************************/ /*------------------------------------------------------------------------------------- - tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT + tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT Members: Header OCTVC1 Event Header + ulState + szPackageName + Job package name. + szSuiteName + Job suite name. + szCaseName + Active unit job case. + ulResult -------------------------------------------------------------------------------------*/ typedef struct { - tOCTVC1_EVENT_HEADER Header; + tOCTVC1_EVENT_HEADER Header; + tOCTVC1_JOB_UNIT_TEST_STATE_ENUM ulState; + tOCT_INT8 szPackageName[(cOCTVC1_JOB_PACKAGE_NAME_MAX_LENGTH+1)]; + tOCT_INT8 szSuiteName[(cOCTVC1_JOB_SUITE_NAME_MAX_LENGTH+1)]; + tOCT_INT8 szCaseName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)]; + tOCTVC1_JOB_UNIT_TEST_RESULT_ENUM ulResult; -} tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT; +} tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT; #endif /* __OCTVC1_JOB_EVT_PRIV_H__ */ diff --git a/octvc1/job/octvc1_job_evt_priv_swap.h b/octvc1/job/octvc1_job_evt_priv_swap.h index 2583be1..d7c3f3e 100644 --- a/octvc1/job/octvc1_job_evt_priv_swap.h +++ b/octvc1/job/octvc1_job_evt_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_job_evt_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -34,11 +34,13 @@ extern "C" { /********************************* MACROS **********************************/ #if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT_SWAP( _f_pParms ){ tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT * pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT)\ - { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT *)pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT)->Header ); } \ +#define mOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT_SWAP( _f_pParms ){ tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT * pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT)\ + { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT *)pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT)->Header ); } \ + { mOCTVC1_JOB_UNIT_TEST_STATE_ENUM_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT *)pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT)->ulState ); } \ + { mOCTVC1_JOB_UNIT_TEST_RESULT_ENUM_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT *)pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT)->ulResult ); } \ } #else -#define mOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT_SWAP( pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EVT ) +#define mOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT_SWAP( pOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EVT ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ #ifdef __cplusplus diff --git a/octvc1/job/octvc1_job_evt_swap.h b/octvc1/job/octvc1_job_evt_swap.h index ff43818..a09907d 100644 --- a/octvc1/job/octvc1_job_evt_swap.h +++ b/octvc1/job/octvc1_job_evt_swap.h @@ -2,7 +2,7 @@ File: octvc1_job_evt_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_JOB_EVT_SWAP_H__ @@ -49,6 +49,18 @@ extern "C" { #define mOCTVC1_JOB_MSG_RUNNER_EXECUTOR_STATE_CHANGE_EVT_SWAP( pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_STATE_CHANGE_EVT ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT_SWAP( _f_pParms ){ tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT * pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT)\ + { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT *)pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT)->Header ); } \ + ((tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT *)pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT)->hExecutor = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT *)pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT)->hExecutor); \ + ((tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT *)pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT)->hRunnerCase = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT *)pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT)->hRunnerCase); \ +} +#else +#define mOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT_SWAP( pOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EVT ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/job/octvc1_job_id.h b/octvc1/job/octvc1_job_id.h index 6169a03..61ddf87 100644 --- a/octvc1/job/octvc1_job_id.h +++ b/octvc1/job/octvc1_job_id.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_ID.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the JOB API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -81,9 +81,10 @@ $Octasic_Revision: $ /**************************************************************************** Event IDs ****************************************************************************/ -#define cOCTVC1_JOB_MSG_RUNNER_EXECUTOR_STATE_CHANGE_EID ( 0x0005 + cOCTVC1_JOB_EID_BASE ) +#define cOCTVC1_JOB_MSG_RUNNER_EXECUTOR_STATE_CHANGE_EID ( 0x0005 + cOCTVC1_JOB_EID_BASE ) +#define cOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EID ( 0x0006 + cOCTVC1_JOB_EID_BASE ) -#define cOCTVC1_JOB_EID_MAX (( 0x0007 + 1 ) & 0xFFFF) +#define cOCTVC1_JOB_EID_MAX (( 0x0007 + 1 ) & 0xFFFF) #endif /* __OCTVC1_JOB_ID_H__ */ diff --git a/octvc1/job/octvc1_job_id_priv.h b/octvc1/job/octvc1_job_id_priv.h index c391af2..5b26b57 100644 --- a/octvc1/job/octvc1_job_id_priv.h +++ b/octvc1/job/octvc1_job_id_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_ID_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the JOB API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -39,7 +39,7 @@ $Octasic_Revision: $ /**************************************************************************** Event IDs ****************************************************************************/ -#define cOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EID ( 0x0007 + cOCTVC1_JOB_EID_BASE ) +#define cOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EID ( 0x0007 + cOCTVC1_JOB_EID_BASE ) #endif /* __OCTVC1_JOB_ID_PRIV_H__ */ diff --git a/octvc1/job/octvc1_job_rc.h b/octvc1/job/octvc1_job_rc.h index 1f6384a..f64c7fe 100644 --- a/octvc1/job/octvc1_job_rc.h +++ b/octvc1/job/octvc1_job_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_RC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the JOB API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/job/octvc1_job_rc_priv.h b/octvc1/job/octvc1_job_rc_priv.h index 4e313a5..264ac97 100644 --- a/octvc1/job/octvc1_job_rc_priv.h +++ b/octvc1/job/octvc1_job_rc_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_RC_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the JOB API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/job/octvc1_job_version.h b/octvc1/job/octvc1_job_version.h index f9a8129..89bd357 100644 --- a/octvc1/job/octvc1_job_version.h +++ b/octvc1/job/octvc1_job_version.h @@ -2,7 +2,7 @@ File: OCTVC1_JOB_VERSION.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the version of the JOB API interface. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,23 +27,24 @@ $Octasic_Revision: $ #ifndef __OCTVC1_JOB_VERSION_H__ #define __OCTVC1_JOB_VERSION_H__ +#include "../octvc1_api.h" /* The version ID is separated into the following sections: - bit[31:25]: Major version - bit[24:18]: Minor version - bit[17:11]: Bug fix version - bit[10:0]: Build number + bit[31:27]: Major version + bit[26:21]: Minor version + bit[20:15]: Bug fix version + bit[14:0]: Build number */ #define cOCTVC1_JOB_VERSION_MAJOR 2 -#define cOCTVC1_JOB_VERSION_MINOR 9 +#define cOCTVC1_JOB_VERSION_MINOR 11 #define cOCTVC1_JOB_VERSION_MAINTENANCE 0 -#define cOCTVC1_JOB_VERSION_BUILD 1607 +#define cOCTVC1_JOB_VERSION_BUILD 1927 -#define cOCTVC1_JOB_VERSION_ID ( (cOCTVC1_JOB_VERSION_MAJOR << 25) + \ - (cOCTVC1_JOB_VERSION_MINOR << 18) + \ - (cOCTVC1_JOB_VERSION_MAINTENANCE << 11) + \ - cOCTVC1_JOB_VERSION_BUILD ) +#define cOCTVC1_JOB_VERSION_ID ( (cOCTVC1_JOB_VERSION_MAJOR << cOCTVC1_API_VERSION_MASK_MAJOR_BIT_OFFSET) + \ + (cOCTVC1_JOB_VERSION_MINOR << cOCTVC1_API_VERSION_MASK_MINOR_BIT_OFFSET) + \ + (cOCTVC1_JOB_VERSION_MAINTENANCE << cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_OFFSET) + \ + (cOCTVC1_JOB_VERSION_BUILD << cOCTVC1_API_VERSION_MASK_BUILD_BIT_OFFSET ) ) #endif /* __OCTVC1_JOB_VERSION_H__ */ diff --git a/octvc1/main/octvc1_main_api.h b/octvc1/main/octvc1_main_api.h index 80afe92..9fe82ed 100644 --- a/octvc1/main/octvc1_main_api.h +++ b/octvc1/main/octvc1_main_api.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the MAIN API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -36,6 +36,7 @@ $Revision: $ #include "../octvc1_fifo.h" #include "../octvc1_buffer.h" #include "../octvc1_eth.h" +#include "../octvc1_transport.h" #include "../octvc1_mac.h" #include "../octvc1_cursor.h" #include "../octvc1_list.h" @@ -44,6 +45,7 @@ $Revision: $ #include "../octvc1_api.h" #include "../octvc1_module.h" #include "../octvc1_user_id.h" +#include "../octvc1_stream.h" #include "octvc1_main_id.h" #include "octvc1_main_rc.h" @@ -51,6 +53,7 @@ $Revision: $ /************************ COMMON DEFINITIONS *******************************/ + /*------------------------------------------------------------------------------------- Target related definitions. -------------------------------------------------------------------------------------*/ @@ -195,30 +198,112 @@ typedef struct } tOCTVC1_MAIN_API_SESSION_HEARTBEAT_STATS; /*------------------------------------------------------------------------------------- - FILE related definiitons. + FILE SYSTEM related definitons. -------------------------------------------------------------------------------------*/ -#define cOCTVC1_MAIN_FILE_MAX_DATA_BYTE_SIZE 1200 /* File commands (read/write) buffer size, in bytes. */ -#define cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH 127 /* Filesystem string length restriction. */ + +#define cOCTVC1_MAIN_FILE_SYSTEM_NAME_MAX_LENGTH cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH /* File System Name string length restriction. */ +#define cOCTVC1_MAIN_FILE_SYSTEM_HOST_ROOT_PATH_MAX_LENGTH 255 /* File System Host Root path name string length restriction. */ /*------------------------------------------------------------------------------------- - tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR + tOCTVC1_MAIN_FILE_SYSTEM_OPEN_PARMS Members: - szFileName - NULL terminated name of the file. - ulGetMode - Default: cOCTVC1_OBJECT_CURSOR_ENUM_FIRST + szName + Filesystem name. Must be unique. + szHostRootPathName + Host root path name. -------------------------------------------------------------------------------------*/ typedef struct { - tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)]; - tOCTVC1_OBJECT_CURSOR_ENUM ulGetMode; + tOCT_INT8 szName[(cOCTVC1_MAIN_FILE_SYSTEM_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */ + tOCT_INT8 szHostRootPathName[(cOCTVC1_MAIN_FILE_SYSTEM_HOST_ROOT_PATH_MAX_LENGTH+1)];/* NOSWAPMAC */ -} tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR; +} tOCTVC1_MAIN_FILE_SYSTEM_OPEN_PARMS; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS + + Members: + hFileSystem + szName + Filesystem name. + szHostRootPathName + Host root path name. + ulFileCnt + NOTE: this the number of files added in this file system. + FileServerAddress + File server address. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_HANDLE_OBJECT hFileSystem; + tOCT_INT8 szName[(cOCTVC1_MAIN_FILE_SYSTEM_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */ + tOCT_INT8 szHostRootPathName[(cOCTVC1_MAIN_FILE_SYSTEM_HOST_ROOT_PATH_MAX_LENGTH+1)];/* NOSWAPMAC */ + tOCT_UINT32 ulFileCnt; + tOCTVC1_TRANSPORT_ADDRESS FileServerAddress; + +} tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS; + +/*------------------------------------------------------------------------------------- + FILE related definitons. +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_MAIN_FILE_MAX_DATA_BYTE_SIZE 1200 /* File commands (read/write) buffer size, in bytes. */ +#define cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH cOCTVC1_HANDLE_OBJECT32_NAME128_MAX_LENGTH /* File name string length restriction. */ /*------------------------------------------------------------------------------------- API command/response arguments file modes. -------------------------------------------------------------------------------------*/ +#define tOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM tOCT_UINT32 + +#define cOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_READ 0x1 /* Read from target */ +#define cOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_WRITE 0x2 /* Write to target */ + +/*------------------------------------------------------------------------------------- + API command/response arguments file modes. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM tOCT_UINT32 + +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_INVALID 0x00 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_WAIT_ACK 0x01 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_ACTIVE 0x02 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_WAIT_ACK_EOF 0x03 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_EOF 0x04 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_ACK_REPLY 0x05 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_ERROR 0x80 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_ERROR_NOT_FOUND 0x81 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_ERROR_ALREADY_OPEN 0x82 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_ERROR_NO_REQUEST_ACK 0x83 +#define cOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_ERROR_MISSING_DATA 0x84 + +/*------------------------------------------------------------------------------------- + File transfer mask. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_MAIN_FILE_TRANSFER_MASK tOCT_UINT32 + +#define cOCTVC1_MAIN_FILE_TRANSFER_MASK_NONE 0x00000000 +#define cOCTVC1_MAIN_FILE_TRANSFER_MASK_REWIND ((tOCT_UINT32)(0x1<<0) ) + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_FILE_TRANSFER_STATS + + Members: + Mode + Status + Stream +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM Mode; + tOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM Status; + tOCTVC1_STREAM_STATS Stream; + +} tOCTVC1_MAIN_FILE_TRANSFER_STATS; + +/*------------------------------------------------------------------------------------- + API command/response arguments file modes. + Note : deprecated. Replaced by FILE_TRANSFER_MODE_ENUM + Note : Opening both read and write at the same time is not supported. +-------------------------------------------------------------------------------------*/ #define tOCTVC1_MAIN_FILE_OPEN_MODE_MASK tOCT_UINT32 #define cOCTVC1_MAIN_FILE_OPEN_MODE_MASK_READ 0x1 @@ -342,6 +427,7 @@ typedef struct Main Module Data Definitions -------------------------------------------------------------------------------------*/ #define cOCTVC1_MAIN_MODULE_DATA_IPC ((0x0001)|(cOCTVC1_MODULE_ID_ENUM_MAIN<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -40,6 +40,58 @@ $Revision: $ -------------------------------------------------------------------------------------*/ #define cOCTVC1_MAIN_PRIVATE_API_CMD_PASSWORD 0x1FE75CB2 +/*------------------------------------------------------------------------------------- + Infraction related definitions. +-------------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM tOCT_UINT32 + +#define cOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM_NONE 0 +#define cOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM_MCC 1 + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER_VERSION_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER_VERSION_ENUM tOCT_UINT8 + +#define cOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER_VERSION_ENUM_1 0x01 /* Header size is 16 bytes */ + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER + Infraction file header + + Members: + ulModuleId + Associated module ID: tOCTVC1_MODULE_ID_ENUM + ulInfractionType + Infraction type + usInfractionIndex + Specify the index of the infraction based on the DSP total infraction number. + usInfractionMax + Specify the maximum number of the infraction. + ulPayloadLength + File infraction payload length. + ulOadfVersionId + OADF version Id. + aulReserved + Reserved for padding. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MODULE_ID_ENUM ulModuleId; + tOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM ulInfractionType; + tOCT_UINT16 usInfractionIndex; + tOCT_UINT16 usInfractionMax; + tOCT_UINT32 ulPayloadLength; + tOCT_UINT32 ulOadfVersionId; + tOCT_UINT32 aulReserved[cOCTVC1_ETH_PORT_ID_ENUM_3]; + +} tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER; + + @@ -49,6 +101,200 @@ $Revision: $ /***************************** METHODS *************************************/ +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD + + Members: + Header + OCTVC1 Message Header + hInfraction + Infraction identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hInfraction; + +} tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP + + Members: + Header + OCTVC1 Message Header + hInfraction + ulInfractionType + ulIndex + Specify the index of the infraction based on the DSP total infraction number. + szFileName + NULL terminated name of the file associated to this infraction. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hInfraction; + tOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM ulInfractionType; + tOCT_UINT32 ulIndex; + tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)]; + +} tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD + List the license infraction that occurs since the application start. + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + +} tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor + ObjectNameList + Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; + +} tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP + + Members: + Header + OCTVC1 Message Header + ulSendStateChangeEvtFlag + Specify to send infraction state change events. + ulSessionIndex + Session index where to send infraction state change events. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_BOOL32 ulSendStateChangeEvtFlag; + tOCTVC1_INDEX ulSessionIndex; + +} tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD + + Members: + Header + OCTVC1 Message Header + ulSendStateChangeEvtFlag + Default: cOCTVC1_DO_NOT_MODIFY + Specify to send infraction state change events. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_BOOL32 ulSendStateChangeEvtFlag; + +} tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP + + Members: + Header + OCTVC1 Message Header + ulApplyHiddenFlag +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_BOOL32 ulApplyHiddenFlag; + +} tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD + + Members: + Header + OCTVC1 Message Header + ulApplyHiddenFlag + Default: cOCTVC1_DO_NOT_MODIFY +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_BOOL32 ulApplyHiddenFlag; + +} tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP; + /***************************** MODULE_DATA *************************************/ diff --git a/octvc1/main/octvc1_main_api_priv_swap.h b/octvc1/main/octvc1_main_api_priv_swap.h index 07ff7ee..c89221a 100644 --- a/octvc1/main/octvc1_main_api_priv_swap.h +++ b/octvc1/main/octvc1_main_api_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_main_api_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -33,6 +33,156 @@ extern "C" { /********************************* MACROS **********************************/ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + + +#define mOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER_VERSION_ENUM_SWAP( pType ) /* tOCT_UINT8 */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER_SWAP( _f_pParms ){ tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER * pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)\ + { mOCTVC1_MODULE_ID_ENUM_SWAP( &((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->ulModuleId ); } \ + { mOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM_SWAP( &((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->ulInfractionType ); } \ + ((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->usInfractionIndex = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->usInfractionIndex); \ + ((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->usInfractionMax = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->usInfractionMax); \ + ((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->ulPayloadLength = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->ulPayloadLength); \ + ((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->ulOadfVersionId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->ulOadfVersionId); \ + { tOCT_UINT32 iOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER; \ + for( iOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER=0; \ + iOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER<(cOCTVC1_ETH_PORT_ID_ENUM_3);iOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER++ ) \ + ((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->aulReserved[iOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER] = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER *)pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER)->aulReserved[iOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER]);}\ +} +#else +#define mOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER_SWAP( pOCTVC1_MAIN_LICENSE_INFRACTION_FILE_HEADER ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD * pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD)->hInfraction = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD)->hInfraction); \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD_SWAP( pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP * pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP)->hInfraction = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP)->hInfraction); \ + { mOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP)->ulInfractionType ); } \ + ((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP)->ulIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP)->ulIndex); \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP_SWAP( pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD * pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD *)pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD *)pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD)->ObjectCursor ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD_SWAP( pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP * pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP)->ObjectCursor ); } \ + { mOCTVC1_LIST_NAME_OBJECT32_GET_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP *)pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP)->ObjectNameList ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP_SWAP( pOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD * pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD)->Header ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD_SWAP( pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP * pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP)->ulSendStateChangeEvtFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP)->ulSendStateChangeEvtFlag); \ + ((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP)->ulSessionIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP *)pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP)->ulSessionIndex); \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP_SWAP( pOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD * pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD *)pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD *)pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD)->ulSendStateChangeEvtFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD *)pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD)->ulSendStateChangeEvtFlag); \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD_SWAP( pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP * pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP *)pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP)->Header ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP_SWAP( pOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD)->Header ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP)->ulApplyHiddenFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP)->ulApplyHiddenFlag); \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD)->ulApplyHiddenFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD)->ulApplyHiddenFlag); \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP)->Header ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/main/octvc1_main_api_swap.h b/octvc1/main/octvc1_main_api_swap.h index b319302..6832da7 100644 --- a/octvc1/main/octvc1_main_api_swap.h +++ b/octvc1/main/octvc1_main_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_main_api_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_MAIN_API_SWAP_H__ @@ -125,11 +125,58 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */ #if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR_SWAP( _f_pParms ){ tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR * pOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR)\ - { mOCTVC1_OBJECT_CURSOR_ENUM_SWAP( &((tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR *)pOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR)->ulGetMode ); } \ +#define mOCTVC1_MAIN_FILE_SYSTEM_OPEN_PARMS_SWAP( _f_pParms ) +#else +#define mOCTVC1_MAIN_FILE_SYSTEM_OPEN_PARMS_SWAP( pOCTVC1_MAIN_FILE_SYSTEM_OPEN_PARMS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS_SWAP( _f_pParms ){ tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS * pOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS)\ + ((tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS *)pOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS *)pOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS)->hFileSystem); \ + ((tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS *)pOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS)->ulFileCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS *)pOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS)->ulFileCnt); \ + { mOCTVC1_TRANSPORT_ADDRESS_SWAP( &((tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS *)pOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS)->FileServerAddress ); } \ } #else -#define mOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR_SWAP( pOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR ) +#define mOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS_SWAP( pOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_FILE_TRANSFER_MASK_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_MAIN_FILE_TRANSFER_MASK_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_FILE_TRANSFER_STATS_SWAP( _f_pParms ){ tOCTVC1_MAIN_FILE_TRANSFER_STATS * pOCTVC1_MAIN_FILE_TRANSFER_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_FILE_TRANSFER_STATS)\ + { mOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_SWAP( &((tOCTVC1_MAIN_FILE_TRANSFER_STATS *)pOCTVC1_MAIN_FILE_TRANSFER_STATS)->Mode ); } \ + { mOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_SWAP( &((tOCTVC1_MAIN_FILE_TRANSFER_STATS *)pOCTVC1_MAIN_FILE_TRANSFER_STATS)->Status ); } \ + { mOCTVC1_STREAM_STATS_SWAP( &((tOCTVC1_MAIN_FILE_TRANSFER_STATS *)pOCTVC1_MAIN_FILE_TRANSFER_STATS)->Stream ); } \ +} +#else +#define mOCTVC1_MAIN_FILE_TRANSFER_STATS_SWAP( pOCTVC1_MAIN_FILE_TRANSFER_STATS ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ #if defined( _OCT_ENDIAN_TYPE_LE_ ) @@ -473,6 +520,10 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)->hFile); \ } #else #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD ) @@ -481,6 +532,10 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP)->hFile); \ } #else #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP ) @@ -583,6 +638,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD)->hFileSystem); \ } #else #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD ) @@ -591,8 +648,7 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP)->Header ); } \ - ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP)->ulMaxFileEntry = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP)->ulMaxFileEntry); \ + { mOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP)->InfoParms ); } \ } #else #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP ) @@ -601,7 +657,10 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD)->Header ); } \ - { mOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD)->ObjectGet ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD)->hFile); \ } #else #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD ) @@ -610,16 +669,16 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->Header ); } \ - { mOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ObjectGet ); } \ - { mOCTVC1_MAIN_FILE_OPEN_MODE_MASK_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulAccessMode ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->hFile); \ ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulHostOwnerFlag = \ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulHostOwnerFlag); \ ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulFileSize = \ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulFileSize); \ ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulMaxFileSize = \ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulMaxFileSize); \ - ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulInstanceNum = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulInstanceNum); \ } #else #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP ) @@ -1027,6 +1086,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)->hFileSystem); \ ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)->ulMaxFilesize = \ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)->ulMaxFilesize); \ } @@ -1037,6 +1098,10 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)->hFile); \ } #else #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP ) @@ -1070,6 +1135,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP * pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP)->hStreamObj = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP)->hStreamObj); \ } #else #define mOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP ) @@ -1131,6 +1198,44 @@ extern "C" { #define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD)->ObjectCursor ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP)->ObjectCursor ); } \ + { mOCTVC1_LIST_NAME_OBJECT32_GET_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP)->ObjectNameList ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD)->Header ); } \ + { mOCTVC1_MAIN_FILE_SYSTEM_OPEN_PARMS_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD)->OpenParms ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP)->hFileSystem); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_LICENSING_STATS_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_STATS_CMD * pOCTVC1_MAIN_MSG_LICENSING_STATS_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_STATS_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_STATS_CMD *)pOCTVC1_MAIN_MSG_LICENSING_STATS_CMD)->Header ); } \ @@ -1198,6 +1303,312 @@ extern "C" { #define mOCTVC1_MAIN_MSG_LICENSING_LIST_FEATURES_RSP_SWAP( pOCTVC1_MAIN_MSG_LICENSING_LIST_FEATURES_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD)->hFile); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP)->hFile); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)->ulNumByteToWrite = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)->ulNumByteToWrite); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP)->ulNumByteWritten = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP)->ulNumByteWritten); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)->ulMaxNumByteToRead = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)->ulMaxNumByteToRead); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP)->ulNumByteRead = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP)->ulNumByteRead); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD)->hFileSystem); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->ulHostOwnerFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->ulHostOwnerFlag); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->ulFileSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->ulFileSize); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->ulMaxFileSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP)->ulMaxFileSize); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD)->ulForceFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD)->ulForceFlag); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP)->hFileSystem); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD)->Header ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP)->Header ); } \ + { mOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP)->InfoParms ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD)->hFile); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP)->hFile); \ + { mOCTVC1_MAIN_FILE_TRANSFER_STATS_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP)->Stats ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD)->SubObjectIdGet ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP)->SubObjectIdGet ); } \ + { mOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP)->FileNameList ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD)->hFile); \ + { mOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD)->ulTransferMode ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP)->ulMinAlignBytes = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP)->ulMinAlignBytes); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA * pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)\ + { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->ModuleData ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->hStream = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->hStream); \ + { mOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->ulTransferMode ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->ulMinAlignBytes = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->ulMinAlignBytes); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->ulToHostStreamSequenceIdInterval = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)->ulToHostStreamSequenceIdInterval); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA * pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)\ + { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->ModuleData ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->hStream = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->hStream); \ + { mOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->ulStatus ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->ulFileSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)->ulFileSize); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA * pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)\ + { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)->ModuleData ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)->hStream = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)->hStream); \ + { mOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)->ulStatus ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA * pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)\ + { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->ModuleData ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->hStream = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->hStream); \ + { mOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->ulStatus ); } \ + { mOCTVC1_MAIN_FILE_TRANSFER_MASK_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->ulMask ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->ulDataSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)->ulDataSize); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA * pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)\ + { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->ModuleData ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->hFileSystem = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->hFileSystem); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->hFile = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->hFile); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->hStream = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->hStream); \ + { mOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->ulStatus ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->ulSequenceId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->ulSequenceId); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->ulPktAckCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)->ulPktAckCnt); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_MSG_LOG_DATA_MDA_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_DATA_MDA * pOCTVC1_MAIN_MSG_LOG_DATA_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_DATA_MDA)\ { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_MAIN_MSG_LOG_DATA_MDA *)pOCTVC1_MAIN_MSG_LOG_DATA_MDA)->ModuleData ); } \ diff --git a/octvc1/main/octvc1_main_base.h b/octvc1/main/octvc1_main_base.h index 52105a3..15334f4 100644 --- a/octvc1/main/octvc1_main_base.h +++ b/octvc1/main/octvc1_main_base.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_BASE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the OCTVC1 API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/main/octvc1_main_default.h b/octvc1/main/octvc1_main_default.h index c43ab94..e76ee92 100644 --- a/octvc1/main/octvc1_main_default.h +++ b/octvc1/main/octvc1_main_default.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_DEFAULT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the MAIN API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_MAIN_DEFAULT_H__ #define __OCTVC1_MAIN_DEFAULT_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_main_api.h" @@ -461,6 +464,8 @@ const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYS 0, /* ulReturnCode */ 0 /* ulUserInfo */ }, + 0, /* hFileSystem */ + 0, /* hFile */ { /* szFileName */ 0, /* szFileName[0..127] */ } @@ -496,7 +501,7 @@ const tOCTVC1_MAIN_MSG_FILE_WRITE_CMD buf_tOCTVC1_MAIN_MSG_FILE_WRITE_CMD = 0 /* ulUserInfo */ }, cOCTVC1_HANDLE_INVALID, /* hFile */ - 0, /* ulNumByteToWrite */ + 4, /* ulNumByteToWrite */ { /* abyData */ 0, /* abyData[0..1199] */ } @@ -626,7 +631,8 @@ const tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INF 0, /* ulSessionId */ 0, /* ulReturnCode */ 0 /* ulUserInfo */ - } + }, + 0x01000001 /* hFileSystem */ }; const tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD = @@ -657,12 +663,8 @@ const tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTE 0, /* ulReturnCode */ 0 /* ulUserInfo */ }, - { /* ObjectGet */ - { /* szFileName */ - 0, /* szFileName[0..127] */ - }, - cOCTVC1_OBJECT_CURSOR_ENUM_FIRST /* ulGetMode */ - } + 0, /* hFileSystem */ + 0 /* hFile */ }; const tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD = @@ -1303,6 +1305,7 @@ const tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM 0, /* ulReturnCode */ 0 /* ulUserInfo */ }, + 0, /* hFileSystem */ { /* szFileName */ 0, /* szFileName[0..127] */ }, @@ -1474,6 +1477,78 @@ extern const tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *g_pOctDef_tOCTVC1_MAI } +/*-------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD +----------------------------------------------------------------------------*/ +#ifdef OCTVC1_OPT_DECLARE_DEFAULTS + +const tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD = +{ + { /* Header */ + ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD)<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,6 +27,9 @@ $Octasic_Revision: $ #ifndef __OCTVC1_MAIN_DEFAULT_PRIV_H__ #define __OCTVC1_MAIN_DEFAULT_PRIV_H__ +#ifdef __cplusplus +extern "C" { +#endif /***************************** INCLUDE FILES *******************************/ #include "octvc1_main_api_priv.h" @@ -34,7 +37,198 @@ $Octasic_Revision: $ /***************************** COMMAND DEFAULT *****************************/ +/*-------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD +----------------------------------------------------------------------------*/ +#ifdef OCTVC1_OPT_DECLARE_DEFAULTS + +const tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD buf_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD = +{ + { /* Header */ + ((sizeof(tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD)<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/main/octvc1_main_evt_priv.h b/octvc1/main/octvc1_main_evt_priv.h index 826d347..baca2e6 100644 --- a/octvc1/main/octvc1_main_evt_priv.h +++ b/octvc1/main/octvc1_main_evt_priv.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ File: OCTVC1_MAIN_EVT_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the event definition of the MAIN API. @@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -34,6 +34,25 @@ $Octasic_Revision: $ /************************ COMMON DEFINITIONS *******************************/ /***************************** NOTIFICATIONS **********************************/ +/*------------------------------------------------------------------------------------- + tOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT + + Members: + Header + hInfraction + ulInfractionType + szFileName + NULL terminated name of the file associated to this infraction. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_EVENT_HEADER Header; + tOCTVC1_HANDLE_OBJECT hInfraction; + tOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM ulInfractionType; + tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)]; + +} tOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT; + #endif /* __OCTVC1_MAIN_EVT_PRIV_H__ */ diff --git a/octvc1/main/octvc1_main_evt_priv_swap.h b/octvc1/main/octvc1_main_evt_priv_swap.h index 59bca48..dc9e3dc 100644 --- a/octvc1/main/octvc1_main_evt_priv_swap.h +++ b/octvc1/main/octvc1_main_evt_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* File: octvc1_main_evt_priv_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: This program is free software; you can redistribute it and/or modify @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -33,6 +33,17 @@ extern "C" { /********************************* MACROS **********************************/ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT * pOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT)\ + { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT)->Header ); } \ + ((tOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT)->hInfraction = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT)->hInfraction); \ + { mOCTVC1_MAIN_LICENSE_INFRACTION_TYPE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT)->ulInfractionType ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT_SWAP( pOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EVT ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/main/octvc1_main_evt_swap.h b/octvc1/main/octvc1_main_evt_swap.h index 39a8210..fc3d56d 100644 --- a/octvc1/main/octvc1_main_evt_swap.h +++ b/octvc1/main/octvc1_main_evt_swap.h @@ -2,7 +2,7 @@ File: octvc1_main_evt_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_MAIN_EVT_SWAP_H__ diff --git a/octvc1/main/octvc1_main_id.h b/octvc1/main/octvc1_main_id.h index f1b1738..2a3358a 100644 --- a/octvc1/main/octvc1_main_id.h +++ b/octvc1/main/octvc1_main_id.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_ID.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the MAIN API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -81,30 +81,46 @@ $Octasic_Revision: $ #define cOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CID ( 0x030 + cOCTVC1_MAIN_CID_BASE ) #define cOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CID ( ( 0x031 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG ) #define cOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CID ( ( 0x032 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CID ( 0x033 + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CID ( 0x034 + cOCTVC1_MAIN_CID_BASE ) #define cOCTVC1_MAIN_MSG_LICENSING_STATS_CID ( 0x035 + cOCTVC1_MAIN_CID_BASE ) #define cOCTVC1_MAIN_MSG_LICENSING_INFO_FEATURES_CID ( 0x036 + cOCTVC1_MAIN_CID_BASE ) #define cOCTVC1_MAIN_MSG_LICENSING_LIST_FEATURES_CID ( 0x037 + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CID ( 0x038 + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CID ( ( 0x039 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CID ( 0x03a + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CID ( 0x03b + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CID ( 0x03c + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CID ( 0x03d + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CID ( 0x03e + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CID ( 0x03f + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CID ( 0x040 + cOCTVC1_MAIN_CID_BASE ) -#define cOCTVC1_MAIN_CID_MAX (( 0x037 + 1 ) & 0xFFF) +#define cOCTVC1_MAIN_CID_MAX (( 0x046 + 1 ) & 0xFFF) /**************************************************************************** Event IDs ****************************************************************************/ -#define cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID ( 0x0001 + cOCTVC1_MAIN_EID_BASE ) -#define cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID ( 0x0002 + cOCTVC1_MAIN_EID_BASE ) -#define cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID ( 0x0003 + cOCTVC1_MAIN_EID_BASE ) -#define cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID ( 0x0004 + cOCTVC1_MAIN_EID_BASE ) -#define cOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EID ( 0x0005 + cOCTVC1_MAIN_EID_BASE ) -#define cOCTVC1_MAIN_MSG_LICENSING_STATE_CHANGE_EID ( 0x0006 + cOCTVC1_MAIN_EID_BASE ) +#define cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID ( 0x0001 + cOCTVC1_MAIN_EID_BASE ) +#define cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID ( 0x0002 + cOCTVC1_MAIN_EID_BASE ) +#define cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID ( 0x0003 + cOCTVC1_MAIN_EID_BASE ) +#define cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID ( 0x0004 + cOCTVC1_MAIN_EID_BASE ) +#define cOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EID ( 0x0005 + cOCTVC1_MAIN_EID_BASE ) +#define cOCTVC1_MAIN_MSG_LICENSING_STATE_CHANGE_EID ( 0x0006 + cOCTVC1_MAIN_EID_BASE ) -#define cOCTVC1_MAIN_EID_MAX (( 0x0006 + 1 ) & 0xFFFF) +#define cOCTVC1_MAIN_EID_MAX (( 0x0007 + 1 ) & 0xFFFF) /**************************************************************************** Module Data IDs ****************************************************************************/ -#define cOCTVC1_MAIN_MSG_LOG_DATA_MID ( 0x0000 + cOCTVC1_MAIN_MID_BASE ) +#define cOCTVC1_MAIN_MSG_LOG_DATA_MID ( 0x0000 + cOCTVC1_MAIN_MID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MID ( 0x0001 + cOCTVC1_MAIN_MID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MID ( 0x0002 + cOCTVC1_MAIN_MID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MID ( 0x0003 + cOCTVC1_MAIN_MID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MID ( 0x0004 + cOCTVC1_MAIN_MID_BASE ) +#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MID ( 0x0005 + cOCTVC1_MAIN_MID_BASE ) -#define cOCTVC1_MAIN_MID_MAX (( 0x0000 + 1 ) & 0xFFFF) +#define cOCTVC1_MAIN_MID_MAX (( 0x0005 + 1 ) & 0xFFFF) #endif /* __OCTVC1_MAIN_ID_H__ */ diff --git a/octvc1/main/octvc1_main_id_priv.h b/octvc1/main/octvc1_main_id_priv.h index 974bd2f..585e376 100644 --- a/octvc1/main/octvc1_main_id_priv.h +++ b/octvc1/main/octvc1_main_id_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_ID_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the identifiers for the MAIN API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -35,10 +35,17 @@ $Octasic_Revision: $ /**************************************************************************** Command IDs ****************************************************************************/ +#define cOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CID ( 0x041 + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CID ( 0x042 + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CID ( 0x043 + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CID ( 0x044 + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CID ( 0x045 + cOCTVC1_MAIN_CID_BASE ) +#define cOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CID ( 0x046 + cOCTVC1_MAIN_CID_BASE ) /**************************************************************************** Event IDs ****************************************************************************/ +#define cOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EID ( 0x0007 + cOCTVC1_MAIN_EID_BASE ) /**************************************************************************** Module Data IDs diff --git a/octvc1/main/octvc1_main_rc.h b/octvc1/main/octvc1_main_rc.h index 6706e49..c39ca1e 100644 --- a/octvc1/main/octvc1_main_rc.h +++ b/octvc1/main/octvc1_main_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_RC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the MAIN API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -69,10 +69,16 @@ $Octasic_Revision: $ /**************************************************************************** FILE_SYSTEM return codes ****************************************************************************/ -#define cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ( 0x0300 + cOCTVC1_MAIN_RC_BASE ) +#define cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ( 0x0300 + cOCTVC1_MAIN_RC_BASE ) -#define cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO ( 0x0002 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) -#define cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE ( 0x0004 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) +#define cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO ( 0x0001 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) +#define cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE ( 0x0002 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) +#define cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_CLOSE_LOCAL ( 0x0003 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) +#define cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_ADD_REMOTE_FILE ( 0x0004 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) +#define cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_DELETE_REMOTE_FILE ( 0x0005 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) +#define cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_TRANSFER_REMOTE_FILE ( 0x0006 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) +#define cOCTVC1_MAIN_RC_FILE_SYSTEM_NAME ( 0x0007 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) +#define cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_CLOSE_FILE_STILL_OPEN ( 0x0008 + cOCTVC1_MAIN_FILE_SYSTEM_RC_BASE ) /**************************************************************************** APPLICATION return codes diff --git a/octvc1/main/octvc1_main_rc_priv.h b/octvc1/main/octvc1_main_rc_priv.h index 9db439d..6561a17 100644 --- a/octvc1/main/octvc1_main_rc_priv.h +++ b/octvc1/main/octvc1_main_rc_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_RC_PRIV.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the MAIN API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/main/octvc1_main_version.h b/octvc1/main/octvc1_main_version.h index 34172cd..c8d3d75 100644 --- a/octvc1/main/octvc1_main_version.h +++ b/octvc1/main/octvc1_main_version.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_VERSION.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the version of the MAIN API interface. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -27,23 +27,24 @@ $Octasic_Revision: $ #ifndef __OCTVC1_MAIN_VERSION_H__ #define __OCTVC1_MAIN_VERSION_H__ +#include "../octvc1_api.h" /* The version ID is separated into the following sections: - bit[31:25]: Major version - bit[24:18]: Minor version - bit[17:11]: Bug fix version - bit[10:0]: Build number + bit[31:27]: Major version + bit[26:21]: Minor version + bit[20:15]: Bug fix version + bit[14:0]: Build number */ #define cOCTVC1_MAIN_VERSION_MAJOR 2 -#define cOCTVC1_MAIN_VERSION_MINOR 9 +#define cOCTVC1_MAIN_VERSION_MINOR 11 #define cOCTVC1_MAIN_VERSION_MAINTENANCE 0 -#define cOCTVC1_MAIN_VERSION_BUILD 1607 +#define cOCTVC1_MAIN_VERSION_BUILD 1927 -#define cOCTVC1_MAIN_VERSION_ID ( (cOCTVC1_MAIN_VERSION_MAJOR << 25) + \ - (cOCTVC1_MAIN_VERSION_MINOR << 18) + \ - (cOCTVC1_MAIN_VERSION_MAINTENANCE << 11) + \ - cOCTVC1_MAIN_VERSION_BUILD ) +#define cOCTVC1_MAIN_VERSION_ID ( (cOCTVC1_MAIN_VERSION_MAJOR << cOCTVC1_API_VERSION_MASK_MAJOR_BIT_OFFSET) + \ + (cOCTVC1_MAIN_VERSION_MINOR << cOCTVC1_API_VERSION_MASK_MINOR_BIT_OFFSET) + \ + (cOCTVC1_MAIN_VERSION_MAINTENANCE << cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_OFFSET) + \ + (cOCTVC1_MAIN_VERSION_BUILD << cOCTVC1_API_VERSION_MASK_BUILD_BIT_OFFSET ) ) #endif /* __OCTVC1_MAIN_VERSION_H__ */ diff --git a/octvc1/octvc1_api.h b/octvc1/octvc1_api.h index c055506..767cd95 100644 --- a/octvc1/octvc1_api.h +++ b/octvc1/octvc1_api.h @@ -2,7 +2,7 @@ File: OCTVC1_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -91,6 +91,31 @@ typedef struct } tOCTVC1_API_SESSION_EVT_INFO; +/*------------------------------------------------------------------------------------- + API Version Format +-------------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------------- + tOCTVC1_API_VERSION_MASK : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_API_VERSION_MASK tOCT_UINT32 + +#define cOCTVC1_API_VERSION_MASK_MAJOR_BIT_MASK 0x0000001F +#define cOCTVC1_API_VERSION_MASK_MAJOR_BIT_OFFSET 27 +#define cOCTVC1_API_VERSION_MASK_MAJOR ((tOCT_UINT32)(cOCTVC1_API_VERSION_MASK_MAJOR_BIT_MASK<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_API_SWAP_H__ @@ -71,6 +71,15 @@ extern "C" { #define mOCTVC1_API_SESSION_EVT_INFO_SWAP( pOCTVC1_API_SESSION_EVT_INFO ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_API_VERSION_MASK_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_API_VERSION_MASK_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/octvc1_app.h b/octvc1/octvc1_app.h index d6873b0..66f8804 100644 --- a/octvc1/octvc1_app.h +++ b/octvc1/octvc1_app.h @@ -2,7 +2,7 @@ File: OCTVC1_APP.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the OCTVC1 API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -39,9 +39,9 @@ $Octasic_Revision: $ #define cOCTVC1_APP_PRODUCT_SHORT_NAME "octsdr_gsm" #define cOCTVC1_APP_PRODUCT_GOOSE_ROOT_NAME "octsdr" #define cOCTVC1_APP_VERSION_MAJOR 2 -#define cOCTVC1_APP_VERSION_MINOR 9 +#define cOCTVC1_APP_VERSION_MINOR 11 #define cOCTVC1_APP_VERSION_MAINTENANCE 0 -#define cOCTVC1_APP_VERSION_BUILD 1607 +#define cOCTVC1_APP_VERSION_BUILD 1927 #define cOCTVC1_APP_VERSION_ID ((cOCTVC1_APP_VERSION_MAJOR << 25) + \ (cOCTVC1_APP_VERSION_MINOR << 18) + \ (cOCTVC1_APP_VERSION_MAINTENANCE << 11) + \ diff --git a/octvc1/octvc1_base.h b/octvc1/octvc1_base.h index 4d83957..c6abf9a 100644 --- a/octvc1/octvc1_base.h +++ b/octvc1/octvc1_base.h @@ -2,7 +2,7 @@ File: OCTVC1_BASE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the definition of the OCTVC1 API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/octvc1_buffer.h b/octvc1/octvc1_buffer.h index 2ed812b..038bfb3 100644 --- a/octvc1/octvc1_buffer.h +++ b/octvc1/octvc1_buffer.h @@ -2,7 +2,7 @@ File: OCTVC1_BUFFER.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_buffer_swap.h b/octvc1/octvc1_buffer_swap.h index 8983738..ae2a98e 100644 --- a/octvc1/octvc1_buffer_swap.h +++ b/octvc1/octvc1_buffer_swap.h @@ -2,7 +2,7 @@ File: octvc1_buffer_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_BUFFER_SWAP_H__ diff --git a/octvc1/octvc1_cursor.h b/octvc1/octvc1_cursor.h index fe0d1b9..2526205 100644 --- a/octvc1/octvc1_cursor.h +++ b/octvc1/octvc1_cursor.h @@ -2,7 +2,7 @@ File: OCTVC1_CURSOR.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_cursor_swap.h b/octvc1/octvc1_cursor_swap.h index ffd3935..e263f13 100644 --- a/octvc1/octvc1_cursor_swap.h +++ b/octvc1/octvc1_cursor_swap.h @@ -2,7 +2,7 @@ File: octvc1_cursor_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_CURSOR_SWAP_H__ diff --git a/octvc1/octvc1_eth.h b/octvc1/octvc1_eth.h index 7e5d08a..fd1a30f 100644 --- a/octvc1/octvc1_eth.h +++ b/octvc1/octvc1_eth.h @@ -2,7 +2,7 @@ File: OCTVC1_ETH.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -31,6 +31,7 @@ $Revision: $ /***************************** INCLUDE FILES *******************************/ #include "../octdev_types.h" #include "octvc1_base.h" +#include "octvc1_mac.h" /************************ COMMON DEFINITIONS *******************************/ @@ -51,6 +52,23 @@ $Revision: $ #define cOCTVC1_ETH_802_1_PQ_TCI_INVALID 0xFFFFFFFF /* Ethernet 802.1 pq definition */ +/*------------------------------------------------------------------------------------- + tOCTVC1_ETH_ADDRESS + Ethernet address information + + Members: + MacAddress + usEtherType + usReserved +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MAC_ADDRESS MacAddress; + tOCT_UINT16 usEtherType; + tOCT_UINT16 usReserved; + +} tOCTVC1_ETH_ADDRESS; + #endif /* __OCTVC1_ETH_H__ */ diff --git a/octvc1/octvc1_eth_swap.h b/octvc1/octvc1_eth_swap.h index cb5a63b..563603c 100644 --- a/octvc1/octvc1_eth_swap.h +++ b/octvc1/octvc1_eth_swap.h @@ -2,7 +2,7 @@ File: octvc1_eth_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_ETH_SWAP_H__ @@ -44,6 +44,17 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_ETH_ADDRESS_SWAP( _f_pParms ){ tOCTVC1_ETH_ADDRESS * pOCTVC1_ETH_ADDRESS = (_f_pParms); SWAP_UNUSED(pOCTVC1_ETH_ADDRESS)\ + ((tOCTVC1_ETH_ADDRESS *)pOCTVC1_ETH_ADDRESS)->usEtherType = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_ETH_ADDRESS *)pOCTVC1_ETH_ADDRESS)->usEtherType); \ + ((tOCTVC1_ETH_ADDRESS *)pOCTVC1_ETH_ADDRESS)->usReserved = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_ETH_ADDRESS *)pOCTVC1_ETH_ADDRESS)->usReserved); \ +} +#else +#define mOCTVC1_ETH_ADDRESS_SWAP( pOCTVC1_ETH_ADDRESS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/octvc1_fifo.h b/octvc1/octvc1_fifo.h index 47e6ddd..122cbc2 100644 --- a/octvc1/octvc1_fifo.h +++ b/octvc1/octvc1_fifo.h @@ -2,7 +2,7 @@ File: OCTVC1_FIFO.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_file.h b/octvc1/octvc1_file.h index 4ed4d36..73995a9 100644 --- a/octvc1/octvc1_file.h +++ b/octvc1/octvc1_file.h @@ -2,7 +2,7 @@ File: OCTVC1_FILE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -56,6 +56,9 @@ $Revision: $ #define cOCTVC1_FILE_TYPE_ENUM_NONE 0 #define cOCTVC1_FILE_TYPE_ENUM_TEXT 1 #define cOCTVC1_FILE_TYPE_ENUM_BIN 2 +#define cOCTVC1_FILE_TYPE_ENUM_SCRAMBLED 3 +#define cOCTVC1_FILE_TYPE_ENUM_ENCRYPT_RSA_2048 4 +#define cOCTVC1_FILE_TYPE_ENUM_SCRAMBLED_ENCRYPT_RSA_2048 5 /*------------------------------------------------------------------------------------- tOCTVC1_FILE_FORMAT_ENUM : File Type description @@ -64,6 +67,7 @@ $Revision: $ #define cOCTVC1_FILE_FORMAT_ENUM_NONE 0 #define cOCTVC1_FILE_FORMAT_ENUM_LOG 1 +#define cOCTVC1_FILE_FORMAT_ENUM_INFRACTION 2 /*------------------------------------------------------------------------------------- File Header Type diff --git a/octvc1/octvc1_file_swap.h b/octvc1/octvc1_file_swap.h index f00c00e..4f52673 100644 --- a/octvc1/octvc1_file_swap.h +++ b/octvc1/octvc1_file_swap.h @@ -2,7 +2,7 @@ File: octvc1_file_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_FILE_SWAP_H__ diff --git a/octvc1/octvc1_generic_rc.h b/octvc1/octvc1_generic_rc.h index a99462c..5883d86 100644 --- a/octvc1/octvc1_generic_rc.h +++ b/octvc1/octvc1_generic_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_GENERIC_RC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the GENERIC API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ @@ -83,6 +83,7 @@ $Octasic_Revision: $ #define cOCTVC1_GENERIC_RC_MEMORY_IO_WRITE ( 0x000A + cOCTVC1_GENERIC_MEMORY_RC_BASE ) #define cOCTVC1_GENERIC_RC_MEMORY_CHECKSUM ( 0x000B + cOCTVC1_GENERIC_MEMORY_RC_BASE ) #define cOCTVC1_GENERIC_RC_MEMORY_SIZE ( 0x000C + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_SCRATCH_BAD_RESERVE ( 0x000D + cOCTVC1_GENERIC_MEMORY_RC_BASE ) /**************************************************************************** INTERNAL return codes diff --git a/octvc1/octvc1_handle.h b/octvc1/octvc1_handle.h index 7f69902..c885038 100644 --- a/octvc1/octvc1_handle.h +++ b/octvc1/octvc1_handle.h @@ -2,7 +2,7 @@ File: OCTVC1_HANDLE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -60,6 +60,8 @@ $Revision: $ #define cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY 100 #define cOCTVC1_HANDLE_OBJECT32_NAME_LIST_MAX_ENTRY 25 #define cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH 31 +#define cOCTVC1_HANDLE_OBJECT32_NAME128_LIST_MAX_ENTRY 10 +#define cOCTVC1_HANDLE_OBJECT32_NAME128_MAX_LENGTH 127 /*------------------------------------------------------------------------------------- Base Object Type, for MAIN API @@ -111,6 +113,22 @@ typedef struct #define tOCTVC1_INDEX tOCT_UINT32 +/*------------------------------------------------------------------------------------- + tOCTVC1_OBJECT32_NAME128 + + Members: + ulObject32 + 32 bits file identifier + szDisplayName + Filename. Normally use for display name threw populate +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulObject32; + tOCT_INT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME128_MAX_LENGTH+1)]; + +} tOCTVC1_OBJECT32_NAME128; + #endif /* __OCTVC1_HANDLE_H__ */ diff --git a/octvc1/octvc1_handle_swap.h b/octvc1/octvc1_handle_swap.h index b830c2f..fd5d64c 100644 --- a/octvc1/octvc1_handle_swap.h +++ b/octvc1/octvc1_handle_swap.h @@ -2,7 +2,7 @@ File: octvc1_handle_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_HANDLE_SWAP_H__ @@ -44,6 +44,15 @@ extern "C" { #define mOCTVC1_OBJECT32_NAME_SWAP( pOCTVC1_OBJECT32_NAME ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_OBJECT32_NAME128_SWAP( _f_pParms ){ tOCTVC1_OBJECT32_NAME128 * pOCTVC1_OBJECT32_NAME128 = (_f_pParms); SWAP_UNUSED(pOCTVC1_OBJECT32_NAME128)\ + ((tOCTVC1_OBJECT32_NAME128 *)pOCTVC1_OBJECT32_NAME128)->ulObject32 = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_OBJECT32_NAME128 *)pOCTVC1_OBJECT32_NAME128)->ulObject32); \ +} +#else +#define mOCTVC1_OBJECT32_NAME128_SWAP( pOCTVC1_OBJECT32_NAME128 ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/octvc1_id2string.h b/octvc1/octvc1_id2string.h index a4900bd..f816d65 100644 --- a/octvc1/octvc1_id2string.h +++ b/octvc1/octvc1_id2string.h @@ -2,7 +2,7 @@ File: octvc1_id2string.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -20,7 +20,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -39,6 +39,7 @@ $Revision: $ #ifndef OCTVC1_ID2STRING_DECLARE extern const char * octvc1_id2string( tOCT_UINT32 f_ulId ); +extern const char * octvc1_moduleid2string( tOCT_UINT32 f_ulId ); #endif @@ -50,7 +51,7 @@ extern const char * octvc1_id2string( tOCT_UINT32 f_ulId ); #include "irsc/octvc1_irsc_id.h" #include "gsm/octvc1_gsm_id.h" - +#include "octvc1_module.h" /* ------------------------------------------------------------------------------------- octvc1_id2string -------------------------------------------------------------------------------------*/ @@ -150,12 +151,34 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId ) return "cOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CID"; case ( cOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CID"; case ( cOCTVC1_MAIN_MSG_LICENSING_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_MAIN_MSG_LICENSING_STATS_CID"; case ( cOCTVC1_MAIN_MSG_LICENSING_INFO_FEATURES_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_MAIN_MSG_LICENSING_INFO_FEATURES_CID"; case ( cOCTVC1_MAIN_MSG_LICENSING_LIST_FEATURES_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_MAIN_MSG_LICENSING_LIST_FEATURES_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CID"; + case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CID"; case (cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID"; case (cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): @@ -251,6 +274,8 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId ) return "cOCTVC1_JOB_MSG_RUNNER_MODIFY_CONFIGURATION_CID"; case (cOCTVC1_JOB_MSG_RUNNER_EXECUTOR_STATE_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_JOB_MSG_RUNNER_EXECUTOR_STATE_CHANGE_EID"; + case (cOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_JOB_MSG_RUNNER_EXECUTOR_ITERATION_EID"; /* OCTVC1_HW */ case ( cOCTVC1_HW_MSG_PCB_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_HW_MSG_PCB_INFO_CID"; @@ -288,10 +313,6 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId ) return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID"; case ( cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID"; - case ( cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID"; - case ( cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID"; case ( cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID"; case ( cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): @@ -310,6 +331,8 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId ) return "cOCTVC1_HW_MSG_RF_PORT_ANTENNA_RX_CONFIG_STATUS_CHANGE_EID"; case (cOCTVC1_HW_MSG_RF_PORT_ANTENNA_TX_CONFIG_STATUS_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_HW_MSG_RF_PORT_ANTENNA_TX_CONFIG_STATUS_CHANGE_EID"; + case (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_DRIFT_CHANGE_EID"; /* OCTVC1_IRSC */ case ( cOCTVC1_IRSC_MSG_PROCESS_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_IRSC_MSG_PROCESS_INFO_CID"; @@ -367,12 +390,28 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId ) return "cOCTVC1_IRSC_MSG_ROUTER_INFO_CID"; case ( cOCTVC1_IRSC_MSG_ROUTER_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_IRSC_MSG_ROUTER_STATS_CID"; + case ( cOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CID"; case ( cOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CID"; + case ( cOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CID"; + case ( cOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CID"; + case ( cOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CID"; + case ( cOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CID"; + case ( cOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CID"; + case ( cOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CID"; + case ( cOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CID"; + case ( cOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CID"; case (cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID"; - case (cOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): - return "cOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EID"; /* OCTVC1_GSM */ case ( cOCTVC1_GSM_MSG_TRX_OPEN_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_GSM_MSG_TRX_OPEN_CID"; @@ -438,6 +477,10 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId ) return "cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID"; case ( cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID"; + case ( cOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_MODIFY_CID"; + case ( cOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_GSM_MSG_OVERSAMPLE_SELECT_16X_INFO_CID"; case ( cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID"; case ( cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): @@ -454,6 +497,12 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId ) return "cOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CID"; case ( cOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CID"; + case ( cOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CID"; + case ( cOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CID"; + case ( cOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CID"; case (cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID"; case (cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): @@ -474,6 +523,60 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId ) sprintf( g_szUnknownoctvc1_id2string, "0x%.8X", f_ulId ); return g_szUnknownoctvc1_id2string; } +/* ------------------------------------------------------------------------------------- + octvc1_moduleid2string + -------------------------------------------------------------------------------------*/ +const char * octvc1_moduleid2string( tOCT_UINT32 f_ulId ) +{ + static char g_szUnknownoctvc1_modid2string[32]; + switch( f_ulId ) + { + case cOCTVC1_MODULE_ID_ENUM_GENERIC: + return "GENERIC"; + case cOCTVC1_MODULE_ID_ENUM_MAIN: + return "MAIN"; + case cOCTVC1_MODULE_ID_ENUM_PKT_API: + return "PKT_API"; + case cOCTVC1_MODULE_ID_ENUM_CTRL: + return "CTRL"; + case cOCTVC1_MODULE_ID_ENUM_RESERVED: + return "RESERVED"; + case cOCTVC1_MODULE_ID_ENUM_JOB: + return "JOB"; + case cOCTVC1_MODULE_ID_ENUM_HW: + return "HW"; + case cOCTVC1_MODULE_ID_ENUM_IRSC: + return "IRSC"; + case cOCTVC1_MODULE_ID_ENUM_OBM: + return "OBM"; + case cOCTVC1_MODULE_ID_ENUM_APP_TEST: + return "APP_TEST"; + case cOCTVC1_MODULE_ID_ENUM_SDR: + return "SDR"; + case cOCTVC1_MODULE_ID_ENUM_GSM: + return "GSM"; + case cOCTVC1_MODULE_ID_ENUM_LTE: + return "LTE"; + case cOCTVC1_MODULE_ID_ENUM_3G_NODEB: + return "3G_NODEB"; + case cOCTVC1_MODULE_ID_ENUM_RUS: + return "RUS"; + case cOCTVC1_MODULE_ID_ENUM_LIB_TOOLKIT: + return "LIB_TOOLKIT"; + case cOCTVC1_MODULE_ID_ENUM_UE3G: + return "UE3G"; + case cOCTVC1_MODULE_ID_ENUM_TOOLBOX: + return "TOOLBOX"; + case cOCTVC1_MODULE_ID_ENUM_LTE_UE: + return "LTE_UE"; + case cOCTVC1_MODULE_ID_ENUM_GSM_UE: + return "GSM_UE"; + case cOCTVC1_MODULE_ID_ENUM_CDMA2K: + return "CDMA2K"; + } + sprintf( g_szUnknownoctvc1_modid2string, "0x%.8X", f_ulId ); + return g_szUnknownoctvc1_modid2string; +} #endif #endif /* __OCTVC1_ID2STRING__ */ diff --git a/octvc1/octvc1_id2string_priv.h b/octvc1/octvc1_id2string_priv.h index a86494e..17f2bb0 100644 --- a/octvc1/octvc1_id2string_priv.h +++ b/octvc1/octvc1_id2string_priv.h @@ -2,7 +2,7 @@ File: octvc1_id2string_priv.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -20,7 +20,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -45,10 +45,11 @@ extern const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId ); #ifdef OCTVC1_ID2STRING_PRIV_DECLARE #include +#include "main/octvc1_main_id_priv.h" #include "job/octvc1_job_id_priv.h" #include "hw/octvc1_hw_id_priv.h" - +#include "octvc1_module.h" /* ------------------------------------------------------------------------------------- octvc1_id2string_priv -------------------------------------------------------------------------------------*/ @@ -57,14 +58,32 @@ const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId ) static char g_szUnknownoctvc1_id2string_priv[32]; switch( f_ulId & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )) { - case (cOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): - return "cOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_END_EID"; + case ( cOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CID"; + case ( cOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CID"; + case ( cOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CID"; + case ( cOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CID"; + case ( cOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CID"; + case ( cOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CID"; + case (cOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_MAIN_MSG_LICENSING_INFRACTION_STATE_CHANGE_EID"; + case (cOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_JOB_MSG_RUNNER_UNIT_TEST_STATE_CHANGE_EID"; case ( cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID"; case ( cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID"; case ( cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID"; + case ( cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CID"; + case ( cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )): + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CID"; default: break; diff --git a/octvc1/octvc1_ip.h b/octvc1/octvc1_ip.h index e1dab11..ea9a8d1 100644 --- a/octvc1/octvc1_ip.h +++ b/octvc1/octvc1_ip.h @@ -2,7 +2,7 @@ File: OCTVC1_IP.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_ip_swap.h b/octvc1/octvc1_ip_swap.h index bb92282..e6a7539 100644 --- a/octvc1/octvc1_ip_swap.h +++ b/octvc1/octvc1_ip_swap.h @@ -2,7 +2,7 @@ File: octvc1_ip_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_IP_SWAP_H__ diff --git a/octvc1/octvc1_ipc.h b/octvc1/octvc1_ipc.h index e43606f..7136bb1 100644 --- a/octvc1/octvc1_ipc.h +++ b/octvc1/octvc1_ipc.h @@ -2,7 +2,7 @@ File: OCTVC1_IPC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_ipc_swap.h b/octvc1/octvc1_ipc_swap.h index 3e0761c..d400bc1 100644 --- a/octvc1/octvc1_ipc_swap.h +++ b/octvc1/octvc1_ipc_swap.h @@ -2,7 +2,7 @@ File: octvc1_ipc_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_IPC_SWAP_H__ diff --git a/octvc1/octvc1_lic2string.h b/octvc1/octvc1_lic2string.h index c32a582..03c2d72 100644 --- a/octvc1/octvc1_lic2string.h +++ b/octvc1/octvc1_lic2string.h @@ -2,7 +2,7 @@ File: octvc1_lic2string.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -20,7 +20,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_list.h b/octvc1/octvc1_list.h index 9c29650..4f98ff5 100644 --- a/octvc1/octvc1_list.h +++ b/octvc1/octvc1_list.h @@ -2,7 +2,7 @@ File: OCTVC1_LIST.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -154,6 +154,46 @@ typedef struct } tOCTVC1_LIST_INDEX_GET_SUB_INDEX; +/*------------------------------------------------------------------------------------- + tOCTVC1_LIST_NAME128_OBJECT32_GET + Handle Object name List structure, + Used when the objects to list are identified by a tOCT_UINT32 and displayed by + name. + + Members: + ulNumObject + Number of valid objects in aNamedObject + aName128Object32 + Array containing the listed handles and named +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulNumObject; + tOCTVC1_OBJECT32_NAME128 aName128Object32[cOCTVC1_HANDLE_OBJECT32_NAME128_LIST_MAX_ENTRY]; + +} tOCTVC1_LIST_NAME128_OBJECT32_GET; + +/*------------------------------------------------------------------------------------- + tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 + Handle Object list List structure, + Used when the objects to list are identified by a tOCTVC1_SUB_OBJECT_ID. + + Members: + hParent + Handle object of the parent + ulNumObject + Number of valid sub object IDs in aSubObjectId + aName128Object32 + Array containing the listed handles +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_HANDLE_OBJECT hParent; + tOCT_UINT32 ulNumObject; + tOCTVC1_OBJECT32_NAME128 aName128Object32[cOCTVC1_HANDLE_OBJECT32_NAME128_LIST_MAX_ENTRY]; + +} tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128; + #endif /* __OCTVC1_LIST_H__ */ diff --git a/octvc1/octvc1_list_swap.h b/octvc1/octvc1_list_swap.h index 2678044..5c43979 100644 --- a/octvc1/octvc1_list_swap.h +++ b/octvc1/octvc1_list_swap.h @@ -2,7 +2,7 @@ File: octvc1_list_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_LIST_SWAP_H__ @@ -123,6 +123,34 @@ extern "C" { #define mOCTVC1_LIST_INDEX_GET_SUB_INDEX_SWAP( pOCTVC1_LIST_INDEX_GET_SUB_INDEX ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_LIST_NAME128_OBJECT32_GET_SWAP( _f_pParms ){ tOCTVC1_LIST_NAME128_OBJECT32_GET * pOCTVC1_LIST_NAME128_OBJECT32_GET = (_f_pParms); SWAP_UNUSED(pOCTVC1_LIST_NAME128_OBJECT32_GET)\ + ((tOCTVC1_LIST_NAME128_OBJECT32_GET *)pOCTVC1_LIST_NAME128_OBJECT32_GET)->ulNumObject = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_LIST_NAME128_OBJECT32_GET *)pOCTVC1_LIST_NAME128_OBJECT32_GET)->ulNumObject); \ + { tOCT_UINT32 jOCTVC1_LIST_NAME128_OBJECT32_GET; \ + for( jOCTVC1_LIST_NAME128_OBJECT32_GET=0; \ + jOCTVC1_LIST_NAME128_OBJECT32_GET<(cOCTVC1_HANDLE_OBJECT32_NAME128_LIST_MAX_ENTRY);jOCTVC1_LIST_NAME128_OBJECT32_GET++ ) \ + { mOCTVC1_OBJECT32_NAME128_SWAP( &((tOCTVC1_LIST_NAME128_OBJECT32_GET *)pOCTVC1_LIST_NAME128_OBJECT32_GET)->aName128Object32[jOCTVC1_LIST_NAME128_OBJECT32_GET] ); }} \ +} +#else +#define mOCTVC1_LIST_NAME128_OBJECT32_GET_SWAP( pOCTVC1_LIST_NAME128_OBJECT32_GET ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128_SWAP( _f_pParms ){ tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 * pOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 = (_f_pParms); SWAP_UNUSED(pOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128)\ + ((tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 *)pOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128)->hParent = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 *)pOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128)->hParent); \ + ((tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 *)pOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128)->ulNumObject = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 *)pOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128)->ulNumObject); \ + { tOCT_UINT32 jOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128; \ + for( jOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128=0; \ + jOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128<(cOCTVC1_HANDLE_OBJECT32_NAME128_LIST_MAX_ENTRY);jOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128++ ) \ + { mOCTVC1_OBJECT32_NAME128_SWAP( &((tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 *)pOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128)->aName128Object32[jOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128] ); }} \ +} +#else +#define mOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128_SWAP( pOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/octvc1/octvc1_log.h b/octvc1/octvc1_log.h index c869c6d..3dd4a61 100644 --- a/octvc1/octvc1_log.h +++ b/octvc1/octvc1_log.h @@ -2,7 +2,7 @@ File: OCTVC1_LOG.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -67,20 +67,40 @@ $Revision: $ #define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_RC 2 #define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_MODULE_DATA 3 +/*------------------------------------------------------------------------------------- + tOCTVC1_LOG_TRACE_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_LOG_TRACE_ENUM tOCT_UINT32 + +#define cOCTVC1_LOG_TRACE_ENUM_USER_0 0 +#define cOCTVC1_LOG_TRACE_ENUM_USER_1 1 +#define cOCTVC1_LOG_TRACE_ENUM_USER_2 2 +#define cOCTVC1_LOG_TRACE_ENUM_USER_3 3 +#define cOCTVC1_LOG_TRACE_ENUM_USER_4 4 +#define cOCTVC1_LOG_TRACE_ENUM_USER_5 5 +#define cOCTVC1_LOG_TRACE_ENUM_USER_6 6 +#define cOCTVC1_LOG_TRACE_ENUM_USER_7 7 +#define cOCTVC1_LOG_TRACE_ENUM_SYSTEM 8 +#define cOCTVC1_LOG_TRACE_ENUM_IPC_MESSAGE 9 +#define cOCTVC1_LOG_TRACE_ENUM_RESOURCE 10 + /*------------------------------------------------------------------------------------- tOCTVC1_LOG_TRACE_MASK : -------------------------------------------------------------------------------------*/ #define tOCTVC1_LOG_TRACE_MASK tOCT_UINT32 -#define cOCTVC1_LOG_TRACE_MASK_SYSTEM 0x01 -#define cOCTVC1_LOG_TRACE_MASK_IPC_MESSAGE 0x02 -#define cOCTVC1_LOG_TRACE_MASK_USER_0 0x04 -#define cOCTVC1_LOG_TRACE_MASK_USER_1 0x08 -#define cOCTVC1_LOG_TRACE_MASK_USER_2 0x10 -#define cOCTVC1_LOG_TRACE_MASK_USER_3 0x20 -#define cOCTVC1_LOG_TRACE_MASK_USER_4 0x40 -#define cOCTVC1_LOG_TRACE_MASK_USER_5 0x80 -#define cOCTVC1_LOG_TRACE_MASK_NONE 0x00 +#define cOCTVC1_LOG_TRACE_MASK_USER_0 0x0001 +#define cOCTVC1_LOG_TRACE_MASK_USER_1 0x0002 +#define cOCTVC1_LOG_TRACE_MASK_USER_2 0x0004 +#define cOCTVC1_LOG_TRACE_MASK_USER_3 0x0008 +#define cOCTVC1_LOG_TRACE_MASK_USER_4 0x0010 +#define cOCTVC1_LOG_TRACE_MASK_USER_5 0x0020 +#define cOCTVC1_LOG_TRACE_MASK_USER_6 0x0040 +#define cOCTVC1_LOG_TRACE_MASK_USER_7 0x0080 +#define cOCTVC1_LOG_TRACE_MASK_SYSTEM 0x0100 +#define cOCTVC1_LOG_TRACE_MASK_IPC_MESSAGE 0x0200 +#define cOCTVC1_LOG_TRACE_MASK_RESOURCE 0x0400 +#define cOCTVC1_LOG_TRACE_MASK_NONE 0x0000 #define cOCTVC1_LOG_TRACE_MASK_ALL 0xFFFFFFFF /*------------------------------------------------------------------------------------- @@ -137,7 +157,7 @@ $Revision: $ bits[24] = Reserved. bits[23:16] = Type Info base of Log Type see tOCTVC1_LOG_TYPE_ENUM If TYPE_LOG base tOCTVC1_LOG_LEVEL_ENUM - If TYPE_TRACE base tOCTVC1_LOG_TRACE_MASK + If TYPE_TRACE base tOCTVC1_LOG_TRACE_ENUM bits[15:0] = Log or Trace payload length (in bytes). -------------------------------------------------------------------------------------*/ typedef struct diff --git a/octvc1/octvc1_log_swap.h b/octvc1/octvc1_log_swap.h index 003a84b..3a09643 100644 --- a/octvc1/octvc1_log_swap.h +++ b/octvc1/octvc1_log_swap.h @@ -2,7 +2,7 @@ File: octvc1_log_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_LOG_SWAP_H__ @@ -62,6 +62,15 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_LOG_TRACE_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_LOG_TRACE_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_LOG_TRACE_MASK_SWAP( pType ){ \ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } diff --git a/octvc1/octvc1_mac.h b/octvc1/octvc1_mac.h index 33d475f..b12918e 100644 --- a/octvc1/octvc1_mac.h +++ b/octvc1/octvc1_mac.h @@ -2,7 +2,7 @@ File: OCTVC1_MAC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_macro.h b/octvc1/octvc1_macro.h index 0a9c30a..1d887fb 100644 --- a/octvc1/octvc1_macro.h +++ b/octvc1/octvc1_macro.h @@ -2,7 +2,7 @@ File: OCTVC1_MACRO.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_module.h b/octvc1/octvc1_module.h index 28282b0..245bc2d 100644 --- a/octvc1/octvc1_module.h +++ b/octvc1/octvc1_module.h @@ -2,7 +2,7 @@ File: OCTVC1_MODULE.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -36,6 +36,31 @@ $Revision: $ /************************ COMMON DEFINITIONS *******************************/ +/*------------------------------------------------------------------------------------- + Resource +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_RESOURCE_DESCRIPTION_MAX_LENGTH 15 + +/*------------------------------------------------------------------------------------- + tOCTVC1_RESOURCE + System memory + + Members: + szDescription + Resource description + ulModuleId + Module Id. + ulLocalMemorySize + Local Memory size in bytes. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_INT8 szDescription[(cOCTVC1_RESOURCE_DESCRIPTION_MAX_LENGTH+1)];/* NOSWAPMAC */ + tOCT_UINT32 ulModuleId; + tOCT_UINT32 ulLocalMemorySize; + +} tOCTVC1_RESOURCE; + /*------------------------------------------------------------------------------------- Last process identifiers -------------------------------------------------------------------------------------*/ @@ -74,6 +99,7 @@ $Revision: $ #define cOCTVC1_MODULE_ID_ENUM_TOOLBOX 0x11 #define cOCTVC1_MODULE_ID_ENUM_LTE_UE 0x12 #define cOCTVC1_MODULE_ID_ENUM_GSM_UE 0x13 +#define cOCTVC1_MODULE_ID_ENUM_CDMA2K 0x14 #define cOCTVC1_MODULE_ID_BIT_OFFSET 24 #define cOCTVC1_MODULE_ID_BIT_MASK 0xFF diff --git a/octvc1/octvc1_module_swap.h b/octvc1/octvc1_module_swap.h index b7f250d..e7c5547 100644 --- a/octvc1/octvc1_module_swap.h +++ b/octvc1/octvc1_module_swap.h @@ -2,7 +2,7 @@ File: octvc1_module_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_MODULE_SWAP_H__ @@ -35,6 +35,17 @@ extern "C" { /********************************* MACROS **********************************/ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_RESOURCE_SWAP( _f_pParms ){ tOCTVC1_RESOURCE * pOCTVC1_RESOURCE = (_f_pParms); SWAP_UNUSED(pOCTVC1_RESOURCE)\ + ((tOCTVC1_RESOURCE *)pOCTVC1_RESOURCE)->ulModuleId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_RESOURCE *)pOCTVC1_RESOURCE)->ulModuleId); \ + ((tOCTVC1_RESOURCE *)pOCTVC1_RESOURCE)->ulLocalMemorySize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_RESOURCE *)pOCTVC1_RESOURCE)->ulLocalMemorySize); \ +} +#else +#define mOCTVC1_RESOURCE_SWAP( pOCTVC1_RESOURCE ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MODULE_ID_ENUM_SWAP( pType ){ \ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } diff --git a/octvc1/octvc1_msg.h b/octvc1/octvc1_msg.h index b7904cd..064792a 100644 --- a/octvc1/octvc1_msg.h +++ b/octvc1/octvc1_msg.h @@ -2,7 +2,7 @@ File: OCTVC1_MSG.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_msg_swap.h b/octvc1/octvc1_msg_swap.h index 9f6a96c..4681602 100644 --- a/octvc1/octvc1_msg_swap.h +++ b/octvc1/octvc1_msg_swap.h @@ -2,7 +2,7 @@ File: octvc1_msg_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_MSG_SWAP_H__ diff --git a/octvc1/octvc1_priv_swap_hdrs.h b/octvc1/octvc1_priv_swap_hdrs.h index 66c6edd..a823ecb 100644 --- a/octvc1/octvc1_priv_swap_hdrs.h +++ b/octvc1/octvc1_priv_swap_hdrs.h @@ -2,7 +2,7 @@ File: octvc1_priv_swap_hdrs.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_PRIV_SWAP_HDRS_H__ diff --git a/octvc1/octvc1_privacy.h b/octvc1/octvc1_privacy.h index 895cbf4..0ea4fd4 100644 --- a/octvc1/octvc1_privacy.h +++ b/octvc1/octvc1_privacy.h @@ -2,7 +2,7 @@ File: OCTVC1_PRIVACY.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_process.h b/octvc1/octvc1_process.h index fc82fef..ef575fa 100644 --- a/octvc1/octvc1_process.h +++ b/octvc1/octvc1_process.h @@ -2,7 +2,7 @@ File: OCTVC1_PROCESS.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -42,19 +42,12 @@ $Revision: $ /*------------------------------------------------------------------------------------- Process type. - Process type. -------------------------------------------------------------------------------------*/ #define tOCTVC1_PROCESS_TYPE_ENUM tOCT_UINT32 #define cOCTVC1_PROCESS_TYPE_ENUM_INVALID 0 #define cOCTVC1_PROCESS_TYPE_ENUM_CONTROL 1 #define cOCTVC1_PROCESS_TYPE_ENUM_OCTADF_ROUTER 2 -#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_SCHED ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+1) ) -#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_DL ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+2) ) -#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_ULIM ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+3) ) -#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_ULEQ ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+4) ) -#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_ULOM ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+5) ) -#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_DECOMB ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+6) ) #define cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH 63 /* Process image string length restriction. */ /*------------------------------------------------------------------------------------- @@ -125,15 +118,28 @@ typedef struct ulLastExecTimeUs Task's last execution time (in microseconds) ulMaxExecCacheMissCnt - Task's maximum cache miss in one execution + Task's maximum cache miss in one execution. + Include code and data cache misses. ulLastExecCacheMissCnt Task's last execution cache miss count + Include code and data cache misses. ulTotalCacheMissCnt Task's last execution cache miss count + Include code and data cache misses. + ulMaxExecCodeMissCnt + Task's maximum code cache miss in one execution + ulLastExecCodeMissCnt + Task's last execution code cache miss count + ulTotalCodeMissCnt + Task's last execution code cache miss count ulExecCnt Number of times the task has been executed ulDoneCnt Number of times the task has been completed + ulReqCnt + Task requested count + ulScratchPadLeakFlag + ScratchPad leak happenned during task processing ulErrorCnt Number of times the task returned an error State @@ -147,8 +153,13 @@ typedef struct tOCT_UINT32 ulMaxExecCacheMissCnt; tOCT_UINT32 ulLastExecCacheMissCnt; tOCT_UINT32 ulTotalCacheMissCnt; + tOCT_UINT32 ulMaxExecCodeMissCnt; + tOCT_UINT32 ulLastExecCodeMissCnt; + tOCT_UINT32 ulTotalCodeMissCnt; tOCT_UINT32 ulExecCnt; tOCT_UINT32 ulDoneCnt; + tOCT_UINT32 ulReqCnt; + tOCT_BOOL32 ulScratchPadLeakFlag; tOCT_UINT32 ulErrorCnt; tOCTVC1_PROCESS_TASK_STATE_ENUM State; diff --git a/octvc1/octvc1_process_swap.h b/octvc1/octvc1_process_swap.h index c40c104..db830e2 100644 --- a/octvc1/octvc1_process_swap.h +++ b/octvc1/octvc1_process_swap.h @@ -2,7 +2,7 @@ File: octvc1_process_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_PROCESS_SWAP_H__ @@ -97,10 +97,20 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulLastExecCacheMissCnt); \ ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulTotalCacheMissCnt = \ mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulTotalCacheMissCnt); \ + ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulMaxExecCodeMissCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulMaxExecCodeMissCnt); \ + ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulLastExecCodeMissCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulLastExecCodeMissCnt); \ + ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulTotalCodeMissCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulTotalCodeMissCnt); \ ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulExecCnt = \ mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulExecCnt); \ ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulDoneCnt = \ mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulDoneCnt); \ + ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulReqCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulReqCnt); \ + ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulScratchPadLeakFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulScratchPadLeakFlag); \ ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulErrorCnt = \ mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulErrorCnt); \ { mOCTVC1_PROCESS_TASK_STATE_ENUM_SWAP( &((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->State ); } \ diff --git a/octvc1/octvc1_radio.h b/octvc1/octvc1_radio.h index e6954a3..dbacd3c 100644 --- a/octvc1/octvc1_radio.h +++ b/octvc1/octvc1_radio.h @@ -2,7 +2,7 @@ File: OCTVC1_RADIO.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -120,19 +120,29 @@ $Revision: $ #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_24 23 #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_25 24 #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_26 25 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_2 26 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_4 27 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_5 28 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_6 29 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_7 30 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_10 31 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_12 32 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_13 33 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_14 34 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_19 35 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_25 36 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_26 37 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_LAST 38 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_32 26 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_33 27 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_34 28 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_35 29 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_36 30 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_37 31 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_38 32 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_39 33 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_40 34 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_2 35 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_4 36 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_5 37 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_6 38 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_7 39 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_10 40 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_12 41 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_13 42 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_14 43 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_19 44 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_25 45 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_26 46 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_32 47 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_LAST 48 #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_INVALID 0xCAFEDECA /*------------------------------------------------------------------------------------- @@ -191,15 +201,22 @@ $Revision: $ #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_46 45 #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_47 46 #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_48 47 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_65 48 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_66 49 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_67 50 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_68 51 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_69 52 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_70 53 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_252 54 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_255 55 -#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_LAST 56 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_50 48 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_51 49 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_65 50 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_66 51 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_67 52 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_68 53 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_69 54 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_70 55 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_71 56 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_72 57 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_74 58 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_75 59 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_76 60 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_252 61 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_255 62 +#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_LAST 63 #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_INVALID 0xCAFEDECA /*------------------------------------------------------------------------------------- diff --git a/octvc1/octvc1_radio_swap.h b/octvc1/octvc1_radio_swap.h index 05fffb6..a351c11 100644 --- a/octvc1/octvc1_radio_swap.h +++ b/octvc1/octvc1_radio_swap.h @@ -2,7 +2,7 @@ File: octvc1_radio_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_RADIO_SWAP_H__ diff --git a/octvc1/octvc1_rc2string.h b/octvc1/octvc1_rc2string.h index 514c44e..62e8241 100644 --- a/octvc1/octvc1_rc2string.h +++ b/octvc1/octvc1_rc2string.h @@ -2,7 +2,7 @@ File: octvc1_rc2string.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -20,7 +20,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -135,6 +135,8 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_GENERIC_RC_MEMORY_CHECKSUM"; case cOCTVC1_GENERIC_RC_MEMORY_SIZE: return "cOCTVC1_GENERIC_RC_MEMORY_SIZE"; + case cOCTVC1_GENERIC_RC_MEMORY_SCRATCH_BAD_RESERVE: + return "cOCTVC1_GENERIC_RC_MEMORY_SCRATCH_BAD_RESERVE"; case cOCTVC1_GENERIC_RC_INTERNAL_ERROR: return "cOCTVC1_GENERIC_RC_INTERNAL_ERROR"; case cOCTVC1_GENERIC_RC_INTERNAL_SERVICE_NOT_INIT: @@ -241,6 +243,18 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO"; case cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE: return "cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE"; + case cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_CLOSE_LOCAL: + return "cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_CLOSE_LOCAL"; + case cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_ADD_REMOTE_FILE: + return "cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_ADD_REMOTE_FILE"; + case cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_DELETE_REMOTE_FILE: + return "cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_DELETE_REMOTE_FILE"; + case cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_TRANSFER_REMOTE_FILE: + return "cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_TRANSFER_REMOTE_FILE"; + case cOCTVC1_MAIN_RC_FILE_SYSTEM_NAME: + return "cOCTVC1_MAIN_RC_FILE_SYSTEM_NAME"; + case cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_CLOSE_FILE_STILL_OPEN: + return "cOCTVC1_MAIN_RC_FILE_SYSTEM_CANNOT_CLOSE_FILE_STILL_OPEN"; case cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START: return "cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START"; case cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_START: @@ -357,6 +371,8 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_SUPPORTED"; case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_OPENED: return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_OPENED"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_CLOCK_SRC_REF_ON_FREE_RUN: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_CLOCK_SRC_REF_ON_FREE_RUN"; case cOCTVC1_HW_RC_RF_PORT_ANTENNA_RX_CONFIG_MODIFY_INVALID_RX_GAIND_B: return "cOCTVC1_HW_RC_RF_PORT_ANTENNA_RX_CONFIG_MODIFY_INVALID_RX_GAIND_B"; case cOCTVC1_HW_RC_RF_PORT_ANTENNA_TX_CONFIG_MODIFY_INVALID_TX_GAIND_B: @@ -381,6 +397,12 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_ALREADY_START"; case cOCTVC1_IRSC_RC_API_COMMAND_INTERNAL_ERROR: return "cOCTVC1_IRSC_RC_API_COMMAND_INTERNAL_ERROR"; + case cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_LIMIT_BANDWIDTH_MBPS: + return "cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_LIMIT_BANDWIDTH_MBPS"; + case cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_TO_HOST_STREAM_SEQUENCE_ID_INTERVAL: + return "cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_TO_HOST_STREAM_SEQUENCE_ID_INTERVAL"; + case cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_TO_HOST_STREAM_INITIAL_PKT_CNT: + return "cOCTVC1_IRSC_RC_ROUTER_STREAMER_MODIFY_INVALID_TO_HOST_STREAM_INITIAL_PKT_CNT"; case cOCTVC1_GSM_RC_GENERIC_EVENT_MASK_INVALID: return "cOCTVC1_GSM_RC_GENERIC_EVENT_MASK_INVALID"; case cOCTVC1_GSM_RC_TRX_RESOURCE_UNAVAILABLE: @@ -413,6 +435,8 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_GSM_RC_TRX_PARAMS_INVALID"; case cOCTVC1_GSM_RC_TRX_PRIMARY_ONLY_BCCH_CONFIGURED: return "cOCTVC1_GSM_RC_TRX_PRIMARY_ONLY_BCCH_CONFIGURED"; + case cOCTVC1_GSM_RC_TRX_PRE_CONFIG_OVERSAMPLE_SELECTION_NOT_DONE: + return "cOCTVC1_GSM_RC_TRX_PRE_CONFIG_OVERSAMPLE_SELECTION_NOT_DONE"; case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_RESOURCE_UNAVAILABLE: return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_RESOURCE_UNAVAILABLE"; case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ALREADY_ACTIVATED: @@ -441,6 +465,8 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_SAPI_INVALID"; case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_BCCH_BSIC_INVALID: return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_BCCH_BSIC_INVALID"; + case cOCTVC1_GSM_RC_TEST_MODULE_GSM_MODULE_NOT_STARTED: + return "cOCTVC1_GSM_RC_TEST_MODULE_GSM_MODULE_NOT_STARTED"; case cOCTVC1_GSM_RC_RF_CONFIG_INVALID_RX_GAIN_DB: return "cOCTVC1_GSM_RC_RF_CONFIG_INVALID_RX_GAIN_DB"; case cOCTVC1_GSM_RC_RF_CONFIG_INVALID_TX_ATTND_B: diff --git a/octvc1/octvc1_stream.h b/octvc1/octvc1_stream.h new file mode 100644 index 0000000..6ffa1b1 --- /dev/null +++ b/octvc1/octvc1_stream.h @@ -0,0 +1,77 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_STREAM.h + +Copyright (c) 2018 Octasic Inc. All rights reserved. + +Description: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_STREAM_H__ +#define __OCTVC1_STREAM_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Stream types +-------------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------------- + tOCTVC1_STREAM_DIRECTION_ENUM : Tap direction. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_STREAM_DIRECTION_ENUM tOCT_UINT32 + +#define cOCTVC1_STREAM_DIRECTION_ENUM_TO_HOST 0 +#define cOCTVC1_STREAM_DIRECTION_ENUM_FROM_HOST 1 + +/*------------------------------------------------------------------------------------- + tOCTVC1_STREAM_STATS + Stream stats + + Members: + ulTransferDataSize + ulDurationUs + ulSentPacketCnt + ulRecvPacketCnt + ulRecvDropCnt + ulRecvOverflowCnt + ulRecvRetryCnt + ulRecvMissCnt +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulTransferDataSize; + tOCT_UINT32 ulDurationUs; + tOCT_UINT32 ulSentPacketCnt; + tOCT_UINT32 ulRecvPacketCnt; + tOCT_UINT32 ulRecvDropCnt; + tOCT_UINT32 ulRecvOverflowCnt; + tOCT_UINT32 ulRecvRetryCnt; + tOCT_UINT32 ulRecvMissCnt; + +} tOCTVC1_STREAM_STATS; + + +#endif /* __OCTVC1_STREAM_H__ */ + diff --git a/octvc1/octvc1_stream_swap.h b/octvc1/octvc1_stream_swap.h new file mode 100644 index 0000000..0881d54 --- /dev/null +++ b/octvc1/octvc1_stream_swap.h @@ -0,0 +1,75 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + +File: octvc1_stream_swap.h + +Copyright (c) 2018 Octasic Inc. All rights reserved. + +Description: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ +#ifndef __OCTVC1_STREAM_SWAP_H__ +#define __OCTVC1_STREAM_SWAP_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************** INCLUDE FILES *******************************/ +#include "octvc1_swap_hdrs.h" +#include "octvc1_stream.h" + +/********************************* MACROS **********************************/ + + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_STREAM_DIRECTION_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_STREAM_DIRECTION_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_STREAM_STATS_SWAP( _f_pParms ){ tOCTVC1_STREAM_STATS * pOCTVC1_STREAM_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_STREAM_STATS)\ + ((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulTransferDataSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulTransferDataSize); \ + ((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulDurationUs = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulDurationUs); \ + ((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulSentPacketCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulSentPacketCnt); \ + ((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvPacketCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvPacketCnt); \ + ((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvDropCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvDropCnt); \ + ((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvOverflowCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvOverflowCnt); \ + ((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvRetryCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvRetryCnt); \ + ((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvMissCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_STREAM_STATS *)pOCTVC1_STREAM_STATS)->ulRecvMissCnt); \ +} +#else +#define mOCTVC1_STREAM_STATS_SWAP( pOCTVC1_STREAM_STATS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#ifdef __cplusplus +} + +#endif + +#endif /* __OCTVC1_STREAM_SWAP_H__ */ diff --git a/octvc1/octvc1_swap_hdrs.h b/octvc1/octvc1_swap_hdrs.h index 7e71503..a20e59e 100644 --- a/octvc1/octvc1_swap_hdrs.h +++ b/octvc1/octvc1_swap_hdrs.h @@ -2,7 +2,7 @@ File: octvc1_swap_hdrs.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_SWAP_HDRS_H__ @@ -52,11 +52,13 @@ extern "C" { #include "octvc1_log_swap.h" #include "octvc1_file_swap.h" #include "octvc1_module_swap.h" +#include "octvc1_stream_swap.h" #include "octvc1_tap_swap.h" #include "octvc1_ipc_swap.h" #include "octvc1_process_swap.h" #include "octvc1_user_id_swap.h" #include "octvc1_radio_swap.h" +#include "octvc1_transport_swap.h" #include "octvc1_api_swap.h" #include "ctrl/octvc1_ctrl_api_swap.h" #include "main/octvc1_main_api_swap.h" diff --git a/octvc1/octvc1_tap.h b/octvc1/octvc1_tap.h index a8a51c8..813f735 100644 --- a/octvc1/octvc1_tap.h +++ b/octvc1/octvc1_tap.h @@ -2,7 +2,7 @@ File: OCTVC1_TAP.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -30,6 +30,7 @@ $Revision: $ /***************************** INCLUDE FILES *******************************/ #include "../octdev_types.h" +#include "octvc1_stream.h" /************************ COMMON DEFINITIONS *******************************/ @@ -42,8 +43,8 @@ $Revision: $ -------------------------------------------------------------------------------------*/ #define tOCTVC1_TAP_DIRECTION_ENUM tOCT_UINT32 -#define cOCTVC1_TAP_DIRECTION_ENUM_TX 0 -#define cOCTVC1_TAP_DIRECTION_ENUM_RX 1 +#define cOCTVC1_TAP_DIRECTION_ENUM_TX cOCTVC1_STREAM_DIRECTION_ENUM_TO_HOST +#define cOCTVC1_TAP_DIRECTION_ENUM_RX cOCTVC1_STREAM_DIRECTION_ENUM_FROM_HOST /*------------------------------------------------------------------------------------- tOCTVC1_TAP_ID : TAP_ID : [ApplicationModuleId|Direction|Index]. diff --git a/octvc1/octvc1_tap_swap.h b/octvc1/octvc1_tap_swap.h index f9d9774..f331d26 100644 --- a/octvc1/octvc1_tap_swap.h +++ b/octvc1/octvc1_tap_swap.h @@ -2,7 +2,7 @@ File: octvc1_tap_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_TAP_SWAP_H__ diff --git a/octvc1/octvc1_transport.h b/octvc1/octvc1_transport.h new file mode 100644 index 0000000..43d1a5c --- /dev/null +++ b/octvc1/octvc1_transport.h @@ -0,0 +1,79 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_TRANSPORT.h + +Copyright (c) 2018 Octasic Inc. All rights reserved. + +Description: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_TRANSPORT_H__ +#define __OCTVC1_TRANSPORT_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" +#include "octvc1_base.h" +#include "octvc1_eth.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Transport Type +-------------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------------- + tOCTVC1_TRANSPORT_TYPE_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_TRANSPORT_TYPE_ENUM tOCT_UINT32 + +#define cOCTVC1_TRANSPORT_TYPE_ENUM_NONE 0 /* No transport */ +#define cOCTVC1_TRANSPORT_TYPE_ENUM_ETH 1 /* Ethernet Tranport */ +#define cOCTVC1_TRANSPORT_TYPE_ENUM_UDP 2 /* UDP Tranport */ +#define cOCTVC1_TRANSPORT_TYPE_ENUM_TCP 1 /* TCP Tranport */ +#define cOCTVC1_TRANSPORT_TYPE_ENUM_LOCAL 1 /* Local Tranport */ +#define cOCTVC1_TRANSPORT_TYPE_ENUM_IPC 1 /* IPC Tranport */ +#define cOCTVC1_TRANSPORT_TYPE_ENUM_USER 10 /* User Tranport */ + +/*------------------------------------------------------------------------------------- + Transport Address +-------------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------------- + tOCTVC1_TRANSPORT_ADDRESS + + Members: + ulTransportType + Default: cOCTVC1_TRANSPORT_TYPE_ENUM_NONE + Target file system to file server transport type. + Eth + Ethernet destination information. + Only valid if ulTransportType set to cOCTDEV_TRANSPORT_TYPE_ENUM_ETH. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_TRANSPORT_TYPE_ENUM ulTransportType; + tOCTVC1_ETH_ADDRESS Eth; + +} tOCTVC1_TRANSPORT_ADDRESS; + + +#endif /* __OCTVC1_TRANSPORT_H__ */ + diff --git a/octvc1/octvc1_transport_swap.h b/octvc1/octvc1_transport_swap.h new file mode 100644 index 0000000..918bc90 --- /dev/null +++ b/octvc1/octvc1_transport_swap.h @@ -0,0 +1,61 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + +File: octvc1_transport_swap.h + +Copyright (c) 2018 Octasic Inc. All rights reserved. + +Description: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ +#ifndef __OCTVC1_TRANSPORT_SWAP_H__ +#define __OCTVC1_TRANSPORT_SWAP_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************** INCLUDE FILES *******************************/ +#include "octvc1_swap_hdrs.h" +#include "octvc1_transport.h" + +/********************************* MACROS **********************************/ + + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_TRANSPORT_TYPE_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_TRANSPORT_TYPE_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_TRANSPORT_ADDRESS_SWAP( _f_pParms ){ tOCTVC1_TRANSPORT_ADDRESS * pOCTVC1_TRANSPORT_ADDRESS = (_f_pParms); SWAP_UNUSED(pOCTVC1_TRANSPORT_ADDRESS)\ + { mOCTVC1_TRANSPORT_TYPE_ENUM_SWAP( &((tOCTVC1_TRANSPORT_ADDRESS *)pOCTVC1_TRANSPORT_ADDRESS)->ulTransportType ); } \ + { mOCTVC1_ETH_ADDRESS_SWAP( &((tOCTVC1_TRANSPORT_ADDRESS *)pOCTVC1_TRANSPORT_ADDRESS)->Eth ); } \ +} +#else +#define mOCTVC1_TRANSPORT_ADDRESS_SWAP( pOCTVC1_TRANSPORT_ADDRESS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#ifdef __cplusplus +} + +#endif + +#endif /* __OCTVC1_TRANSPORT_SWAP_H__ */ diff --git a/octvc1/octvc1_udp.h b/octvc1/octvc1_udp.h index 242ae8c..8549247 100644 --- a/octvc1/octvc1_udp.h +++ b/octvc1/octvc1_udp.h @@ -2,7 +2,7 @@ File: OCTVC1_UDP.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_user_id.h b/octvc1/octvc1_user_id.h index df5b2bd..e2c53d3 100644 --- a/octvc1/octvc1_user_id.h +++ b/octvc1/octvc1_user_id.h @@ -2,7 +2,7 @@ File: OCTVC1_USER_ID.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ @@ -51,6 +51,9 @@ $Revision: $ #define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_ULIM_0 ((tOCT_UINT32)((0x00000200)|(cOCTVC1_MODULE_ID_ENUM_GSM<. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_USER_ID_SWAP_H__ diff --git a/octvc1/octvc1_vlan.h b/octvc1/octvc1_vlan.h index 416579b..b12c43b 100644 --- a/octvc1/octvc1_vlan.h +++ b/octvc1/octvc1_vlan.h @@ -2,7 +2,7 @@ File: OCTVC1_VLAN.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvc1_vlan_swap.h b/octvc1/octvc1_vlan_swap.h index f1e6e74..5f68736 100644 --- a/octvc1/octvc1_vlan_swap.h +++ b/octvc1/octvc1_vlan_swap.h @@ -2,7 +2,7 @@ File: octvc1_vlan_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_VLAN_SWAP_H__ diff --git a/octvc1/octvocnet_pkt.h b/octvc1/octvocnet_pkt.h index d6d823a..1e7c404 100644 --- a/octvc1/octvocnet_pkt.h +++ b/octvc1/octvocnet_pkt.h @@ -2,7 +2,7 @@ File: OCTVOCNET_PKT.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Revision: $ diff --git a/octvc1/octvocnet_pkt_swap.h b/octvc1/octvocnet_pkt_swap.h index 22e3bbf..abdc381 100644 --- a/octvc1/octvocnet_pkt_swap.h +++ b/octvc1/octvocnet_pkt_swap.h @@ -2,7 +2,7 @@ File: octvocnet_pkt_swap.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVOCNET_PKT_SWAP_H__ diff --git a/octvc1/pkt_api/octvc1_pkt_api.h b/octvc1/pkt_api/octvc1_pkt_api.h index 348e736..ca92798 100644 --- a/octvc1/pkt_api/octvc1_pkt_api.h +++ b/octvc1/pkt_api/octvc1_pkt_api.h @@ -2,7 +2,7 @@ File: OCTVC1_PKT_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: Octasic Application Development Framework OCTADF-04.09.00-B3234 (2017/07/13) +Release: Octasic Application Development Framework OCTADF-04.10.01-B3387 (2018/01/29) $Revision: $ @@ -153,6 +153,10 @@ extern "C" { #define cOCTVC1_PKT_API_INSTANCE_OPTION_MASK_NONE (0) #define cOCTVC1_PKT_API_INSTANCE_OPTION_MASK_DISABLE_TIMEOUT (0x00000001) +/*-------------------------------------------------------------------------- + Generic defined +----------------------------------------------------------------------------*/ +#define cOCTVC1_PKT_API_PAYLOAD_MAX (1502) /*************************** STRUCTURES *************************************/ diff --git a/octvc1/pkt_api/octvc1_pkt_api_default.h b/octvc1/pkt_api/octvc1_pkt_api_default.h index ac2acb7..4ec549d 100644 --- a/octvc1/pkt_api/octvc1_pkt_api_default.h +++ b/octvc1/pkt_api/octvc1_pkt_api_default.h @@ -2,7 +2,7 @@ File: OCTVC1_PKT_API.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: Octasic Application Development Framework OCTADF-04.09.00-B3234 (2017/07/13) +Release: Octasic Application Development Framework OCTADF-04.10.01-B3387 (2018/01/29) $Revision: $ diff --git a/octvc1/pkt_api/octvc1_pkt_api_rc.h b/octvc1/pkt_api/octvc1_pkt_api_rc.h index 22ca86d..a868c96 100644 --- a/octvc1/pkt_api/octvc1_pkt_api_rc.h +++ b/octvc1/pkt_api/octvc1_pkt_api_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_PKT_API_RC.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: Contains the return codes for the PKT_API API. @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.11.00-B1927 (2018/04/27) $Octasic_Revision: $ diff --git a/octvc1/pkt_api/octvc1_pkt_api_version.h b/octvc1/pkt_api/octvc1_pkt_api_version.h index 3cee498..a15f3b8 100644 --- a/octvc1/pkt_api/octvc1_pkt_api_version.h +++ b/octvc1/pkt_api/octvc1_pkt_api_version.h @@ -2,7 +2,7 @@ File: OCTVC1_PKT_API_VERSION.h -Copyright (c) 2017 Octasic Inc. All rights reserved. +Copyright (c) 2018 Octasic Inc. All rights reserved. Description: @@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . -Release: Octasic Application Development Framework OCTADF-04.09.00-B3234 (2017/07/13) +Release: Octasic Application Development Framework OCTADF-04.10.01-B3387 (2018/01/29) $Revision: $ @@ -48,9 +48,9 @@ extern "C" { bit[10:0]: Build number */ #define cOCTVC1_PKT_API_VERSION_MAJOR 4 -#define cOCTVC1_PKT_API_VERSION_MINOR 9 -#define cOCTVC1_PKT_API_VERSION_MAINTENANCE 0 -#define cOCTVC1_PKT_API_VERSION_BUILD 3234 +#define cOCTVC1_PKT_API_VERSION_MINOR 10 +#define cOCTVC1_PKT_API_VERSION_MAINTENANCE 1 +#define cOCTVC1_PKT_API_VERSION_BUILD 3387 #define cOCTVC1_PKT_API_VERSION_ID ( (cOCTVC1_PKT_API_VERSION_MAJOR << 25) + \ (cOCTVC1_PKT_API_VERSION_MINOR << 18) + \