diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2018-04-12 11:51:55 +0200 |
|---|---|---|
| committer | Philipp Maier <pmaier@sysmocom.de> | 2018-04-12 11:55:20 +0200 |
| commit | 11fa80c95d4eed6355b1f578b7b8ff8917e2ee45 (patch) | |
| tree | 2ef584a290c672c91b1021462b46278b2a449066 | |
| parent | 06297ff025a37e6f921674675d33342385d414c2 (diff) | |
Import headers from OCTSDR-OPENBSC-02.10.00-B1229.tgznext
160 files changed, 5646 insertions, 936 deletions
diff --git a/octdev_devices.h b/octdev_devices.h index 66021f2..290ee53 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octdev_devices_swap.h b/octdev_devices_swap.h index d05d0c6..f4b08ac 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTDEV_DEVICES_SWAP_H__
diff --git a/octdev_macro.h b/octdev_macro.h index 554ddee..48132fc 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octdev_opus_rev.h b/octdev_opus_rev.h index ba2d1b7..38369fc 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octdev_rc_base.h b/octdev_rc_base.h index c568851..53b2134 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octdev_types.h b/octdev_types.h index 6b22117..397ad79 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..91e7a13 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTDEV_TYPES_SWAP_H__
diff --git a/octoptions.h b/octoptions.h index e3e659d..5ba844f 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octpkt/octpkt_hdr.h b/octpkt/octpkt_hdr.h index b1794e8..d4c96fd 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octpkt/octpkt_hdr_swap.h b/octpkt/octpkt_hdr_swap.h index 15b8579..4216859 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTPKT_HDR_SWAP_H__
diff --git a/octpkt/octpkt_hdrxl.h b/octpkt/octpkt_hdrxl.h index 6c35cb9..8ed2b94 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octpkt/octpkt_hdrxl_swap.h b/octpkt/octpkt_hdrxl_swap.h index dea5008..50a38a1 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTPKT_HDRXL_SWAP_H__
diff --git a/octvc1/ctrl/octvc1_ctrl_api.h b/octvc1/ctrl/octvc1_ctrl_api.h index aa5e0e2..6a4837f 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_api_priv.h b/octvc1/ctrl/octvc1_ctrl_api_priv.h index 6780946..4ef947d 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h b/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h index ecb90da..15244b7 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/ctrl/octvc1_ctrl_api_swap.h b/octvc1/ctrl/octvc1_ctrl_api_swap.h index ff7af6b..1b612ff 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_CTRL_API_SWAP_H__
diff --git a/octvc1/ctrl/octvc1_ctrl_base.h b/octvc1/ctrl/octvc1_ctrl_base.h index 7221826..608170a 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_id.h b/octvc1/ctrl/octvc1_ctrl_id.h index 563b74c..e86602a 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_id_priv.h b/octvc1/ctrl/octvc1_ctrl_id_priv.h index e4a3a78..01ee0a0 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_version.h b/octvc1/ctrl/octvc1_ctrl_version.h index 85d62b2..d027fbe 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 10
#define cOCTVC1_CTRL_VERSION_MAINTENANCE 0
-#define cOCTVC1_CTRL_VERSION_BUILD 1607
+#define cOCTVC1_CTRL_VERSION_BUILD 1837
-#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..cf16833 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
@@ -52,6 +52,7 @@ $Revision: $ -------------------------------------------------------------------------------------*/
#define cOCTVC1_GSM_APPLICATION_ID_MODULE_PHY ((0x00)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_OFFSET))
+#define cOCTVC1_GSM_APPLICATION_ID_MODULE_TEST ((0x01)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_OFFSET))
/*-------------------------------------------------------------------------------------
GSM Module Tap Id
@@ -175,6 +176,32 @@ $Revision: $ #define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_ALL 0xFF
/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM : DLOM OR DLIM
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM tOCT_UINT8
+
+#define cOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM_NONE 0
+#define cOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM_DLOM 1
+#define cOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM_DLIM 2
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_CAPTURE_TYPE_ENUM : WRAP AROUND OR NOT
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_GSM_CAPTURE_TYPE_ENUM tOCT_UINT8
+
+#define cOCTVC1_GSM_CAPTURE_TYPE_ENUM_NONE 0
+#define cOCTVC1_GSM_CAPTURE_TYPE_ENUM_ONE_TIME_CAPTURE 1
+#define cOCTVC1_GSM_CAPTURE_TYPE_ENUM_WRAP_AROUND_CAPTURE 2
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_CAPTURE_STATUS_ENUM : STATUS OF CAPTURE
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_GSM_CAPTURE_STATUS_ENUM tOCT_UINT8
+
+#define cOCTVC1_GSM_CAPTURE_STATUS_ENUM_IDLE 0
+#define cOCTVC1_GSM_CAPTURE_STATUS_ENUM_RUNNING 1
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM : Time slot number.
-------------------------------------------------------------------------------------*/
#define tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM tOCT_UINT32
@@ -208,6 +235,15 @@ $Revision: $ #define cOCTVC1_GSM_STUB_MODE_ENUM_IQ_DATA_STUB cOCTVC1_GSM_ID_STUB_MODE_ENUM_IQ_DATA_STUB
/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_CAPTURE_MODE_ENUM : WETHER TO CAPTURE OR TO STUB
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_GSM_CAPTURE_MODE_ENUM tOCT_UINT8
+
+#define cOCTVC1_GSM_CAPTURE_MODE_ENUM_NONE cOCTVC1_GSM_ID_STUB_MODE_ENUM_NONE
+#define cOCTVC1_GSM_CAPTURE_MODE_ENUM_IQ_DATA_CAPTURE cOCTVC1_GSM_ID_STUB_MODE_ENUM_IQ_DATA_CAPTURE
+#define cOCTVC1_GSM_CAPTURE_MODE_ENUM_IQ_DATA_STUB cOCTVC1_GSM_ID_STUB_MODE_ENUM_IQ_DATA_STUB
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM : Sub Channel number.
-------------------------------------------------------------------------------------*/
#define tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM tOCT_UINT8
@@ -655,6 +691,28 @@ typedef struct } tOCTVC1_GSM_STUB_CHANNEL_ID;
/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_CAPTURE_CHANNEL_ID
+
+ Members:
+ byTimeslotNb
+ Default: cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_0
+ Timeslot number.
+ bySubChannelNb
+ Default: cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0
+ Sub-Channel number.
+ byCAPTUREMode
+ Default: cOCTVC1_GSM_CAPTURE_MODE_ENUM_NONE
+ CAPTURE_MODE_ENUM.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM byTimeslotNb;
+ tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM bySubChannelNb;
+ tOCTVC1_GSM_CAPTURE_MODE_ENUM byCAPTUREMode;
+
+} tOCTVC1_GSM_CAPTURE_CHANNEL_ID;
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_LOGICAL_CHANNEL_ID
Members:
@@ -2637,6 +2695,148 @@ typedef struct } tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP;
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+
+} tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+ Status
+ Default: 0
+ CAPTURE_STATUS.
+ tracePoint
+ Default: 0
+ OM OR IM
+ Type
+ Default: 0
+ ONE TIME OR WRAPPING
+ TimeslotNb
+ Timeslot number.
+ SubChannelNb
+ Sub-Channel number.
+ blockCnt
+ blockCnt
+ wrapCount
+ WRAP_AROUND_COUNT
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_CAPTURE_STATUS_ENUM Status;
+ tOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM tracePoint;
+ tOCTVC1_GSM_CAPTURE_TYPE_ENUM Type;
+ tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM TimeslotNb;
+ tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM SubChannelNb;
+ tOCT_UINT16 blockCnt;
+ tOCT_UINT8 wrapCount;
+
+} tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+ Mode
+ Default: 0
+ Mode_of_capture
+ TimeslotNb
+ Timeslot number.
+ SubChannelNb
+ Sub-Channel number.
+ tracePoint
+ Default: 0
+ MODULE_TO_CAPTURE
+ Type
+ Default: 0
+ CAPTURE_TYPE
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_CAPTURE_MODE_ENUM Mode;
+ tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM TimeslotNb;
+ tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM SubChannelNb;
+ tOCTVC1_GSM_MODULE_TO_CAPTURE_ENUM tracePoint;
+ tOCTVC1_GSM_CAPTURE_TYPE_ENUM Type;
+
+} tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+ TimeslotNb
+ Timeslot number.
+ SubChannelNb
+ Sub-Channel number.
+ Mode
+ Default: 0
+ CAPTURE_MODE_ENUM.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM TimeslotNb;
+ tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM SubChannelNb;
+ tOCTVC1_GSM_CAPTURE_MODE_ENUM Mode;
+
+} tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_RSP;
+
/***************************** MODULE_DATA *************************************/
/*-------------------------------------------------------------------------------------
diff --git a/octvc1/gsm/octvc1_gsm_api_priv.h b/octvc1/gsm/octvc1_gsm_api_priv.h index e3b028c..7f97a9b 100644 --- a/octvc1/gsm/octvc1_gsm_api_priv.h +++ b/octvc1/gsm/octvc1_gsm_api_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_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 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_api_priv_swap.h b/octvc1/gsm/octvc1_gsm_api_priv_swap.h index 59e47b8..7746e6d 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/gsm/octvc1_gsm_api_swap.h b/octvc1/gsm/octvc1_gsm_api_swap.h index 66f3b77..4c58b02 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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_ )
@@ -312,6 +324,16 @@ extern "C" { #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 ); } \
{ mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( &((tOCTVC1_GSM_LOGICAL_CHANNEL_ID *)pOCTVC1_GSM_LOGICAL_CHANNEL_ID)->bySubChannelNb ); } \
@@ -1464,6 +1486,73 @@ extern "C" { #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 ); } \
{ mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->TrxId ); } \
diff --git a/octvc1/gsm/octvc1_gsm_base.h b/octvc1/gsm/octvc1_gsm_base.h index e3e7faa..9f8812e 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_default.h b/octvc1/gsm/octvc1_gsm_default.h index 7a8024d..a0a6ccc 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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"
@@ -2671,6 +2674,128 @@ extern const tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD *g_pOctDef_tOCTVC1_GSM_MSG_T }
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD buf_tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* TrxId */
+ 0, /* byTrxId */
+ { /* abyPad */
+ 0, /* abyPad[0] */
+ 0, /* abyPad[1] */
+ 0 /* abyPad[2] */
+ }
+ }
+};
+
+const tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD =
+ &buf_tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_INFO_DL_TRACE_BUFF_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD buf_tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* TrxId */
+ 0, /* byTrxId */
+ { /* abyPad */
+ 0, /* abyPad[0] */
+ 0, /* abyPad[1] */
+ 0 /* abyPad[2] */
+ }
+ },
+ 0, /* Mode */
+ 0, /* TimeslotNb */
+ 0, /* SubChannelNb */
+ 0, /* tracePoint */
+ 0 /* Type */
+};
+
+const tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD =
+ &buf_tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_START_DL_TRACE_BUFF_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD buf_tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* TrxId */
+ 0, /* byTrxId */
+ { /* abyPad */
+ 0, /* abyPad[0] */
+ 0, /* abyPad[1] */
+ 0 /* abyPad[2] */
+ }
+ },
+ 0, /* TimeslotNb */
+ 0, /* SubChannelNb */
+ 0 /* Mode */
+};
+
+const tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD =
+ &buf_tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_STOP_DL_TRACE_BUFF_CMD; \
+ }
+
+
/***************************** MODULE_DATA *************************************/
/*--------------------------------------------------------------------------
@@ -3287,5 +3412,9 @@ extern const tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM }
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __OCTVC1_GSM_DEFAULT_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_default_priv.h b/octvc1/gsm/octvc1_gsm_default_priv.h index 4d06b80..70f83e9 100644 --- a/octvc1/gsm/octvc1_gsm_default_priv.h +++ b/octvc1/gsm/octvc1_gsm_default_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_GSM_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 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..ecade27 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_evt_priv.h b/octvc1/gsm/octvc1_gsm_evt_priv.h index 1a4ab3a..8d51ab8 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_evt_priv_swap.h b/octvc1/gsm/octvc1_gsm_evt_priv_swap.h index 2448cc4..176d10b 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/gsm/octvc1_gsm_evt_swap.h b/octvc1/gsm/octvc1_gsm_evt_swap.h index 32c7169..e896af9 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_GSM_EVT_SWAP_H__
diff --git a/octvc1/gsm/octvc1_gsm_id.h b/octvc1/gsm/octvc1_gsm_id.h index 1adc180..d227073 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
@@ -75,8 +75,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..fe72555 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_lic.h b/octvc1/gsm/octvc1_gsm_lic.h index aa5d66a..cbf01e6 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_lic_priv.h b/octvc1/gsm/octvc1_gsm_lic_priv.h index d4c4ecb..911b8f5 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_rc.h b/octvc1/gsm/octvc1_gsm_rc.h index 4cc6e40..1e1ac75 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
@@ -97,6 +97,13 @@ $Octasic_Revision: $ #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
****************************************************************************/
#define cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE ( 0xF000 + cOCTVC1_GSM_RC_BASE )
diff --git a/octvc1/gsm/octvc1_gsm_rc_priv.h b/octvc1/gsm/octvc1_gsm_rc_priv.h index 77f65b4..47c21fa 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_version.h b/octvc1/gsm/octvc1_gsm_version.h index f59c6fd..6b2855e 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 10
#define cOCTVC1_GSM_VERSION_MAINTENANCE 0
-#define cOCTVC1_GSM_VERSION_BUILD 1607
+#define cOCTVC1_GSM_VERSION_BUILD 1837
-#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..73ec299 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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,117 +1237,26 @@ 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
Members:
diff --git a/octvc1/hw/octvc1_hw_api_priv.h b/octvc1/hw/octvc1_hw_api_priv.h index 2b9081f..2f759d1 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..89e71d6 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -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..6452243 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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,68 +742,18 @@ 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 ); } \
((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->ulPortIndex = \
diff --git a/octvc1/hw/octvc1_hw_base.h b/octvc1/hw/octvc1_hw_base.h index ccf2332..23a5a81 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_default.h b/octvc1/hw/octvc1_hw_default.h index edf9117..f1b2b09 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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"
@@ -632,68 +635,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)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- }
-};
-
-const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD =
- &buf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD buf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- },
- cOCTVC1_DO_NOT_MODIFY, /* ulClkSourceRef */
- cOCTVC1_DO_NOT_MODIFY /* ulSourceState */
-};
-
-const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD =
- &buf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD
----------------------------------------------------------------------------*/
#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
@@ -829,5 +770,9 @@ extern const tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_FRONT_END_CMD *g_pOctDef_tOCT }
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __OCTVC1_HW_DEFAULT_H__ */
diff --git a/octvc1/hw/octvc1_hw_default_priv.h b/octvc1/hw/octvc1_hw_default_priv.h index 5eec8a9..71285ae 100644 --- a/octvc1/hw/octvc1_hw_default_priv.h +++ b/octvc1/hw/octvc1_hw_default_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_HW_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 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* ulState */
+ 0 /* ulDacState */
+};
+
+const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD =
+ &buf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SYNCHRO_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD buf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0 /* ulResetStatsFlag */
+};
+
+const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD =
+ &buf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_EXT_CMD; \
+ }
+
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __OCTVC1_HW_DEFAULT_PRIV_H__ */
diff --git a/octvc1/hw/octvc1_hw_evt.h b/octvc1/hw/octvc1_hw_evt.h index 524355d..3cd27f4 100644 --- a/octvc1/hw/octvc1_hw_evt.h +++ b/octvc1/hw/octvc1_hw_evt.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
File: OCTVC1_HW_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 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..108e42d 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_evt_priv_swap.h b/octvc1/hw/octvc1_hw_evt_priv_swap.h index 31fcce9..b6f688c 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/hw/octvc1_hw_evt_swap.h b/octvc1/hw/octvc1_hw_evt_swap.h index 62c4f0c..2c2a0f5 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..f0a088f 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..c524645 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..cb0c9a2 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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_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_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_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..421688e 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_version.h b/octvc1/hw/octvc1_hw_version.h index 4054983..4dcabc7 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 10
#define cOCTVC1_HW_VERSION_MAINTENANCE 0
-#define cOCTVC1_HW_VERSION_BUILD 1607
+#define cOCTVC1_HW_VERSION_BUILD 1837
-#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..d9e22f8 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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.
@@ -247,29 +249,8 @@ 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;
@@ -1538,6 +1657,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..976451d 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..eb98fde 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/irsc/octvc1_irsc_api_swap.h b/octvc1/irsc/octvc1_irsc_api_swap.h index 380918f..685dc05 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IRSC_API_SWAP_H__
@@ -156,30 +156,13 @@ extern "C" { #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 ); } \
((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulFilterIndex = \
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 )
@@ -289,6 +274,75 @@ extern "C" { #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 ); } \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD *)pOCTVC1_IRSC_MSG_PROCESS_INFO_CMD)->hProcess = \
@@ -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
@@ -915,6 +985,28 @@ extern "C" { #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..50adbdc 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..9ad6ef6 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 */
}
};
@@ -940,6 +944,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)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ }
+};
+
+const tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD =
+ &buf_tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_STREAMER_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
tOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD
----------------------------------------------------------------------------*/
#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
@@ -969,5 +1003,306 @@ extern const tOCTVC1_IRSC_MSG_APPLICATION_STATS_SYSTEM_CMD *g_pOctDef_tOCTVC1_IR }
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD buf_tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ cOCTVC1_DO_NOT_MODIFY, /* ulLimitBandwidthMbps */
+ cOCTVC1_DO_NOT_MODIFY, /* ulToHostStreamSequenceIdInterval */
+ cOCTVC1_DO_NOT_MODIFY /* ulToHostStreamInitialPktCnt */
+};
+
+const tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD =
+ &buf_tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_MODIFY_STREAMER_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD buf_tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hProcess */
+ cOCT_FALSE, /* ulStackScanFlag */
+ cOCT_FALSE /* ulScratchPadResetFlag */
+};
+
+const tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD =
+ &buf_tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_MEMORY_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD buf_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* SubObjectIdGet */
+ 0, /* hObject */
+ cOCTVC1_OBJECT_CURSOR_ENUM_FIRST, /* ulGetMode */
+ 0 /* ulSubObjectId */
+ }
+};
+
+const tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD =
+ &buf_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_SYSTEM_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD buf_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hProcess */
+ 0 /* ulIndex */
+};
+
+const tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD =
+ &buf_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_SYSTEM_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD buf_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* SubObjectIdGet */
+ 0, /* hObject */
+ cOCTVC1_OBJECT_CURSOR_ENUM_FIRST, /* ulGetMode */
+ 0 /* ulSubObjectId */
+ }
+};
+
+const tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD =
+ &buf_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_LIST_RESOURCE_USER_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD buf_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hProcess */
+ 0 /* ulIndex */
+};
+
+const tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD =
+ &buf_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_PROCESS_STATS_RESOURCE_USER_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD buf_tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ cOCTVC1_HANDLE_INVALID /* hTapId */
+};
+
+const tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD =
+ &buf_tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_APPLICATION_PAUSE_TAP_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD buf_tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ cOCTVC1_HANDLE_INVALID /* hTapId */
+};
+
+const tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD =
+ &buf_tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_APPLICATION_RESUME_TAP_CMD; \
+ }
+
+
+/***************************** MODULE_DATA *************************************/
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA buf_tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ 0, /* hStream */
+ 0, /* hOwner */
+ 0, /* ulDataSize */
+ 0, /* ulSequenceId */
+ 0 /* ulRetryFlag */
+};
+
+const tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA =
+ &buf_tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_DATA_REQUEST_STREAMER_MDA; \
+ }
+
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __OCTVC1_IRSC_DEFAULT_H__ */
diff --git a/octvc1/irsc/octvc1_irsc_default_priv.h b/octvc1/irsc/octvc1_irsc_default_priv.h index 8f62a81..364906f 100644 --- a/octvc1/irsc/octvc1_irsc_default_priv.h +++ b/octvc1/irsc/octvc1_irsc_default_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_IRSC_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 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..00dd3d3 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..1652d74 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_evt_priv_swap.h b/octvc1/irsc/octvc1_irsc_evt_priv_swap.h index f436f4d..7415495 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/irsc/octvc1_irsc_evt_swap.h b/octvc1/irsc/octvc1_irsc_evt_swap.h index bb63506..1e45a9c 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..6b4d0a1 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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_CID_MAX (( 0x01d + 1 ) & 0xFFF)
+#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 (( 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..a894710 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..9d4c8af 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..d53f169 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..dd76b22 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 10
#define cOCTVC1_IRSC_VERSION_MAINTENANCE 0
-#define cOCTVC1_IRSC_VERSION_BUILD 1607
+#define cOCTVC1_IRSC_VERSION_BUILD 1837
-#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..32a136d 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..1793b06 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..adc6af9 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -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..92174be 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..a1e8c72 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/job/octvc1_job_default.h b/octvc1/job/octvc1_job_default.h index 0aa2ee6..5d68304 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..9fbbd8e 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..efb817c 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..88417b9 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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_JOB_MSG_RUNNER_UNIT_TEST_END_EVT;
+ 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_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..8c66ce9 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -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..497ba36 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..c5f7a85 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..e07818a 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..a0ff2c4 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/job/octvc1_job_rc_priv.h b/octvc1/job/octvc1_job_rc_priv.h index 4e313a5..b5b4633 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/job/octvc1_job_version.h b/octvc1/job/octvc1_job_version.h index f9a8129..1069b54 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 10
#define cOCTVC1_JOB_VERSION_MAINTENANCE 0
-#define cOCTVC1_JOB_VERSION_BUILD 1607
+#define cOCTVC1_JOB_VERSION_BUILD 1837
-#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..9072c54 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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,29 +198,111 @@ typedef struct } tOCTVC1_MAIN_API_SESSION_HEARTBEAT_STATS;
/*-------------------------------------------------------------------------------------
- FILE related definiitons.
+ FILE SYSTEM related definitons.
+-------------------------------------------------------------------------------------*/
+
+#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_OPEN_PARMS
+
+ Members:
+ szName
+ Filesystem name. Must be unique.
+ szHostRootPathName
+ Host root path name.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ 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_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 127 /* Filesystem string length restriction. */
+#define cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH cOCTVC1_HANDLE_OBJECT32_NAME128_MAX_LENGTH /* File name string length restriction. */
/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR
+ 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:
- szFileName
- NULL terminated name of the file.
- ulGetMode
- Default: cOCTVC1_OBJECT_CURSOR_ENUM_FIRST
+ Mode
+ Status
+ Stream
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
- tOCTVC1_OBJECT_CURSOR_ENUM ulGetMode;
+ tOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM Mode;
+ tOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM Status;
+ tOCTVC1_STREAM_STATS Stream;
-} tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR;
+} 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
@@ -342,6 +427,7 @@ typedef struct Main Module Data Definitions
-------------------------------------------------------------------------------------*/
#define cOCTVC1_MAIN_MODULE_DATA_IPC ((0x0001)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_MODULE_ID_BIT_OFFSET))
+#define cOCTVC1_MAIN_MODULE_DATA_RESOURCE ((0x0002)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_MODULE_ID_BIT_OFFSET))
/*-------------------------------------------------------------------------------------
Licensing Definitions
@@ -362,14 +448,15 @@ typedef struct -------------------------------------------------------------------------------------*/
#define tOCTVC1_MAIN_LICENSING_STATUS_ENUM tOCT_UINT32
-#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_NO_LICENSE_FILE 0
-#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_ACTIVE 1
-#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_LEGACY 2
-#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_INACTIVE 3
-#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_FILE_ERROR 4
-#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_ITEM_ERROR 5
-#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_SYSTEM_ERROR 6
-#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_LOCATION_ERROR 7
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_NO_LICENSE_FILE 0
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_ACTIVE 1
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_LEGACY 2
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_INACTIVE 3
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_FILE_ERROR 4
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_ITEM_ERROR 5
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_SYSTEM_ERROR 6
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_LOCATION_ERROR 7
+#define cOCTVC1_MAIN_LICENSING_STATUS_ENUM_NO_LICENSE_ERROR 8
/***************************** METHODS *************************************/
/*-------------------------------------------------------------------------------------
@@ -798,13 +885,18 @@ typedef struct Members:
Header
OCTVC1 Message Header
+ hFileSystem
+ hFile
szFileName
Null-Terminated file name string.
+ Used when hFile is invalid for backward compatibility.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD;
@@ -814,13 +906,14 @@ typedef struct Members:
Header
OCTVC1 Message Header
- szFileName
- Null-Terminated file name string.
+ hFileSystem
+ hFile
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP;
@@ -835,6 +928,7 @@ typedef struct hFile
Default: cOCTVC1_HANDLE_INVALID
ulNumByteToWrite
+ Default: 4
MUST be a multiple of 16 bytes. Except for the last write to the file.
abyData
-------------------------------------------------------------------------------------*/
@@ -981,10 +1075,13 @@ typedef struct Members:
Header
OCTVC1 Message Header
+ hFileSystem
+ Default: 0x01000001
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CMD;
@@ -994,12 +1091,12 @@ typedef struct Members:
Header
OCTVC1 Message Header
- ulMaxFileEntry
+ InfoParms
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulMaxFileEntry;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS InfoParms;
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP;
@@ -1009,12 +1106,14 @@ typedef struct Members:
Header
OCTVC1 Message Header
- ObjectGet
+ hFileSystem
+ hFile
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR ObjectGet;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD;
@@ -1024,26 +1123,26 @@ typedef struct Members:
Header
OCTVC1 Message Header
- ObjectGet
- ulAccessMode
+ hFileSystem
+ hFile
+ szFileName
+ Null-Terminated file name string.
ulHostOwnerFlag
Only Host owner file can be deleted
ulFileSize
Currently used file Size
ulMaxFileSize
Maximum File Size
- ulInstanceNum
- Number of MAIN_FILE link to that SYSTEM_FILE
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR ObjectGet;
- tOCTVC1_MAIN_FILE_OPEN_MODE_MASK ulAccessMode;
- tOCT_BOOL32 ulHostOwnerFlag;
- tOCT_UINT32 ulFileSize;
- tOCT_UINT32 ulMaxFileSize;
- tOCT_UINT32 ulInstanceNum;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_BOOL32 ulHostOwnerFlag;
+ tOCT_UINT32 ulFileSize;
+ tOCT_UINT32 ulMaxFileSize;
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP;
@@ -1763,16 +1862,18 @@ typedef struct Members:
Header
OCTVC1 Message Header
+ hFileSystem
szFileName
Null-Terminated file name string.
ulMaxFilesize
- Maximum file size
+ Maximum file size. Must be MTU align to 16 Bytes.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
- tOCT_UINT32 ulMaxFilesize;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_UINT32 ulMaxFilesize;
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD;
@@ -1782,13 +1883,17 @@ typedef struct Members:
Header
OCTVC1 Message Header
+ hFileSystem
+ hFile
szFileName
Null-Terminated file name string.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP;
@@ -1839,10 +1944,13 @@ typedef struct Members:
Header
OCTVC1 Message Header
+ hStreamObj
+ Identifier handle for the opened stream.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hStreamObj;
} tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP;
@@ -1935,6 +2043,77 @@ typedef struct } tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP;
/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ ObjectCursor
+ Object cursor
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_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_FILE_SYSTEM_LIST_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD
+ Open a remote file system.
+ This allows the target to open files at a remote location.
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ OpenParms
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_MAIN_FILE_SYSTEM_OPEN_PARMS OpenParms;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ Filesystem identifer handle.
+ szName
+ Filesystem name.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCT_INT8 szName[(cOCTVC1_MAIN_FILE_SYSTEM_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_RSP;
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_LICENSING_STATS_CMD
Members:
@@ -2016,7 +2195,7 @@ typedef struct /*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_LICENSING_LIST_FEATURES_CMD
- List the cmd that are monitored
+ List the license feature
Members:
Header
@@ -2049,9 +2228,486 @@ typedef struct } tOCTVC1_MAIN_MSG_LICENSING_LIST_FEATURES_RSP;
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD
+ Write number of bytes to target.
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+ ulNumByteToWrite
+ Default: 1
+ MUST be a multiple of 16 bytes. Except for the last write to the file.
+ abyData
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_UINT32 ulNumByteToWrite;
+ tOCT_UINT8 abyData[cOCTVC1_MAIN_FILE_MAX_DATA_BYTE_SIZE];
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+ ulNumByteWritten
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_UINT32 ulNumByteWritten;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD
+ Read number of bytes from target.
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+ ulMaxNumByteToRead
+ Default: cOCTVC1_MAIN_FILE_MAX_DATA_BYTE_SIZE
+ Must be MTU align to ulMinAlignBytes (from transfer start request) (16 Bytes).
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_UINT32 ulMaxNumByteToRead;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+ ulNumByteRead
+ abyData
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_UINT32 ulNumByteRead;
+ tOCT_UINT8 abyData[cOCTVC1_MAIN_FILE_MAX_DATA_BYTE_SIZE];
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ szFileName
+ Null-Terminated file name string.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+ szFileName
+ Null-Terminated file name string.
+ ulHostOwnerFlag
+ Only Host owner file can be deleted
+ ulFileSize
+ Currently used file Size
+ ulMaxFileSize
+ Maximum File Size
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_BOOL32 ulHostOwnerFlag;
+ tOCT_UINT32 ulFileSize;
+ tOCT_UINT32 ulMaxFileSize;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD
+ Close a remote filesystem.
+ Note: it is not possible to close a local filesystem.
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ Filesystem identifer handle.
+ ulForceFlag
+ Default: cOCT_FALSE
+ If cOCT_FALSE, close will be refused if files are present in the file system.
+ If cOCT_TRUE, Will force close even if files are present in the file system
+ and also try to close all opened file in this file system.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCT_BOOL32 ulForceFlag;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ Filesystem identifer handle.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ szName
+ Filesystem name.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_INT8 szName[(cOCTVC1_MAIN_FILE_SYSTEM_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ InfoParms
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_MAIN_FILE_SYSTEM_INFO_PARMS InfoParms;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD
+ Transfer statistics.
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+ Stats
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCTVC1_MAIN_FILE_TRANSFER_STATS Stats;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_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_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ SubObjectIdGet
+ Object cursor
+ FileNameList
+ File name list.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet;
+ tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME128 FileNameList;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+ ulTransferMode
+ Default: cOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_READ
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM ulTransferMode;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ hFileSystem
+ hFile
+ ulMinAlignBytes
+ Indicates the minimum write size used for proper alignment (in bytes)
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCT_UINT32 ulMinAlignBytes;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_RSP;
+
/***************************** MODULE_DATA *************************************/
/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA
+
+ Members:
+ ModuleData
+ OCTVC1 Module Data
+ hFileSystem
+ hFile
+ hStream
+ ulTransferMode
+ ulMinAlignBytes
+ Indicates the minimum write size used for proper alignment (in bytes)
+ ulToHostStreamSequenceIdInterval
+ Sequence id interval the host must ackknowledge TO_HOST data packet
+ szFileName
+ Null-Terminated file name string.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCTVC1_HANDLE_OBJECT hStream;
+ tOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM ulTransferMode;
+ tOCT_UINT32 ulMinAlignBytes;
+ tOCT_UINT32 ulToHostStreamSequenceIdInterval;
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA
+
+ Members:
+ ModuleData
+ OCTVC1 Module Data
+ hFileSystem
+ hFile
+ hStream
+ ulStatus
+ ulFileSize
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCTVC1_HANDLE_OBJECT hStream;
+ tOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM ulStatus;
+ tOCT_UINT32 ulFileSize;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA
+
+ Members:
+ ModuleData
+ OCTVC1 Module Data
+ hFileSystem
+ hFile
+ hStream
+ ulStatus
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCTVC1_HANDLE_OBJECT hStream;
+ tOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM ulStatus;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA
+
+ Members:
+ ModuleData
+ OCTVC1 Module Data
+ hFileSystem
+ hFile
+ hStream
+ ulStatus
+ ulMask
+ Default: cOCTVC1_MAIN_FILE_TRANSFER_MASK_NONE
+ ulDataSize
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCTVC1_HANDLE_OBJECT hStream;
+ tOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM ulStatus;
+ tOCTVC1_MAIN_FILE_TRANSFER_MASK ulMask;
+ tOCT_UINT32 ulDataSize;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA
+
+ Members:
+ ModuleData
+ OCTVC1 Module Data
+ hFileSystem
+ hFile
+ hStream
+ ulStatus
+ ulSequenceId
+ Sequence Ack
+ ulPktAckCnt
+ Sequence Ack
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+ tOCTVC1_HANDLE_OBJECT hFileSystem;
+ tOCTVC1_HANDLE_OBJECT hFile;
+ tOCTVC1_HANDLE_OBJECT hStream;
+ tOCTVC1_MAIN_FILE_TRANSFER_STATUS_ENUM ulStatus;
+ tOCT_UINT32 ulSequenceId;
+ tOCT_UINT32 ulPktAckCnt;
+
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA;
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_LOG_DATA_MDA
Members:
diff --git a/octvc1/main/octvc1_main_api_priv.h b/octvc1/main/octvc1_main_api_priv.h index aa119a0..06b8c81 100644 --- a/octvc1/main/octvc1_main_api_priv.h +++ b/octvc1/main/octvc1_main_api_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_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 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..7f08e1d 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -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..70b6e57 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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_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_SYSTEM_FILE_CURSOR_SWAP( pOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR )
+#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 )
@@ -1132,6 +1199,44 @@ extern "C" { #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 ); } \
}
@@ -1199,6 +1304,312 @@ extern "C" { #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..164ad5a 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/main/octvc1_main_default.h b/octvc1/main/octvc1_main_default.h index c43ab94..f44f5ca 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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] */
},
@@ -1475,6 +1478,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)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* ObjectCursor */
+ 0, /* hObject */
+ cOCTVC1_OBJECT_CURSOR_ENUM_FIRST /* ulGetMode */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* OpenParms */
+ { /* szName */
+ 0, /* szName[0..31] */
+ },
+ { /* szHostRootPathName */
+ 0, /* szHostRootPathName[0..255] */
+ }
+ }
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_OPEN_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_LICENSING_STATS_CMD
----------------------------------------------------------------------------*/
#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
@@ -1569,6 +1644,306 @@ extern const tOCTVC1_MAIN_MSG_LICENSING_LIST_FEATURES_CMD *g_pOctDef_tOCTVC1_MAI }
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hFileSystem */
+ 0 /* hFile */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STOP_FILE_TRANSFER_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hFileSystem */
+ 0, /* hFile */
+ 1, /* ulNumByteToWrite */
+ { /* abyData */
+ 0, /* abyData[0..1199] */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_WRITE_FILE_TRANSFER_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hFileSystem */
+ 0, /* hFile */
+ cOCTVC1_MAIN_FILE_MAX_DATA_BYTE_SIZE /* ulMaxNumByteToRead */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_READ_FILE_TRANSFER_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hFileSystem */
+ { /* szFileName */
+ 0, /* szFileName[0..127] */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_FILE_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hFileSystem */
+ cOCT_FALSE /* ulForceFlag */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_CLOSE_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* szName */
+ 0, /* szName[0..31] */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_FIND_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hFileSystem */
+ 0 /* hFile */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_STATS_FILE_TRANSFER_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* SubObjectIdGet */
+ 0, /* hObject */
+ cOCTVC1_OBJECT_CURSOR_ENUM_FIRST, /* ulGetMode */
+ 0 /* ulSubObjectId */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_LIST_FILE_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0, /* hFileSystem */
+ 0, /* hFile */
+ cOCTVC1_MAIN_FILE_TRANSFER_MODE_ENUM_READ /* ulTransferMode */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_START_FILE_TRANSFER_CMD; \
+ }
+
+
/***************************** MODULE_DATA *************************************/
/*--------------------------------------------------------------------------
@@ -1599,5 +1974,179 @@ extern const tOCTVC1_MAIN_MSG_LOG_DATA_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_DATA_ }
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ 0, /* hFileSystem */
+ 0, /* hFile */
+ 0, /* hStream */
+ 0, /* ulTransferMode */
+ 0, /* ulMinAlignBytes */
+ 0, /* ulToHostStreamSequenceIdInterval */
+ { /* szFileName */
+ 0, /* szFileName[0..127] */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_FILE_TRANSFER_MDA; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ 0, /* hFileSystem */
+ 0, /* hFile */
+ 0, /* hStream */
+ 0, /* ulStatus */
+ 0 /* ulFileSize */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REQUEST_ACK_FILE_TRANSFER_MDA; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ 0, /* hFileSystem */
+ 0, /* hFile */
+ 0, /* hStream */
+ 0 /* ulStatus */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ABORT_FILE_TRANSFER_MDA; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ 0, /* hFileSystem */
+ 0, /* hFile */
+ 0, /* hStream */
+ 0, /* ulStatus */
+ cOCTVC1_MAIN_FILE_TRANSFER_MASK_NONE, /* ulMask */
+ 0 /* ulDataSize */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_FILE_TRANSFER_MDA; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ 0, /* hFileSystem */
+ 0, /* hFile */
+ 0, /* hStream */
+ 0, /* ulStatus */
+ 0, /* ulSequenceId */
+ 0 /* ulPktAckCnt */
+};
+
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DATA_ACK_FILE_TRANSFER_MDA; \
+ }
+
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __OCTVC1_MAIN_DEFAULT_H__ */
diff --git a/octvc1/main/octvc1_main_default_priv.h b/octvc1/main/octvc1_main_default_priv.h index 2d22f9d..67efa9c 100644 --- a/octvc1/main/octvc1_main_default_priv.h +++ b/octvc1/main/octvc1_main_default_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_MAIN_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 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0 /* hInfraction */
+};
+
+const tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD =
+ &buf_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD buf_tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ { /* ObjectCursor */
+ 0, /* hObject */
+ cOCTVC1_OBJECT_CURSOR_ENUM_FIRST /* ulGetMode */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD =
+ &buf_tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_LIST_INFRACTION_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD buf_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD =
+ &buf_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_INFO_INFRACTION_CONFIG_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD buf_tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ cOCTVC1_DO_NOT_MODIFY /* ulSendStateChangeEvtFlag */
+};
+
+const tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD =
+ &buf_tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LICENSING_MODIFY_INFRACTION_CONFIG_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD =
+ &buf_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_INFO_MODULE_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ cOCTVC1_DO_NOT_MODIFY /* ulApplyHiddenFlag */
+};
+
+const tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD =
+ &buf_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_CONFIG_MODIFY_MODULE_CMD; \
+ }
+
+
/***************************** MODULE_DATA *************************************/
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __OCTVC1_MAIN_DEFAULT_PRIV_H__ */
diff --git a/octvc1/main/octvc1_main_evt.h b/octvc1/main/octvc1_main_evt.h index ece7fe9..a762058 100644 --- a/octvc1/main/octvc1_main_evt.h +++ b/octvc1/main/octvc1_main_evt.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
File: OCTVC1_MAIN_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 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/main/octvc1_main_evt_priv.h b/octvc1/main/octvc1_main_evt_priv.h index 826d347..fa0ea16 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..5a8e1d5 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
@@ -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..9da0b5f 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MAIN_EVT_SWAP_H__
diff --git a/octvc1/main/octvc1_main_id.h b/octvc1/main/octvc1_main_id.h index f1b1738..a274ea5 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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_CID_MAX (( 0x037 + 1 ) & 0xFFF)
+#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 (( 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_MID_MAX (( 0x0000 + 1 ) & 0xFFFF)
+#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 (( 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..b403915 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..19a646c 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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_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_FILE_SYSTEM_RC_BASE ( 0x0300 + cOCTVC1_MAIN_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..8bde2c9 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/main/octvc1_main_version.h b/octvc1/main/octvc1_main_version.h index 34172cd..d6ab8d9 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 10
#define cOCTVC1_MAIN_VERSION_MAINTENANCE 0
-#define cOCTVC1_MAIN_VERSION_BUILD 1607
+#define cOCTVC1_MAIN_VERSION_BUILD 1837
-#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..a62eb06 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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<<cOCTVC1_API_VERSION_MASK_MAJOR_BIT_OFFSET) )
+
+#define cOCTVC1_API_VERSION_MASK_MINOR_BIT_MASK 0x0000003F
+#define cOCTVC1_API_VERSION_MASK_MINOR_BIT_OFFSET 21
+#define cOCTVC1_API_VERSION_MASK_MINOR ((tOCT_UINT32)(cOCTVC1_API_VERSION_MASK_MINOR_BIT_MASK<<cOCTVC1_API_VERSION_MASK_MINOR_BIT_OFFSET) )
+
+#define cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_MASK 0x0000003F
+#define cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_OFFSET 15
+#define cOCTVC1_API_VERSION_MASK_MAINTENANCE ((tOCT_UINT32)(cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_MASK<<cOCTVC1_API_VERSION_MASK_MAINTENANCE_BIT_OFFSET) )
+
+#define cOCTVC1_API_VERSION_MASK_BUILD_BIT_MASK 0x00007FFF
+#define cOCTVC1_API_VERSION_MASK_BUILD_BIT_OFFSET 0
+#define cOCTVC1_API_VERSION_MASK_BUILD ((tOCT_UINT32)(cOCTVC1_API_VERSION_MASK_BUILD_BIT_MASK<<cOCTVC1_API_VERSION_MASK_BUILD_BIT_OFFSET) )
+
#endif /* __OCTVC1_API_H__ */
diff --git a/octvc1/octvc1_api_swap.h b/octvc1/octvc1_api_swap.h index e263d74..08c2b45 100644 --- a/octvc1/octvc1_api_swap.h +++ b/octvc1/octvc1_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..e831d72 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 10
#define cOCTVC1_APP_VERSION_MAINTENANCE 0
-#define cOCTVC1_APP_VERSION_BUILD 1607
+#define cOCTVC1_APP_VERSION_BUILD 1837
#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..0ac2129 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Octasic_Revision: $
diff --git a/octvc1/octvc1_buffer.h b/octvc1/octvc1_buffer.h index 2ed812b..5ca9123 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_buffer_swap.h b/octvc1/octvc1_buffer_swap.h index 8983738..01551f5 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_BUFFER_SWAP_H__
diff --git a/octvc1/octvc1_cursor.h b/octvc1/octvc1_cursor.h index fe0d1b9..9de7e4f 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_cursor_swap.h b/octvc1/octvc1_cursor_swap.h index ffd3935..797a4b0 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_CURSOR_SWAP_H__
diff --git a/octvc1/octvc1_eth.h b/octvc1/octvc1_eth.h index 7e5d08a..b803579 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..d249c7a 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..e601105 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_file.h b/octvc1/octvc1_file.h index 4ed4d36..f2da3ff 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..828ed43 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_FILE_SWAP_H__
diff --git a/octvc1/octvc1_generic_rc.h b/octvc1/octvc1_generic_rc.h index a99462c..103e553 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..ea70f6e 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..56dac74 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..38739cb 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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";
@@ -454,6 +493,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 +519,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..537acf6 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
@@ -45,10 +45,11 @@ extern const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId ); #ifdef OCTVC1_ID2STRING_PRIV_DECLARE
#include <stdio.h>
+#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..ceab4b6 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_ip_swap.h b/octvc1/octvc1_ip_swap.h index bb92282..2e5f5bb 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IP_SWAP_H__
diff --git a/octvc1/octvc1_ipc.h b/octvc1/octvc1_ipc.h index e43606f..79aa8bd 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_ipc_swap.h b/octvc1/octvc1_ipc_swap.h index 3e0761c..05cf3c5 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IPC_SWAP_H__
diff --git a/octvc1/octvc1_lic2string.h b/octvc1/octvc1_lic2string.h index c32a582..74194ea 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_list.h b/octvc1/octvc1_list.h index 9c29650..b423224 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..91a711b 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..79ec3a1 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
@@ -68,19 +68,39 @@ $Revision: $ #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..e6282da 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_LOG_SWAP_H__
@@ -63,6 +63,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) ); }
#else
diff --git a/octvc1/octvc1_mac.h b/octvc1/octvc1_mac.h index 33d475f..d01067c 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_macro.h b/octvc1/octvc1_macro.h index 0a9c30a..7c5cd1c 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_module.h b/octvc1/octvc1_module.h index 28282b0..9401b15 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
@@ -37,6 +37,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..1266050 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MODULE_SWAP_H__
@@ -36,6 +36,17 @@ extern "C" { #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) ); }
#else
diff --git a/octvc1/octvc1_msg.h b/octvc1/octvc1_msg.h index b7904cd..5daf602 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_msg_swap.h b/octvc1/octvc1_msg_swap.h index 9f6a96c..1b61678 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MSG_SWAP_H__
diff --git a/octvc1/octvc1_priv_swap_hdrs.h b/octvc1/octvc1_priv_swap_hdrs.h index 66c6edd..cf29621 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_PRIV_SWAP_HDRS_H__
diff --git a/octvc1/octvc1_privacy.h b/octvc1/octvc1_privacy.h index 895cbf4..dbbe3d8 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_process.h b/octvc1/octvc1_process.h index fc82fef..60c9af5 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..8b2bad6 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..04e80fe 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..be3c7d0 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_RADIO_SWAP_H__
diff --git a/octvc1/octvc1_rc2string.h b/octvc1/octvc1_rc2string.h index 514c44e..c074f76 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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:
@@ -441,6 +463,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..ac40b67 --- /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 <http://www.gnu.org/licenses/>.
+
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
+
+$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..859691f --- /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 <http://www.gnu.org/licenses/>.
+
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+#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..60bfc18 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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..770b708 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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..99828e4 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_TAP_SWAP_H__
diff --git a/octvc1/octvc1_transport.h b/octvc1/octvc1_transport.h new file mode 100644 index 0000000..39b904e --- /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 <http://www.gnu.org/licenses/>.
+
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
+
+$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..8e33c59 --- /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 <http://www.gnu.org/licenses/>.
+
+
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+#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..696e136 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_user_id.h b/octvc1/octvc1_user_id.h index df5b2bd..6eb72f0 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
@@ -51,6 +51,9 @@ $Revision: $ #define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_ULIM_0 ((tOCT_UINT32)((0x00000200)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_ULOM_0 ((tOCT_UINT32)((0x00000300)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_SCHED_0 ((tOCT_UINT32)((0x00000400)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
+#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_DECOMB ((tOCT_UINT32)((0x00000500)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
+#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_ULEQ ((tOCT_UINT32)((0x00000600)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
+#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_TEST ((tOCT_UINT32)((0x00000700)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
#endif /* __OCTVC1_USER_ID_H__ */
diff --git a/octvc1/octvc1_user_id_swap.h b/octvc1/octvc1_user_id_swap.h index 6231e40..b9b2865 100644 --- a/octvc1/octvc1_user_id_swap.h +++ b/octvc1/octvc1_user_id_swap.h @@ -2,7 +2,7 @@ File: octvc1_user_id_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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_USER_ID_SWAP_H__
diff --git a/octvc1/octvc1_vlan.h b/octvc1/octvc1_vlan.h index 416579b..5ce063c 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvc1_vlan_swap.h b/octvc1/octvc1_vlan_swap.h index f1e6e74..ce60e36 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_VLAN_SWAP_H__
diff --git a/octvc1/octvocnet_pkt.h b/octvc1/octvocnet_pkt.h index d6d823a..58f90e7 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$Revision: $
diff --git a/octvc1/octvocnet_pkt_swap.h b/octvc1/octvocnet_pkt_swap.h index 22e3bbf..a9f55ae 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#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 <http://www.gnu.org/licenses/>.
-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 <http://www.gnu.org/licenses/>.
-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..79220b5 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 <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.09.00-B1607 (2017/08/29)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.10.00-B1837 (2018/02/21)
$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 <http://www.gnu.org/licenses/>.
-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) + \
|