diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2016-02-17 10:01:53 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2016-02-17 10:01:53 +0100 |
| commit | fc0ea9d37d7bc94eb931652229a237b703e6074b (patch) | |
| tree | 7d223c7fcb836513044688abdf46991d608cd3b3 | |
| parent | bef7ed37e7bfab52f192304e8d859e2c76efb4e9 (diff) | |
New firmware released based on OCTSDR-OPENBSC-02.05.00-B508OCTSDR-OPENBSC-02.05.00-B508
154 files changed, 3640 insertions, 751 deletions
diff --git a/octdev_devices.h b/octdev_devices.h index 8955ee2..2fa807e 100644 --- a/octdev_devices.h +++ b/octdev_devices.h @@ -2,7 +2,7 @@ File: OCTDEV_DEVICES.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octdev_devices_swap.h b/octdev_devices_swap.h index bd24566..5b0f62c 100644 --- a/octdev_devices_swap.h +++ b/octdev_devices_swap.h @@ -2,7 +2,7 @@ File: octdev_devices_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTDEV_DEVICES_SWAP_H__
diff --git a/octdev_macro.h b/octdev_macro.h index d20738e..b871b11 100644 --- a/octdev_macro.h +++ b/octdev_macro.h @@ -2,7 +2,7 @@ File: OCTDEV_MACRO.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octdev_opus_rev.h b/octdev_opus_rev.h index f801571..4ff6a0a 100644 --- a/octdev_opus_rev.h +++ b/octdev_opus_rev.h @@ -2,7 +2,7 @@ File: OCTDEV_OPUS_REV.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octdev_rc_base.h b/octdev_rc_base.h index a4eeb27..bffde95 100644 --- a/octdev_rc_base.h +++ b/octdev_rc_base.h @@ -2,7 +2,7 @@ File: OCTDEV_RC_BASE.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octdev_types.h b/octdev_types.h index d8d1e0a..264a2e4 100644 --- a/octdev_types.h +++ b/octdev_types.h @@ -2,7 +2,7 @@ File: OCTDEV_TYPES.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octdev_types_swap.h b/octdev_types_swap.h index e75ce21..ed67f76 100644 --- a/octdev_types_swap.h +++ b/octdev_types_swap.h @@ -2,7 +2,7 @@ File: octdev_types_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTDEV_TYPES_SWAP_H__
diff --git a/octoptions.h b/octoptions.h new file mode 100644 index 0000000..441d860 --- /dev/null +++ b/octoptions.h @@ -0,0 +1,55 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+File: octoption.h
+
+Copyright (c) 2016 Octasic Inc. All rights reserved.
+
+Description: Compiler conditionnal directives. 'octoptions_default'
+
+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.05.00-B818 (2016/02/11)
+
+$Revision: $
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+
+#ifndef __OCTOPTIONS_H__
+#define __OCTOPTIONS_H__
+
+/*--------------------------------------------------------------------------
+ C language
+----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*--------------------------------------------------------------------------
+ SPECIFIC OPTIONS
+----------------------------------------------------------------------------*/
+
+
+
+/*--------------------------------------------------------------------------
+ C language
+----------------------------------------------------------------------------*/
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OCTOPTIONS_H__ */
+
+
diff --git a/octpkt/octpkt_hdr.h b/octpkt/octpkt_hdr.h index e33025e..61fcc4d 100644 --- a/octpkt/octpkt_hdr.h +++ b/octpkt/octpkt_hdr.h @@ -2,7 +2,7 @@ File: OCTPKT_HDR.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octpkt/octpkt_hdr_swap.h b/octpkt/octpkt_hdr_swap.h index 86af8f4..50b8c27 100644 --- a/octpkt/octpkt_hdr_swap.h +++ b/octpkt/octpkt_hdr_swap.h @@ -2,7 +2,7 @@ File: octpkt_hdr_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTPKT_HDR_SWAP_H__
diff --git a/octpkt/octpkt_hdrxl.h b/octpkt/octpkt_hdrxl.h index 113cdec..a97c03e 100644 --- a/octpkt/octpkt_hdrxl.h +++ b/octpkt/octpkt_hdrxl.h @@ -2,7 +2,7 @@ File: OCTPKT_HDRXL.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octpkt/octpkt_hdrxl_swap.h b/octpkt/octpkt_hdrxl_swap.h index 7ebb240..34555e3 100644 --- a/octpkt/octpkt_hdrxl_swap.h +++ b/octpkt/octpkt_hdrxl_swap.h @@ -2,7 +2,7 @@ File: octpkt_hdrxl_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTPKT_HDRXL_SWAP_H__
diff --git a/octvc1/ctrl/octvc1_ctrl_api.h b/octvc1/ctrl/octvc1_ctrl_api.h index ee68e20..f703388 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_api_priv.h b/octvc1/ctrl/octvc1_ctrl_api_priv.h index 7b758c5..73ddb1d 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h b/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h index c1df6e6..1cafd04 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/ctrl/octvc1_ctrl_api_swap.h b/octvc1/ctrl/octvc1_ctrl_api_swap.h index 1564854..8d4e5a8 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_CTRL_API_SWAP_H__
diff --git a/octvc1/ctrl/octvc1_ctrl_base.h b/octvc1/ctrl/octvc1_ctrl_base.h index 614fe23..a67b583 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_id.h b/octvc1/ctrl/octvc1_ctrl_id.h index 1d46f20..d6109a1 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_id_priv.h b/octvc1/ctrl/octvc1_ctrl_id_priv.h index f14372d..ab6c0cf 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_version.h b/octvc1/ctrl/octvc1_ctrl_version.h index cf99acb..c071acd 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $ bit[10:0]: Build number
*/
#define cOCTVC1_CTRL_VERSION_MAJOR 2
-#define cOCTVC1_CTRL_VERSION_MINOR 3
+#define cOCTVC1_CTRL_VERSION_MINOR 5
#define cOCTVC1_CTRL_VERSION_MAINTENANCE 0
-#define cOCTVC1_CTRL_VERSION_BUILD 560
+#define cOCTVC1_CTRL_VERSION_BUILD 818
#define cOCTVC1_CTRL_VERSION_ID ( (cOCTVC1_CTRL_VERSION_MAJOR << 25) + \
(cOCTVC1_CTRL_VERSION_MINOR << 18) + \
diff --git a/octvc1/gsm/octvc1_gsm_api.h b/octvc1/gsm/octvc1_gsm_api.h index f203c2e..41ae3fc 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -47,16 +47,23 @@ $Revision: $ /************************ COMMON DEFINITIONS *******************************/
/*-------------------------------------------------------------------------------------
+ APP_TEST Application Module Id
+-------------------------------------------------------------------------------------*/
+
+#define cOCTVC1_GSM_APPLICATION_ID_MODULE_PHY ((0x00)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_OFFSET))
+
+/*-------------------------------------------------------------------------------------
GSM Module Tap Id
-------------------------------------------------------------------------------------*/
-#define cOCTVC1_GSM_TAP_ID_RF_UPLINK_INPUT ((0x0000)|(cOCTVC1_TAP_DIRECTION_ENUM_TX<<cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET))
+#define cOCTVC1_GSM_TAP_ID_RF_UPLINK_INPUT ((0x0000)|(cOCTVC1_TAP_DIRECTION_ENUM_TX<<cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET)|(cOCTVC1_GSM_APPLICATION_ID_MODULE_PHY<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET))
/*-------------------------------------------------------------------------------------
GSM Module Data Id
-------------------------------------------------------------------------------------*/
-#define cOCTVC1_GSM_MODULE_DATA_ID_RF_UPLINK_INPUT_COMPLEX16 ((0x0000)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET))
+#define cOCTVC1_GSM_MODULE_DATA_ID_RF_UPLINK_INPUT_COMPLEX16 ((0x0000)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET)) /* Deprecated */
+ /* Should use cOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MID */
#define cOCTVC1_GSM_HOPPING_LIST_MAX_ENTRY 64 /* This is the maximum number of entries in a hopping list */
@@ -109,6 +116,7 @@ $Revision: $ #define cOCTVC1_GSM_ID_DIRECTION_ENUM_NONE 0
#define cOCTVC1_GSM_ID_DIRECTION_ENUM_RX_BTS_MS 1
#define cOCTVC1_GSM_ID_DIRECTION_ENUM_TX_BTS_MS 3
+#define cOCTVC1_GSM_ID_DIRECTION_ENUM_TX_RX_BTS_MS 4
/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_DIRECTION_ENUM : Sub Channel Direction.
@@ -118,6 +126,7 @@ $Revision: $ #define cOCTVC1_GSM_DIRECTION_ENUM_NONE cOCTVC1_GSM_ID_DIRECTION_ENUM_NONE
#define cOCTVC1_GSM_DIRECTION_ENUM_RX_BTS_MS cOCTVC1_GSM_ID_DIRECTION_ENUM_RX_BTS_MS
#define cOCTVC1_GSM_DIRECTION_ENUM_TX_BTS_MS cOCTVC1_GSM_ID_DIRECTION_ENUM_TX_BTS_MS
+#define cOCTVC1_GSM_DIRECTION_ENUM_TX_RX_BTS_MS cOCTVC1_GSM_ID_DIRECTION_ENUM_TX_RX_BTS_MS
/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_ID_TIMESLOT_NB_ENUM : Time slot number.
@@ -148,6 +157,36 @@ $Revision: $ #define cOCTVC1_GSM_TIMESLOT_NB_ENUM_7 cOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_7
/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM : Time slot number.
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM tOCT_UINT8
+
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_0 0
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_1 1
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_2 2
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_3 3
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_4 4
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_5 5
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_6 6
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_7 7
+#define cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_ALL 0xFF
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM : Time slot number.
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM tOCT_UINT32
+
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_0 cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_0
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_1 cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_1
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_2 cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_2
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_3 cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_3
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_4 cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_4
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_5 cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_5
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_6 cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_6
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_7 cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_7
+#define cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_ALL cOCTVC1_GSM_ID_TIMESLOT_NB_STUB_ENUM_ALL
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM : Sub Channel number.
-------------------------------------------------------------------------------------*/
#define tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM tOCT_UINT8
@@ -505,6 +544,49 @@ typedef struct } tOCTVC1_GSM_CIPHER_CONFIG;
/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_BUFF_ADDR
+ Buffer address
+
+ Members:
+ BuffAddr_TCHFS
+ Range: [0..2147483647]
+ Default: 0
+ Adress of Real Pointer
+ BuffAddr_RACH
+ Range: [0..2147483647]
+ Default: 0
+ Adress of Real Pointer
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCT_UINT32 BuffAddr_TCHFS;
+ tOCT_UINT32 BuffAddr_RACH;
+
+} tOCTVC1_GSM_BUFF_ADDR;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_STUB_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.
+ CHANNEL_TYPE
+ Default: cOCTVC1_GSM_SAPI_ENUM_TCHF
+ CHANNEL_TYPE.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM byTimeslotNb;
+ tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM bySubChannelNb;
+ tOCTVC1_GSM_SAPI_ENUM CHANNEL_TYPE;
+
+} tOCTVC1_GSM_STUB_CHANNEL_ID;
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_LOGICAL_CHANNEL_ID
Members:
@@ -930,6 +1012,10 @@ typedef struct } tOCTVC1_GSM_TAP_FILTER_STATS;
/*-------------------------------------------------------------------------------------
+ Deprecated
+ Should use tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA
+-------------------------------------------------------------------------------------*/
+/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER
Members:
@@ -2253,6 +2339,231 @@ typedef struct } tOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_RSP;
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+ LchId
+ Unique Logical channel identifier
+ ulResetFlag
+ Reset timeslot stats
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_LOGICAL_CHANNEL_ID LchId;
+ tOCT_BOOL32 ulResetFlag;
+
+} tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+ LchId
+ Unique Logical channel identifier
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_LOGICAL_CHANNEL_ID LchId;
+
+} tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_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_REQUEST_STUBB_LOOPBACK_TEST_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+ BuffADDR
+ Buf Address pointer
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_BUFF_ADDR BuffADDR;
+
+} tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+ STUB_CHANNEL_ID
+ Unique channel_identifier
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_STUB_CHANNEL_ID STUB_CHANNEL_ID;
+
+} tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ TrxId
+ Unique TRX identifier
+ byTimeslotNb
+ Timeslot number.
+ bySubChannelNb
+ Sub-Channel number.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM byTimeslotNb;
+ tOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM bySubChannelNb;
+
+} tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP;
+
+
+/***************************** MODULE_DATA *************************************/
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA
+
+ Members:
+ ModuleData
+ Module Data structure
+ TrxId
+ Unique TRX identifier
+ LchId
+ Logical Channel identifier
+ ulAntennaIndex
+ Antenna index
+ ulFrameNumber
+ Range: [..cOCTVC1_GSM_MAX_FRAME_COUNT]
+ ulPower
+ ulDataSizeInBytes
+ byBadFlag
+ byBurstId
+ byReserved0
+ byReserved1
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_LOGICAL_CHANNEL_ID LchId;
+ tOCTVC1_INDEX ulAntennaIndex;
+ tOCT_UINT32 ulFrameNumber;
+ tOCT_UINT32 ulPower;
+ tOCT_UINT32 ulDataSizeInBytes;
+ tOCT_UINT8 byBadFlag;
+ tOCT_UINT8 byBurstId;
+ tOCT_UINT8 byReserved0;
+ tOCT_UINT8 byReserved1;
+
+} tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA
+
+ Members:
+ ModuleData
+ Module Data structure
+ TrxId
+ Unique TRX identifier
+ LchId
+ Unique Logical channel identifier
+ ulFrameNumber
+ Range: [..cOCTVC1_GSM_MAX_FRAME_COUNT]
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_LOGICAL_CHANNEL_ID LchId;
+ tOCT_UINT32 ulFrameNumber;
+
+} tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA
+
+ Members:
+ ModuleData
+ Module Data structure
+ TrxId
+ Unique TRX identifier
+ LchId
+ Unique Logical channel identifier
+ Data
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+ tOCTVC1_GSM_TRX_ID TrxId;
+ tOCTVC1_GSM_LOGICAL_CHANNEL_ID LchId;
+ tOCTVC1_GSM_LOGICAL_CHANNEL_DATA Data;
+
+} tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA;
+
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_gsm_evt.h"
diff --git a/octvc1/gsm/octvc1_gsm_api_priv.h b/octvc1/gsm/octvc1_gsm_api_priv.h index cde4789..52ff6ee 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -38,8 +38,12 @@ $Revision: $ +
+
/***************************** METHODS *************************************/
+/***************************** MODULE_DATA *************************************/
+
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_gsm_evt_priv.h"
diff --git a/octvc1/gsm/octvc1_gsm_api_priv_swap.h b/octvc1/gsm/octvc1_gsm_api_priv_swap.h index 9fb0eb4..e497791 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/gsm/octvc1_gsm_api_swap.h b/octvc1/gsm/octvc1_gsm_api_swap.h index 5d5f80d..03c3115 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_GSM_API_SWAP_H__
@@ -60,6 +60,18 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
+#define mOCTVC1_GSM_ID_TIMESLOT_NB_STUB_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) ); }
+#else
+
+#define mOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+
#define mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( pType ) /* tOCT_UINT8 */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
@@ -255,6 +267,27 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_BUFF_ADDR_SWAP( _f_pParms ){ tOCTVC1_GSM_BUFF_ADDR * pOCTVC1_GSM_BUFF_ADDR = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_BUFF_ADDR)\
+ ((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->BuffAddr_TCHFS = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->BuffAddr_TCHFS); \
+ ((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->BuffAddr_RACH = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->BuffAddr_RACH); \
+}
+#else
+#define mOCTVC1_GSM_BUFF_ADDR_SWAP( pOCTVC1_GSM_BUFF_ADDR )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_STUB_CHANNEL_ID_SWAP( _f_pParms ){ tOCTVC1_GSM_STUB_CHANNEL_ID * pOCTVC1_GSM_STUB_CHANNEL_ID = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_STUB_CHANNEL_ID)\
+ { mOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_SWAP( &((tOCTVC1_GSM_STUB_CHANNEL_ID *)pOCTVC1_GSM_STUB_CHANNEL_ID)->byTimeslotNb ); } \
+ { mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( &((tOCTVC1_GSM_STUB_CHANNEL_ID *)pOCTVC1_GSM_STUB_CHANNEL_ID)->bySubChannelNb ); } \
+ { mOCTVC1_GSM_SAPI_ENUM_SWAP( &((tOCTVC1_GSM_STUB_CHANNEL_ID *)pOCTVC1_GSM_STUB_CHANNEL_ID)->CHANNEL_TYPE ); } \
+}
+#else
+#define mOCTVC1_GSM_STUB_CHANNEL_ID_SWAP( pOCTVC1_GSM_STUB_CHANNEL_ID )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_GSM_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 ); } \
@@ -1273,6 +1306,125 @@ extern "C" { #define mOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_RSP )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD * pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)->Header ); } \
+ { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)->TrxId ); } \
+ { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)->LchId ); } \
+ ((tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)->ulResetFlag = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)->ulResetFlag); \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP * pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP *)pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP)->Header ); } \
+ { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP *)pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP)->TrxId ); } \
+ { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP *)pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP)->LchId ); } \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD * pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD)->Header ); } \
+ { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD)->TrxId ); } \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP * pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP *)pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP)->Header ); } \
+ { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP *)pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP)->TrxId ); } \
+ { mOCTVC1_GSM_BUFF_ADDR_SWAP( &((tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP *)pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP)->BuffADDR ); } \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD * pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD)->Header ); } \
+ { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD)->TrxId ); } \
+ { mOCTVC1_GSM_STUB_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD)->STUB_CHANNEL_ID ); } \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP * pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP *)pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP)->Header ); } \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD * pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD)->Header ); } \
+ { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD)->TrxId ); } \
+ { mOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD)->byTimeslotNb ); } \
+ { mOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD *)pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD)->bySubChannelNb ); } \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP * pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP *)pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP)->Header ); } \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_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 ); } \
+ { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->LchId ); } \
+ ((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulAntennaIndex = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulAntennaIndex); \
+ ((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulFrameNumber = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulFrameNumber); \
+ ((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulPower = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulPower); \
+ ((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulDataSizeInBytes = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulDataSizeInBytes); \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA_SWAP( pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA * pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)\
+ { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->ModuleData ); } \
+ { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->TrxId ); } \
+ { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->LchId ); } \
+ ((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->ulFrameNumber = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->ulFrameNumber); \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA_SWAP( pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA * pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)\
+ { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)->ModuleData ); } \
+ { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)->TrxId ); } \
+ { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)->LchId ); } \
+ { mOCTVC1_GSM_LOGICAL_CHANNEL_DATA_SWAP( &((tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)->Data ); } \
+}
+#else
+#define mOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA_SWAP( pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
#ifdef __cplusplus
}
diff --git a/octvc1/gsm/octvc1_gsm_base.h b/octvc1/gsm/octvc1_gsm_base.h index a608501..90718f0 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -43,6 +43,7 @@ $Octasic_Revision: $ /* Module: GSM */
#define cOCTVC1_GSM_CID_BASE ( (cOCTVC1_GSM_UID << 16) + cOCTVC1_CID_BASE )
#define cOCTVC1_GSM_EID_BASE ( (cOCTVC1_GSM_UID << 16) + cOCTVC1_EID_BASE )
+#define cOCTVC1_GSM_MID_BASE ( (cOCTVC1_GSM_UID << 24) )
#define cOCTVC1_GSM_RC_BASE ( (cOCTVC1_GSM_UID << 16) + cOCTVC1_RC_BASE )
#endif /* __OCTVC1_GSM_BASE_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_default.h b/octvc1/gsm/octvc1_gsm_default.h index 75e18f2..b79cd68 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -2399,5 +2399,783 @@ extern const tOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD * }
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD buf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_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] */
+ }
+ },
+ { /* LchId */
+ cOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_0, /* byTimeslotNb */
+ cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0, /* bySubChannelNb */
+ 0, /* bySAPI */
+ 0 /* byDirection */
+ },
+ 0 /* ulResetFlag */
+};
+
+const tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD =
+ &buf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD buf_tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_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_REQUEST_STUBB_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD =
+ &buf_tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD buf_tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_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] */
+ }
+ },
+ { /* STUB_CHANNEL_ID */
+ cOCTVC1_GSM_TIMESLOT_NB_STUB_ENUM_0, /* byTimeslotNb */
+ cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0, /* bySubChannelNb */
+ cOCTVC1_GSM_SAPI_ENUM_TCHF /* CHANNEL_TYPE */
+ }
+};
+
+const tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD =
+ &buf_tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD buf_tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_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, /* byTimeslotNb */
+ 0 /* bySubChannelNb */
+};
+
+const tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD =
+ &buf_tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD; \
+ }
+
+
+/***************************** MODULE_DATA *************************************/
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA buf_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ { /* TrxId */
+ 0, /* byTrxId */
+ { /* abyPad */
+ 0, /* abyPad[0] */
+ 0, /* abyPad[1] */
+ 0 /* abyPad[2] */
+ }
+ },
+ { /* LchId */
+ cOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_0, /* byTimeslotNb */
+ cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0, /* bySubChannelNb */
+ 0, /* bySAPI */
+ 0 /* byDirection */
+ },
+ 0, /* ulAntennaIndex */
+ 0, /* ulFrameNumber */
+ 0, /* ulPower */
+ 0, /* ulDataSizeInBytes */
+ 0, /* byBadFlag */
+ 0, /* byBurstId */
+ 0, /* byReserved0 */
+ 0 /* byReserved1 */
+};
+
+const tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA =
+ &buf_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA buf_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ { /* TrxId */
+ 0, /* byTrxId */
+ { /* abyPad */
+ 0, /* abyPad[0] */
+ 0, /* abyPad[1] */
+ 0 /* abyPad[2] */
+ }
+ },
+ { /* LchId */
+ cOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_0, /* byTimeslotNb */
+ cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0, /* bySubChannelNb */
+ 0, /* bySAPI */
+ 0 /* byDirection */
+ },
+ 0 /* ulFrameNumber */
+};
+
+const tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA =
+ &buf_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA buf_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ },
+ { /* TrxId */
+ 0, /* byTrxId */
+ { /* abyPad */
+ 0, /* abyPad[0] */
+ 0, /* abyPad[1] */
+ 0 /* abyPad[2] */
+ }
+ },
+ { /* LchId */
+ cOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_0, /* byTimeslotNb */
+ cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0, /* bySubChannelNb */
+ 0, /* bySAPI */
+ 0 /* byDirection */
+ },
+ { /* Data */
+ 0, /* ulFrameNumber */
+ cOCTVC1_GSM_PAYLOAD_TYPE_ENUM_NONE, /* ulPayloadType */
+ 0, /* ulDataLength */
+ { /* abyDataContent */
+ 0, /* abyDataContent[0] */
+ 0, /* abyDataContent[1] */
+ 0, /* abyDataContent[2] */
+ 0, /* abyDataContent[3] */
+ 0, /* abyDataContent[4] */
+ 0, /* abyDataContent[5] */
+ 0, /* abyDataContent[6] */
+ 0, /* abyDataContent[7] */
+ 0, /* abyDataContent[8] */
+ 0, /* abyDataContent[9] */
+ 0, /* abyDataContent[10] */
+ 0, /* abyDataContent[11] */
+ 0, /* abyDataContent[12] */
+ 0, /* abyDataContent[13] */
+ 0, /* abyDataContent[14] */
+ 0, /* abyDataContent[15] */
+ 0, /* abyDataContent[16] */
+ 0, /* abyDataContent[17] */
+ 0, /* abyDataContent[18] */
+ 0, /* abyDataContent[19] */
+ 0, /* abyDataContent[20] */
+ 0, /* abyDataContent[21] */
+ 0, /* abyDataContent[22] */
+ 0, /* abyDataContent[23] */
+ 0, /* abyDataContent[24] */
+ 0, /* abyDataContent[25] */
+ 0, /* abyDataContent[26] */
+ 0, /* abyDataContent[27] */
+ 0, /* abyDataContent[28] */
+ 0, /* abyDataContent[29] */
+ 0, /* abyDataContent[30] */
+ 0, /* abyDataContent[31] */
+ 0, /* abyDataContent[32] */
+ 0, /* abyDataContent[33] */
+ 0, /* abyDataContent[34] */
+ 0, /* abyDataContent[35] */
+ 0, /* abyDataContent[36] */
+ 0, /* abyDataContent[37] */
+ 0, /* abyDataContent[38] */
+ 0, /* abyDataContent[39] */
+ 0, /* abyDataContent[40] */
+ 0, /* abyDataContent[41] */
+ 0, /* abyDataContent[42] */
+ 0, /* abyDataContent[43] */
+ 0, /* abyDataContent[44] */
+ 0, /* abyDataContent[45] */
+ 0, /* abyDataContent[46] */
+ 0, /* abyDataContent[47] */
+ 0, /* abyDataContent[48] */
+ 0, /* abyDataContent[49] */
+ 0, /* abyDataContent[50] */
+ 0, /* abyDataContent[51] */
+ 0, /* abyDataContent[52] */
+ 0, /* abyDataContent[53] */
+ 0, /* abyDataContent[54] */
+ 0, /* abyDataContent[55] */
+ 0, /* abyDataContent[56] */
+ 0, /* abyDataContent[57] */
+ 0, /* abyDataContent[58] */
+ 0, /* abyDataContent[59] */
+ 0, /* abyDataContent[60] */
+ 0, /* abyDataContent[61] */
+ 0, /* abyDataContent[62] */
+ 0, /* abyDataContent[63] */
+ 0, /* abyDataContent[64] */
+ 0, /* abyDataContent[65] */
+ 0, /* abyDataContent[66] */
+ 0, /* abyDataContent[67] */
+ 0, /* abyDataContent[68] */
+ 0, /* abyDataContent[69] */
+ 0, /* abyDataContent[70] */
+ 0, /* abyDataContent[71] */
+ 0, /* abyDataContent[72] */
+ 0, /* abyDataContent[73] */
+ 0, /* abyDataContent[74] */
+ 0, /* abyDataContent[75] */
+ 0, /* abyDataContent[76] */
+ 0, /* abyDataContent[77] */
+ 0, /* abyDataContent[78] */
+ 0, /* abyDataContent[79] */
+ 0, /* abyDataContent[80] */
+ 0, /* abyDataContent[81] */
+ 0, /* abyDataContent[82] */
+ 0, /* abyDataContent[83] */
+ 0, /* abyDataContent[84] */
+ 0, /* abyDataContent[85] */
+ 0, /* abyDataContent[86] */
+ 0, /* abyDataContent[87] */
+ 0, /* abyDataContent[88] */
+ 0, /* abyDataContent[89] */
+ 0, /* abyDataContent[90] */
+ 0, /* abyDataContent[91] */
+ 0, /* abyDataContent[92] */
+ 0, /* abyDataContent[93] */
+ 0, /* abyDataContent[94] */
+ 0, /* abyDataContent[95] */
+ 0, /* abyDataContent[96] */
+ 0, /* abyDataContent[97] */
+ 0, /* abyDataContent[98] */
+ 0, /* abyDataContent[99] */
+ 0, /* abyDataContent[100] */
+ 0, /* abyDataContent[101] */
+ 0, /* abyDataContent[102] */
+ 0, /* abyDataContent[103] */
+ 0, /* abyDataContent[104] */
+ 0, /* abyDataContent[105] */
+ 0, /* abyDataContent[106] */
+ 0, /* abyDataContent[107] */
+ 0, /* abyDataContent[108] */
+ 0, /* abyDataContent[109] */
+ 0, /* abyDataContent[110] */
+ 0, /* abyDataContent[111] */
+ 0, /* abyDataContent[112] */
+ 0, /* abyDataContent[113] */
+ 0, /* abyDataContent[114] */
+ 0, /* abyDataContent[115] */
+ 0, /* abyDataContent[116] */
+ 0, /* abyDataContent[117] */
+ 0, /* abyDataContent[118] */
+ 0, /* abyDataContent[119] */
+ 0, /* abyDataContent[120] */
+ 0, /* abyDataContent[121] */
+ 0, /* abyDataContent[122] */
+ 0, /* abyDataContent[123] */
+ 0, /* abyDataContent[124] */
+ 0, /* abyDataContent[125] */
+ 0, /* abyDataContent[126] */
+ 0, /* abyDataContent[127] */
+ 0, /* abyDataContent[128] */
+ 0, /* abyDataContent[129] */
+ 0, /* abyDataContent[130] */
+ 0, /* abyDataContent[131] */
+ 0, /* abyDataContent[132] */
+ 0, /* abyDataContent[133] */
+ 0, /* abyDataContent[134] */
+ 0, /* abyDataContent[135] */
+ 0, /* abyDataContent[136] */
+ 0, /* abyDataContent[137] */
+ 0, /* abyDataContent[138] */
+ 0, /* abyDataContent[139] */
+ 0, /* abyDataContent[140] */
+ 0, /* abyDataContent[141] */
+ 0, /* abyDataContent[142] */
+ 0, /* abyDataContent[143] */
+ 0, /* abyDataContent[144] */
+ 0, /* abyDataContent[145] */
+ 0, /* abyDataContent[146] */
+ 0, /* abyDataContent[147] */
+ 0, /* abyDataContent[148] */
+ 0, /* abyDataContent[149] */
+ 0, /* abyDataContent[150] */
+ 0, /* abyDataContent[151] */
+ 0, /* abyDataContent[152] */
+ 0, /* abyDataContent[153] */
+ 0, /* abyDataContent[154] */
+ 0, /* abyDataContent[155] */
+ 0, /* abyDataContent[156] */
+ 0, /* abyDataContent[157] */
+ 0, /* abyDataContent[158] */
+ 0, /* abyDataContent[159] */
+ 0, /* abyDataContent[160] */
+ 0, /* abyDataContent[161] */
+ 0, /* abyDataContent[162] */
+ 0, /* abyDataContent[163] */
+ 0, /* abyDataContent[164] */
+ 0, /* abyDataContent[165] */
+ 0, /* abyDataContent[166] */
+ 0, /* abyDataContent[167] */
+ 0, /* abyDataContent[168] */
+ 0, /* abyDataContent[169] */
+ 0, /* abyDataContent[170] */
+ 0, /* abyDataContent[171] */
+ 0, /* abyDataContent[172] */
+ 0, /* abyDataContent[173] */
+ 0, /* abyDataContent[174] */
+ 0, /* abyDataContent[175] */
+ 0, /* abyDataContent[176] */
+ 0, /* abyDataContent[177] */
+ 0, /* abyDataContent[178] */
+ 0, /* abyDataContent[179] */
+ 0, /* abyDataContent[180] */
+ 0, /* abyDataContent[181] */
+ 0, /* abyDataContent[182] */
+ 0, /* abyDataContent[183] */
+ 0, /* abyDataContent[184] */
+ 0, /* abyDataContent[185] */
+ 0, /* abyDataContent[186] */
+ 0, /* abyDataContent[187] */
+ 0, /* abyDataContent[188] */
+ 0, /* abyDataContent[189] */
+ 0, /* abyDataContent[190] */
+ 0, /* abyDataContent[191] */
+ 0, /* abyDataContent[192] */
+ 0, /* abyDataContent[193] */
+ 0, /* abyDataContent[194] */
+ 0, /* abyDataContent[195] */
+ 0, /* abyDataContent[196] */
+ 0, /* abyDataContent[197] */
+ 0, /* abyDataContent[198] */
+ 0, /* abyDataContent[199] */
+ 0, /* abyDataContent[200] */
+ 0, /* abyDataContent[201] */
+ 0, /* abyDataContent[202] */
+ 0, /* abyDataContent[203] */
+ 0, /* abyDataContent[204] */
+ 0, /* abyDataContent[205] */
+ 0, /* abyDataContent[206] */
+ 0, /* abyDataContent[207] */
+ 0, /* abyDataContent[208] */
+ 0, /* abyDataContent[209] */
+ 0, /* abyDataContent[210] */
+ 0, /* abyDataContent[211] */
+ 0, /* abyDataContent[212] */
+ 0, /* abyDataContent[213] */
+ 0, /* abyDataContent[214] */
+ 0, /* abyDataContent[215] */
+ 0, /* abyDataContent[216] */
+ 0, /* abyDataContent[217] */
+ 0, /* abyDataContent[218] */
+ 0, /* abyDataContent[219] */
+ 0, /* abyDataContent[220] */
+ 0, /* abyDataContent[221] */
+ 0, /* abyDataContent[222] */
+ 0, /* abyDataContent[223] */
+ 0, /* abyDataContent[224] */
+ 0, /* abyDataContent[225] */
+ 0, /* abyDataContent[226] */
+ 0, /* abyDataContent[227] */
+ 0, /* abyDataContent[228] */
+ 0, /* abyDataContent[229] */
+ 0, /* abyDataContent[230] */
+ 0, /* abyDataContent[231] */
+ 0, /* abyDataContent[232] */
+ 0, /* abyDataContent[233] */
+ 0, /* abyDataContent[234] */
+ 0, /* abyDataContent[235] */
+ 0, /* abyDataContent[236] */
+ 0, /* abyDataContent[237] */
+ 0, /* abyDataContent[238] */
+ 0, /* abyDataContent[239] */
+ 0, /* abyDataContent[240] */
+ 0, /* abyDataContent[241] */
+ 0, /* abyDataContent[242] */
+ 0, /* abyDataContent[243] */
+ 0, /* abyDataContent[244] */
+ 0, /* abyDataContent[245] */
+ 0, /* abyDataContent[246] */
+ 0, /* abyDataContent[247] */
+ 0, /* abyDataContent[248] */
+ 0, /* abyDataContent[249] */
+ 0, /* abyDataContent[250] */
+ 0, /* abyDataContent[251] */
+ 0, /* abyDataContent[252] */
+ 0, /* abyDataContent[253] */
+ 0, /* abyDataContent[254] */
+ 0, /* abyDataContent[255] */
+ 0, /* abyDataContent[256] */
+ 0, /* abyDataContent[257] */
+ 0, /* abyDataContent[258] */
+ 0, /* abyDataContent[259] */
+ 0, /* abyDataContent[260] */
+ 0, /* abyDataContent[261] */
+ 0, /* abyDataContent[262] */
+ 0, /* abyDataContent[263] */
+ 0, /* abyDataContent[264] */
+ 0, /* abyDataContent[265] */
+ 0, /* abyDataContent[266] */
+ 0, /* abyDataContent[267] */
+ 0, /* abyDataContent[268] */
+ 0, /* abyDataContent[269] */
+ 0, /* abyDataContent[270] */
+ 0, /* abyDataContent[271] */
+ 0, /* abyDataContent[272] */
+ 0, /* abyDataContent[273] */
+ 0, /* abyDataContent[274] */
+ 0, /* abyDataContent[275] */
+ 0, /* abyDataContent[276] */
+ 0, /* abyDataContent[277] */
+ 0, /* abyDataContent[278] */
+ 0, /* abyDataContent[279] */
+ 0, /* abyDataContent[280] */
+ 0, /* abyDataContent[281] */
+ 0, /* abyDataContent[282] */
+ 0, /* abyDataContent[283] */
+ 0, /* abyDataContent[284] */
+ 0, /* abyDataContent[285] */
+ 0, /* abyDataContent[286] */
+ 0, /* abyDataContent[287] */
+ 0, /* abyDataContent[288] */
+ 0, /* abyDataContent[289] */
+ 0, /* abyDataContent[290] */
+ 0, /* abyDataContent[291] */
+ 0, /* abyDataContent[292] */
+ 0, /* abyDataContent[293] */
+ 0, /* abyDataContent[294] */
+ 0, /* abyDataContent[295] */
+ 0, /* abyDataContent[296] */
+ 0, /* abyDataContent[297] */
+ 0, /* abyDataContent[298] */
+ 0, /* abyDataContent[299] */
+ 0, /* abyDataContent[300] */
+ 0, /* abyDataContent[301] */
+ 0, /* abyDataContent[302] */
+ 0, /* abyDataContent[303] */
+ 0, /* abyDataContent[304] */
+ 0, /* abyDataContent[305] */
+ 0, /* abyDataContent[306] */
+ 0, /* abyDataContent[307] */
+ 0, /* abyDataContent[308] */
+ 0, /* abyDataContent[309] */
+ 0, /* abyDataContent[310] */
+ 0, /* abyDataContent[311] */
+ 0, /* abyDataContent[312] */
+ 0, /* abyDataContent[313] */
+ 0, /* abyDataContent[314] */
+ 0, /* abyDataContent[315] */
+ 0, /* abyDataContent[316] */
+ 0, /* abyDataContent[317] */
+ 0, /* abyDataContent[318] */
+ 0, /* abyDataContent[319] */
+ 0, /* abyDataContent[320] */
+ 0, /* abyDataContent[321] */
+ 0, /* abyDataContent[322] */
+ 0, /* abyDataContent[323] */
+ 0, /* abyDataContent[324] */
+ 0, /* abyDataContent[325] */
+ 0, /* abyDataContent[326] */
+ 0, /* abyDataContent[327] */
+ 0, /* abyDataContent[328] */
+ 0, /* abyDataContent[329] */
+ 0, /* abyDataContent[330] */
+ 0, /* abyDataContent[331] */
+ 0, /* abyDataContent[332] */
+ 0, /* abyDataContent[333] */
+ 0, /* abyDataContent[334] */
+ 0, /* abyDataContent[335] */
+ 0, /* abyDataContent[336] */
+ 0, /* abyDataContent[337] */
+ 0, /* abyDataContent[338] */
+ 0, /* abyDataContent[339] */
+ 0, /* abyDataContent[340] */
+ 0, /* abyDataContent[341] */
+ 0, /* abyDataContent[342] */
+ 0, /* abyDataContent[343] */
+ 0, /* abyDataContent[344] */
+ 0, /* abyDataContent[345] */
+ 0, /* abyDataContent[346] */
+ 0, /* abyDataContent[347] */
+ 0, /* abyDataContent[348] */
+ 0, /* abyDataContent[349] */
+ 0, /* abyDataContent[350] */
+ 0, /* abyDataContent[351] */
+ 0, /* abyDataContent[352] */
+ 0, /* abyDataContent[353] */
+ 0, /* abyDataContent[354] */
+ 0, /* abyDataContent[355] */
+ 0, /* abyDataContent[356] */
+ 0, /* abyDataContent[357] */
+ 0, /* abyDataContent[358] */
+ 0, /* abyDataContent[359] */
+ 0, /* abyDataContent[360] */
+ 0, /* abyDataContent[361] */
+ 0, /* abyDataContent[362] */
+ 0, /* abyDataContent[363] */
+ 0, /* abyDataContent[364] */
+ 0, /* abyDataContent[365] */
+ 0, /* abyDataContent[366] */
+ 0, /* abyDataContent[367] */
+ 0, /* abyDataContent[368] */
+ 0, /* abyDataContent[369] */
+ 0, /* abyDataContent[370] */
+ 0, /* abyDataContent[371] */
+ 0, /* abyDataContent[372] */
+ 0, /* abyDataContent[373] */
+ 0, /* abyDataContent[374] */
+ 0, /* abyDataContent[375] */
+ 0, /* abyDataContent[376] */
+ 0, /* abyDataContent[377] */
+ 0, /* abyDataContent[378] */
+ 0, /* abyDataContent[379] */
+ 0, /* abyDataContent[380] */
+ 0, /* abyDataContent[381] */
+ 0, /* abyDataContent[382] */
+ 0, /* abyDataContent[383] */
+ 0, /* abyDataContent[384] */
+ 0, /* abyDataContent[385] */
+ 0, /* abyDataContent[386] */
+ 0, /* abyDataContent[387] */
+ 0, /* abyDataContent[388] */
+ 0, /* abyDataContent[389] */
+ 0, /* abyDataContent[390] */
+ 0, /* abyDataContent[391] */
+ 0, /* abyDataContent[392] */
+ 0, /* abyDataContent[393] */
+ 0, /* abyDataContent[394] */
+ 0, /* abyDataContent[395] */
+ 0, /* abyDataContent[396] */
+ 0, /* abyDataContent[397] */
+ 0, /* abyDataContent[398] */
+ 0, /* abyDataContent[399] */
+ 0, /* abyDataContent[400] */
+ 0, /* abyDataContent[401] */
+ 0, /* abyDataContent[402] */
+ 0, /* abyDataContent[403] */
+ 0, /* abyDataContent[404] */
+ 0, /* abyDataContent[405] */
+ 0, /* abyDataContent[406] */
+ 0, /* abyDataContent[407] */
+ 0, /* abyDataContent[408] */
+ 0, /* abyDataContent[409] */
+ 0, /* abyDataContent[410] */
+ 0, /* abyDataContent[411] */
+ 0, /* abyDataContent[412] */
+ 0, /* abyDataContent[413] */
+ 0, /* abyDataContent[414] */
+ 0, /* abyDataContent[415] */
+ 0, /* abyDataContent[416] */
+ 0, /* abyDataContent[417] */
+ 0, /* abyDataContent[418] */
+ 0, /* abyDataContent[419] */
+ 0, /* abyDataContent[420] */
+ 0, /* abyDataContent[421] */
+ 0, /* abyDataContent[422] */
+ 0, /* abyDataContent[423] */
+ 0, /* abyDataContent[424] */
+ 0, /* abyDataContent[425] */
+ 0, /* abyDataContent[426] */
+ 0, /* abyDataContent[427] */
+ 0, /* abyDataContent[428] */
+ 0, /* abyDataContent[429] */
+ 0, /* abyDataContent[430] */
+ 0, /* abyDataContent[431] */
+ 0, /* abyDataContent[432] */
+ 0, /* abyDataContent[433] */
+ 0, /* abyDataContent[434] */
+ 0, /* abyDataContent[435] */
+ 0, /* abyDataContent[436] */
+ 0, /* abyDataContent[437] */
+ 0, /* abyDataContent[438] */
+ 0, /* abyDataContent[439] */
+ 0, /* abyDataContent[440] */
+ 0, /* abyDataContent[441] */
+ 0, /* abyDataContent[442] */
+ 0, /* abyDataContent[443] */
+ 0, /* abyDataContent[444] */
+ 0, /* abyDataContent[445] */
+ 0, /* abyDataContent[446] */
+ 0, /* abyDataContent[447] */
+ 0, /* abyDataContent[448] */
+ 0, /* abyDataContent[449] */
+ 0, /* abyDataContent[450] */
+ 0, /* abyDataContent[451] */
+ 0, /* abyDataContent[452] */
+ 0, /* abyDataContent[453] */
+ 0, /* abyDataContent[454] */
+ 0, /* abyDataContent[455] */
+ 0, /* abyDataContent[456] */
+ 0, /* abyDataContent[457] */
+ 0, /* abyDataContent[458] */
+ 0, /* abyDataContent[459] */
+ 0, /* abyDataContent[460] */
+ 0, /* abyDataContent[461] */
+ 0, /* abyDataContent[462] */
+ 0, /* abyDataContent[463] */
+ 0, /* abyDataContent[464] */
+ 0, /* abyDataContent[465] */
+ 0, /* abyDataContent[466] */
+ 0 /* abyDataContent[467] */
+ }
+ }
+};
+
+const tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA =
+ &buf_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA; \
+ }
+
+
#endif /* __OCTVC1_GSM_DEFAULT_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_default_priv.h b/octvc1/gsm/octvc1_gsm_default_priv.h index 530f4db..91de2e5 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -34,5 +34,7 @@ $Octasic_Revision: $ /***************************** COMMAND DEFAULT *****************************/
+/***************************** MODULE_DATA *************************************/
+
#endif /* __OCTVC1_GSM_DEFAULT_PRIV_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_evt.h b/octvc1/gsm/octvc1_gsm_evt.h index 475ec0e..fd7d30c 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_evt_priv.h b/octvc1/gsm/octvc1_gsm_evt_priv.h index 0f7f995..c23f1fd 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_evt_priv_swap.h b/octvc1/gsm/octvc1_gsm_evt_priv_swap.h index b56b2f4..16227b5 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/gsm/octvc1_gsm_evt_swap.h b/octvc1/gsm/octvc1_gsm_evt_swap.h index 5724c43..f8bd243 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_GSM_EVT_SWAP_H__
diff --git a/octvc1/gsm/octvc1_gsm_id.h b/octvc1/gsm/octvc1_gsm_id.h index 648e062..0fa2d4b 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -69,8 +69,12 @@ $Octasic_Revision: $ #define cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID ( 0x020 + cOCTVC1_GSM_CID_BASE )
#define cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID ( 0x035 + cOCTVC1_GSM_CID_BASE )
#define cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID ( 0x036 + cOCTVC1_GSM_CID_BASE )
+#define cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID ( 0x037 + cOCTVC1_GSM_CID_BASE )
+#define cOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CID ( 0x038 + cOCTVC1_GSM_CID_BASE )
+#define cOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CID ( 0x039 + cOCTVC1_GSM_CID_BASE )
+#define cOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CID ( 0x03a + cOCTVC1_GSM_CID_BASE )
-#define cOCTVC1_GSM_CID_MAX (( 0x036 + 1 ) & 0xFFF)
+#define cOCTVC1_GSM_CID_MAX (( 0x03a + 1 ) & 0xFFF)
/****************************************************************************
Event IDs
@@ -84,6 +88,15 @@ $Octasic_Revision: $ #define cOCTVC1_GSM_EID_MAX (( 0x0034 + 1 ) & 0xFFFF)
+/****************************************************************************
+ Module Data IDs
+ ****************************************************************************/
+#define cOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MID ( 0x0000 + cOCTVC1_GSM_MID_BASE )
+#define cOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MID ( 0x0001 + cOCTVC1_GSM_MID_BASE )
+#define cOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MID ( 0x0002 + cOCTVC1_GSM_MID_BASE )
+
+#define cOCTVC1_GSM_MID_MAX (( 0x0002 + 1 ) & 0xFFFF)
+
#endif /* __OCTVC1_GSM_ID_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_id_priv.h b/octvc1/gsm/octvc1_gsm_id_priv.h index 151d2d5..2e5103a 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -40,6 +40,10 @@ $Octasic_Revision: $ Event IDs
****************************************************************************/
+/****************************************************************************
+ Module Data IDs
+ ****************************************************************************/
+
#endif /* __OCTVC1_GSM_ID_PRIV_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_rc.h b/octvc1/gsm/octvc1_gsm_rc.h index b8d83aa..183ddf4 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -95,15 +95,17 @@ $Octasic_Revision: $ #define cOCTVC1_GSM_RC_RF_CONFIG_INVALID_RX_GAIN_DB ( 0x1 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
#define cOCTVC1_GSM_RC_RF_CONFIG_INVALID_TX_ATTND_B ( 0x2 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
#define cOCTVC1_GSM_RC_TRX_CONFIG_INVALID_US_TSC ( 0x3 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_FRAME_NUMBER ( 0x4 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_DATA_LENGTH ( 0x5 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_FRAME_NUMBER ( 0x6 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_DATA_LENGTH ( 0x7 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_TAP_FILTER_PHYSICAL_CHANNEL_INVALID_ENTRY_CNT ( 0x8 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_TAP_FILTER_LOGICAL_CHANNEL_INVALID_ENTRY_CNT ( 0x9 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_TAP_FILTER_STATS_INVALID_TAP_ID_CNT ( 0xA + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_MODULE_DATA_RF_UPLINK_INPUT_HEADER_INVALID_FRAME_NUMBER ( 0xB + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_TRX_LOGICAL_CHANNEL_EMPTY_FRAME_REQUEST_INVALID_FRAME_NUMBER ( 0xC + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__TCHFS ( 0x4 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__RACH ( 0x5 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_FRAME_NUMBER ( 0x6 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_DATA_LENGTH ( 0x7 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_FRAME_NUMBER ( 0x8 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_DATA_LENGTH ( 0x9 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_TAP_FILTER_PHYSICAL_CHANNEL_INVALID_ENTRY_CNT ( 0xA + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_TAP_FILTER_LOGICAL_CHANNEL_INVALID_ENTRY_CNT ( 0xB + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_TAP_FILTER_STATS_INVALID_TAP_ID_CNT ( 0xC + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_MODULE_DATA_RF_UPLINK_INPUT_HEADER_INVALID_FRAME_NUMBER ( 0xD + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_TRX_LOGICAL_CHANNEL_EMPTY_FRAME_REQUEST_INVALID_FRAME_NUMBER ( 0xE + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
#endif /* OCTVC1_GSM_RC_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_rc_priv.h b/octvc1/gsm/octvc1_gsm_rc_priv.h index b685dd2..6599400 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_version.h b/octvc1/gsm/octvc1_gsm_version.h index d6ad502..4eb20a3 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -35,10 +35,10 @@ $Octasic_Revision: $ bit[17:11]: Bug fix version
bit[10:0]: Build number
*/
-#define cOCTVC1_GSM_VERSION_MAJOR 1
-#define cOCTVC1_GSM_VERSION_MINOR 3
+#define cOCTVC1_GSM_VERSION_MAJOR 2
+#define cOCTVC1_GSM_VERSION_MINOR 5
#define cOCTVC1_GSM_VERSION_MAINTENANCE 0
-#define cOCTVC1_GSM_VERSION_BUILD 560
+#define cOCTVC1_GSM_VERSION_BUILD 818
#define cOCTVC1_GSM_VERSION_ID ( (cOCTVC1_GSM_VERSION_MAJOR << 25) + \
(cOCTVC1_GSM_VERSION_MINOR << 18) + \
diff --git a/octvc1/hw/octvc1_hw_api.h b/octvc1/hw/octvc1_hw_api.h index 2d7efb1..a46643f 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -41,6 +41,7 @@ $Revision: $ #include "../octvc1_list.h"
#include "../octvc1_log.h"
#include "../octvc1_process.h"
+#include "../octvc1_user_id.h"
#include "../octvc1_radio.h"
#include "octvc1_hw_id.h"
@@ -173,15 +174,15 @@ typedef struct Default: 0
Physical core index. Value 0 means no core is running for this logical
identifier.
- ulProcessImageType
- Default: cOCTVC1_PROCESS_TYPE_ENUM_INVALID
+ ulProcessUserId
+ Default: cOCTVC1_USER_ID_PROCESS_ENUM_INVALID
Process Type identifier. Value INVALID means no process running on this core.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCT_UINT32 hProcess;
- tOCT_UINT32 ulPhysicalCoreId;
- tOCTVC1_PROCESS_TYPE_ENUM ulProcessImageType;
+ tOCT_UINT32 hProcess;
+ tOCT_UINT32 ulPhysicalCoreId;
+ tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
} tOCTVC1_HW_CPU_CORE_INFO;
@@ -395,8 +396,8 @@ typedef struct Average byte receive per seconds
ulRxAveragePeriodUs
Average Time in micro second between two receive
- ulFrequencyHz
- Current frequency in Hz
+ ulFrequencyKhz
+ Current frequency in Khz
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -404,7 +405,7 @@ typedef struct tOCT_UINT32 ulRxOverflowCnt;
tOCT_UINT32 ulRxAverageBytePerSecond;
tOCT_UINT32 ulRxAveragePeriodUs;
- tOCT_UINT32 ulFrequencyHz;
+ tOCT_UINT32 ulFrequencyKhz;
} tOCTVC1_HW_RF_PORT_RX_STATS;
@@ -421,8 +422,8 @@ typedef struct Average byte receive per seconds
ulTxAveragePeriodUs
Average Time in micro second between two send
- ulFrequencyHz
- Current frequency in Hz
+ ulFrequencyKhz
+ Current frequency in Khz
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -430,7 +431,7 @@ typedef struct tOCT_UINT32 ulTxUnderflowCnt;
tOCT_UINT32 ulTxAverageBytePerSecond;
tOCT_UINT32 ulTxAveragePeriodUs;
- tOCT_UINT32 ulFrequencyHz;
+ tOCT_UINT32 ulFrequencyKhz;
} tOCTVC1_HW_RF_PORT_TX_STATS;
@@ -527,14 +528,14 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szName[(cOCTVC1_HW_PCB_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szName[(cOCTVC1_HW_PCB_NAME_MAX_LENGTH+1)];
tOCT_UINT32 ulDeviceId;
- tOCT_UINT8 szSerial[(cOCTVC1_HW_PCB_SERIAL_MAX_LENGTH+1)];
- tOCT_UINT8 szFilename[(cOCTVC1_HW_PCB_FILENAME_MAX_LENGTH+1)];
+ tOCT_INT8 szSerial[(cOCTVC1_HW_PCB_SERIAL_MAX_LENGTH+1)];
+ tOCT_INT8 szFilename[(cOCTVC1_HW_PCB_FILENAME_MAX_LENGTH+1)];
tOCTVC1_HW_PCB_INFO_SOURCE_ENUM ulInfoSource;
tOCTVC1_HW_PCB_INFO_STATE_ENUM ulInfoState;
- tOCT_UINT8 szGpsName[(cOCTVC1_HW_PCB_GPS_NAME_MAX_LENGTH+1)];
- tOCT_UINT8 szWifiName[(cOCTVC1_HW_PCB_WIFI_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szGpsName[(cOCTVC1_HW_PCB_GPS_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szWifiName[(cOCTVC1_HW_PCB_WIFI_NAME_MAX_LENGTH+1)];
} tOCTVC1_HW_MSG_PCB_INFO_RSP;
@@ -821,10 +822,10 @@ typedef struct Main Rf port owner identifier.
ulPortInterfaceId
PCB Port Interface Id
- ulFrequencyMinHz
- RF minimum frequency (Hz)
- ulFrequencyMaxHz
- RF maximum frequency (Hz)
+ ulFrequencyMinKhz
+ RF minimum frequency (Khz)
+ ulFrequencyMaxKhz
+ RF maximum frequency (Khz)
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -833,8 +834,8 @@ typedef struct tOCT_BOOL32 ulInService;
tOCTVC1_HANDLE_OBJECT hOwner;
tOCT_UINT32 ulPortInterfaceId;
- tOCT_UINT32 ulFrequencyMinHz;
- tOCT_UINT32 ulFrequencyMaxHz;
+ tOCT_UINT32 ulFrequencyMinKhz;
+ tOCT_UINT32 ulFrequencyMaxKhz;
} tOCTVC1_HW_MSG_RF_PORT_INFO_RSP;
diff --git a/octvc1/hw/octvc1_hw_api_priv.h b/octvc1/hw/octvc1_hw_api_priv.h index a5f7293..f9f073c 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/hw/octvc1_hw_api_priv_swap.h b/octvc1/hw/octvc1_hw_api_priv_swap.h index efc3755..81e9d6e 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/hw/octvc1_hw_api_swap.h b/octvc1/hw/octvc1_hw_api_swap.h index 81e15b2..36b17f3 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_HW_API_SWAP_H__
@@ -99,7 +99,7 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->hProcess); \
((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->ulPhysicalCoreId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->ulPhysicalCoreId); \
- { mOCTVC1_PROCESS_TYPE_ENUM_SWAP( &((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->ulProcessImageType ); } \
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->ulProcessUserId ); } \
}
#else
#define mOCTVC1_HW_CPU_CORE_INFO_SWAP( pOCTVC1_HW_CPU_CORE_INFO )
@@ -235,8 +235,8 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_HW_RF_PORT_RX_STATS *)pOCTVC1_HW_RF_PORT_RX_STATS)->ulRxAverageBytePerSecond); \
((tOCTVC1_HW_RF_PORT_RX_STATS *)pOCTVC1_HW_RF_PORT_RX_STATS)->ulRxAveragePeriodUs = \
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_RF_PORT_RX_STATS *)pOCTVC1_HW_RF_PORT_RX_STATS)->ulRxAveragePeriodUs); \
- ((tOCTVC1_HW_RF_PORT_RX_STATS *)pOCTVC1_HW_RF_PORT_RX_STATS)->ulFrequencyHz = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_HW_RF_PORT_RX_STATS *)pOCTVC1_HW_RF_PORT_RX_STATS)->ulFrequencyHz); \
+ ((tOCTVC1_HW_RF_PORT_RX_STATS *)pOCTVC1_HW_RF_PORT_RX_STATS)->ulFrequencyKhz = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_HW_RF_PORT_RX_STATS *)pOCTVC1_HW_RF_PORT_RX_STATS)->ulFrequencyKhz); \
}
#else
#define mOCTVC1_HW_RF_PORT_RX_STATS_SWAP( pOCTVC1_HW_RF_PORT_RX_STATS )
@@ -252,8 +252,8 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_HW_RF_PORT_TX_STATS *)pOCTVC1_HW_RF_PORT_TX_STATS)->ulTxAverageBytePerSecond); \
((tOCTVC1_HW_RF_PORT_TX_STATS *)pOCTVC1_HW_RF_PORT_TX_STATS)->ulTxAveragePeriodUs = \
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_RF_PORT_TX_STATS *)pOCTVC1_HW_RF_PORT_TX_STATS)->ulTxAveragePeriodUs); \
- ((tOCTVC1_HW_RF_PORT_TX_STATS *)pOCTVC1_HW_RF_PORT_TX_STATS)->ulFrequencyHz = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_HW_RF_PORT_TX_STATS *)pOCTVC1_HW_RF_PORT_TX_STATS)->ulFrequencyHz); \
+ ((tOCTVC1_HW_RF_PORT_TX_STATS *)pOCTVC1_HW_RF_PORT_TX_STATS)->ulFrequencyKhz = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_HW_RF_PORT_TX_STATS *)pOCTVC1_HW_RF_PORT_TX_STATS)->ulFrequencyKhz); \
}
#else
#define mOCTVC1_HW_RF_PORT_TX_STATS_SWAP( pOCTVC1_HW_RF_PORT_TX_STATS )
@@ -489,10 +489,10 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->hOwner); \
((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulPortInterfaceId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulPortInterfaceId); \
- ((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulFrequencyMinHz = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulFrequencyMinHz); \
- ((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulFrequencyMaxHz = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulFrequencyMaxHz); \
+ ((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulFrequencyMinKhz = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulFrequencyMinKhz); \
+ ((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulFrequencyMaxKhz = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_INFO_RSP *)pOCTVC1_HW_MSG_RF_PORT_INFO_RSP)->ulFrequencyMaxKhz); \
}
#else
#define mOCTVC1_HW_MSG_RF_PORT_INFO_RSP_SWAP( pOCTVC1_HW_MSG_RF_PORT_INFO_RSP )
diff --git a/octvc1/hw/octvc1_hw_base.h b/octvc1/hw/octvc1_hw_base.h index 490a509..0c5a668 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_default.h b/octvc1/hw/octvc1_hw_default.h index a687682..945c8e7 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_default_priv.h b/octvc1/hw/octvc1_hw_default_priv.h index c6dcbbc..756100c 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_evt.h b/octvc1/hw/octvc1_hw_evt.h index d44203b..ceacc1a 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_evt_priv.h b/octvc1/hw/octvc1_hw_evt_priv.h index 778460c..547f898 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_evt_priv_swap.h b/octvc1/hw/octvc1_hw_evt_priv_swap.h index b21989f..b9b7589 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/hw/octvc1_hw_evt_swap.h b/octvc1/hw/octvc1_hw_evt_swap.h index 46d7796..c35c0ad 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_HW_EVT_SWAP_H__
diff --git a/octvc1/hw/octvc1_hw_id.h b/octvc1/hw/octvc1_hw_id.h index e073699..db4e440 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_id_priv.h b/octvc1/hw/octvc1_hw_id_priv.h index e3913a1..009ac3a 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_rc.h b/octvc1/hw/octvc1_hw_rc.h index 7e080cf..03ac203 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_rc_priv.h b/octvc1/hw/octvc1_hw_rc_priv.h index 7f1e0b6..fef1492 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_version.h b/octvc1/hw/octvc1_hw_version.h index 5984725..3e56677 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $ bit[10:0]: Build number
*/
#define cOCTVC1_HW_VERSION_MAJOR 2
-#define cOCTVC1_HW_VERSION_MINOR 3
+#define cOCTVC1_HW_VERSION_MINOR 5
#define cOCTVC1_HW_VERSION_MAINTENANCE 0
-#define cOCTVC1_HW_VERSION_BUILD 560
+#define cOCTVC1_HW_VERSION_BUILD 818
#define cOCTVC1_HW_VERSION_ID ( (cOCTVC1_HW_VERSION_MAJOR << 25) + \
(cOCTVC1_HW_VERSION_MINOR << 18) + \
diff --git a/octvc1/irsc/octvc1_irsc_api.h b/octvc1/irsc/octvc1_irsc_api.h index 1ce250b..5a6d783 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -45,6 +45,7 @@ $Revision: $ #include "../octvc1_radio.h"
#include "../octvc1_api.h"
#include "../octvc1_module.h"
+#include "../octvc1_user_id.h"
#include "../octvc1_tap.h"
#include "octvc1_irsc_id.h"
@@ -79,6 +80,45 @@ $Revision: $ #define cOCTVC1_IRSC_IPC_PORT_STATE_ENUM_READY 4
/*-------------------------------------------------------------------------------------
+ IPC port clone state.
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM tOCT_UINT32
+
+#define cOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_INVALID 0 /* Ipc port not part of IPC clone */
+#define cOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_CLONE 1 /* Ipc port clone of other port */
+#define cOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_ORIGINAL 2 /* Original Ipc port cloned */
+#define cOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_REMOTE 3 /* Remote Ipc port connected to a clone port */
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_IPC_PORT_CLONE
+ Ipc port clone context
+
+ Members:
+ ulCloneState
+ Port Clone State.
+ hProcess
+ When ulCloneState set to CLONE: Process handle of the original port
+ When ulCloneState set to ORIGINAL: Process handle of the clone port
+ When ulCloneState set to REMOTE: Process handle of the original port
+ ulPortId
+ When ulCloneState set to CLONE: IPC port identifier of the original port
+ When ulCloneState set to ORIGINAL: IPC port identifier of the clone port
+ When ulCloneState set to REMOTE: IPC port identifier of the original port
+ ulUserPortId
+ When ulCloneState set to CLONE: IPC port user id of the original port
+ When ulCloneState set to ORIGINAL: IPC port user id of the clone port
+ When ulCloneState set to REMOTE: IPC port user id of the original port
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM ulCloneState;
+ tOCTVC1_HANDLE_OBJECT hProcess;
+ tOCTVC1_SUB_OBJECT_ID ulPortId;
+ tOCT_UINT32 ulUserPortId;
+
+} tOCTVC1_IRSC_IPC_PORT_CLONE;
+
+/*-------------------------------------------------------------------------------------
API related definitions
-------------------------------------------------------------------------------------*/
@@ -180,9 +220,11 @@ typedef struct Members:
ulModuleId
- Current number of process active in this for this module.
+ Module Id.
hProcess
Process handle where Tap is instantiate
+ ulProcessUserId
+ Process user identifier, connect on this interface
ulDirection
ulDataSubType
Data sub type cOCTVOCNET_PKT_SUBTYPE_UNSPECIFIED,
@@ -194,16 +236,38 @@ typedef struct -------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MODULE_ID_ENUM ulModuleId;
- tOCT_UINT32 hProcess;
- tOCTVC1_TAP_DIRECTION_ENUM ulDirection;
- tOCT_UINT32 ulDataSubType;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCT_UINT8 szDescription[(cOCTVC1_IRSC_APPLICATION_TAP_MAX_DESCRIPTION_BYTE_SIZE+1)];/* NOSWAPMAC */
+ tOCT_UINT32 ulModuleId;
+ tOCTVC1_HANDLE_OBJECT hProcess;
+ tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
+ tOCTVC1_TAP_DIRECTION_ENUM ulDirection;
+ tOCT_UINT32 ulDataSubType;
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+ tOCT_INT8 szDescription[(cOCTVC1_IRSC_APPLICATION_TAP_MAX_DESCRIPTION_BYTE_SIZE+1)];/* NOSWAPMAC */
} 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
@@ -212,12 +276,14 @@ typedef struct Default: cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_DISABLE
ulFilterIndex
ulUserId
+ Stream
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM ulState;
tOCTVC1_INDEX ulFilterIndex;
tOCT_UINT32 ulUserId;
+ tOCTVC1_IRSC_STREAM_STATS Stream;
} tOCTVC1_IRSC_APPLICATION_TAP_STATS;
@@ -237,6 +303,10 @@ typedef struct Default: cOCTVC1_INDEX_INVALID
ulUserId
Default: 0
+ ulRetryEnableFlag
+ 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.
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -244,9 +314,148 @@ typedef struct tOCT_UINT32 ulMaxTransportDataSize;
tOCTVC1_INDEX ulFilterIndex;
tOCT_UINT32 ulUserId;
+ tOCT_BOOL32 ulRetryEnableFlag;
} tOCTVC1_IRSC_APPLICATION_TAP_START;
+/*-------------------------------------------------------------------------------------
+ IRSC Module Tap Id
+-------------------------------------------------------------------------------------*/
+#define cOCTVC1_IRSC_TAP_TX_LOG ((0x0000)|(cOCTVC1_TAP_DIRECTION_ENUM_TX<<cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET)|(cOCTVC1_MODULE_APPLICATION_ID_MAIN_SYSTEM<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET))
+
+/*-------------------------------------------------------------------------------------
+ IRSC Router
+-------------------------------------------------------------------------------------*/
+#define cOCTVC1_IRSC_ROUTER_MAX_INTERFACE 24
+
+/*-------------------------------------------------------------------------------------
+ Interface type.
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM tOCT_UINT32
+
+#define cOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_UNUSE 0
+#define cOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_LOCAL 1
+#define cOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_REMOTE 2
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_ROUTER_INTERFACE_INFO
+ Router interface info
+
+ Members:
+ ulInterfaceIndex
+ Router interface index
+ ulProcessUserId
+ Process user identifier, connect on this interface
+ ulType
+ Process user identifier
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_INDEX ulInterfaceIndex;
+ tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
+ tOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM ulType;
+
+} tOCTVC1_IRSC_ROUTER_INTERFACE_INFO;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_ROUTER_INTERFACE_STATS
+ Router interface stats
+
+ Members:
+ ulInterfaceIndex
+ Router interface index
+ ulProcessUserId
+ Process user identifier, connect on this interface
+ ulSentPktCnt
+ Number of packet sent to ulProcessUserId
+ ulRecvPktCnt
+ Number of packet receive from ulProcessUserId
+ ulErrSentPktCnt
+ Number error when trying to sent to ulProcessUserId
+ ulErrRecvPktCnt
+ Number error when trying to receive from ulProcessUserId
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_INDEX ulInterfaceIndex;
+ tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
+ tOCT_UINT32 ulSentPktCnt;
+ tOCT_UINT32 ulRecvPktCnt;
+ tOCT_UINT32 ulErrSentPktCnt;
+ tOCT_UINT32 ulErrRecvPktCnt;
+
+} tOCTVC1_IRSC_ROUTER_INTERFACE_STATS;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_ROUTER_INFO
+ Router interface stats
+
+ Members:
+ ulProcessUserId
+ Process user identifier where router is instanciated
+ ulSafeModeFlag
+ Indication if router is in safe mode or not
+ ulInterfaceMaxNum
+ Maximun number of interface supported by the router
+ ulInterfaceNum
+ Number of interface between router and process
+ aInterfaceInfo
+ Session event Info
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
+ tOCT_BOOL32 ulSafeModeFlag;
+ tOCT_UINT32 ulInterfaceMaxNum;
+ tOCT_UINT32 ulInterfaceNum;
+ tOCTVC1_IRSC_ROUTER_INTERFACE_INFO aInterfaceInfo[cOCTVC1_IRSC_ROUTER_MAX_INTERFACE];
+
+} tOCTVC1_IRSC_ROUTER_INFO;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_ROUTER_STATS
+ Router interface stats
+
+ Members:
+ ulInterfaceTotalSentPktCnt
+ Total packet sent to Interface (router-> process)
+ ulInterfaceTotalRecvPktCnt
+ Total packet receive from Interface (process -> router )
+ ulInterfaceTotalErrSentPktCnt
+ Total error when trying to packet (router-> process)
+ ulInterfaceTotalErrRecvPktCnt
+ Total error when trying to receive packet (process -> router )
+ ulTotalSentPktCnt
+ Total packet sent to external
+ ulTotalRecvPktCnt
+ Total packet receive from external
+ ulSentEvtPktCnt
+ Number of event sent by router
+ ulModuleDataTotalRecvPktCnt
+ Total module_data packet receive from external
+ ulModuleDataTotalSentPktCnt
+ Total module_data packet sent to external
+ ulInterfaceNum
+ Number of interface between router and process
+ aInterfaceStats
+ Session event Info
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCT_UINT32 ulInterfaceTotalSentPktCnt;
+ tOCT_UINT32 ulInterfaceTotalRecvPktCnt;
+ tOCT_UINT32 ulInterfaceTotalErrSentPktCnt;
+ tOCT_UINT32 ulInterfaceTotalErrRecvPktCnt;
+ tOCT_UINT32 ulTotalSentPktCnt;
+ tOCT_UINT32 ulTotalRecvPktCnt;
+ tOCT_UINT32 ulSentEvtPktCnt;
+ tOCT_UINT32 ulModuleDataTotalRecvPktCnt;
+ tOCT_UINT32 ulModuleDataTotalSentPktCnt;
+ tOCT_UINT32 ulInterfaceNum;
+ tOCTVC1_IRSC_ROUTER_INTERFACE_STATS aInterfaceStats[cOCTVC1_IRSC_ROUTER_MAX_INTERFACE];
+
+} tOCTVC1_IRSC_ROUTER_STATS;
+
/***************************** METHODS *************************************/
/*-------------------------------------------------------------------------------------
tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD
@@ -261,8 +470,8 @@ typedef struct -------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 hProcess;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hProcess;
} tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD;
@@ -273,20 +482,23 @@ typedef struct Header
OCTVC1 Message Header
hProcess
+ ulUserId
+ Process user identifier
szName
Process Name.
szProcessImageName
Process file name.
- ulType
- Process Type.
+ ulModuleId
+ Module Id.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 hProcess;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCT_UINT8 szProcessImageName[(cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCTVC1_PROCESS_TYPE_ENUM ulType;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hProcess;
+ tOCTVC1_USER_ID_PROCESS_ENUM ulUserId;
+ 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;
} tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP;
@@ -310,11 +522,11 @@ typedef struct -------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 hProcess;
- tOCT_BOOL32 ulResetProcessStatsFlag;
- tOCT_BOOL32 ulResetIpcStatsFlag;
- tOCT_BOOL32 ulResetTaskStatsFlag;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hProcess;
+ tOCT_BOOL32 ulResetProcessStatsFlag;
+ tOCT_BOOL32 ulResetIpcStatsFlag;
+ tOCT_BOOL32 ulResetTaskStatsFlag;
} tOCTVC1_IRSC_MSG_PROCESS_STATS_CMD;
@@ -327,14 +539,16 @@ typedef struct hProcess
State
Current process state.
+ ulTotalCacheMissCnt
Error
Process Error
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 hProcess;
+ tOCTVC1_HANDLE_OBJECT hProcess;
tOCTVC1_PROCESS_STATE_ENUM State;
+ tOCT_UINT32 ulTotalCacheMissCnt;
tOCTVC1_PROCESS_ERROR Error;
} tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP;
@@ -405,6 +619,8 @@ typedef struct IPC port identifier
ulUserId
IPC port user identifier
+ ulModuleId
+ Module Id.
hRemoteProcess
Remote Process identifier
ulRemotePortId
@@ -419,8 +635,8 @@ typedef struct Process Local Port Idx
ulSystemFlag
System Flag
- ulGhostFlag
- Ghost Flag. Use for internal test.
+ Clone
+ Ipc Port Clone information.
ulRecvMsgNum
Reception array message number.
ulRecvMsgSize
@@ -432,14 +648,15 @@ typedef struct tOCTVC1_HANDLE_OBJECT hProcess;
tOCTVC1_SUB_OBJECT_ID ulPortId;
tOCT_UINT32 ulUserId;
+ tOCT_UINT32 ulModuleId;
tOCTVC1_HANDLE_OBJECT hRemoteProcess;
tOCTVC1_SUB_OBJECT_ID ulRemotePortId;
tOCT_UINT32 ulRemoteUserId;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
tOCT_UINT32 ulPortIdx;
tOCTVC1_IRSC_IPC_PORT_TYPE_ENUM ulType;
tOCT_BOOL32 ulSystemFlag;
- tOCT_BOOL32 ulGhostFlag;
+ tOCTVC1_IRSC_IPC_PORT_CLONE Clone;
tOCT_UINT32 ulRecvMsgNum;
tOCT_UINT32 ulRecvMsgSize;
@@ -562,6 +779,8 @@ typedef struct Process identifier
ulTaskIndex
Task identifier
+ ulModuleId
+ Module Id.
szName
Name given to the task
-------------------------------------------------------------------------------------*/
@@ -570,7 +789,8 @@ typedef struct tOCTVC1_MSG_HEADER Header;
tOCTVC1_HANDLE_OBJECT hProcess;
tOCTVC1_SUB_OBJECT_ID ulTaskIndex;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
+ tOCT_UINT32 ulModuleId;
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
} tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP;
@@ -691,7 +911,7 @@ typedef struct tOCT_UINT32 ulObjType;
tOCT_UINT32 ulMaxNumObj;
tOCT_UINT32 ulObjByteSize;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
} tOCTVC1_IRSC_MSG_OBJMGR_INFO_RSP;
@@ -1260,6 +1480,64 @@ typedef struct } tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP;
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ Info
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_IRSC_ROUTER_INFO Info;
+
+} tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ Stats
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_IRSC_ROUTER_STATS Stats;
+
+} tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP;
+
/*************** 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 da7e38b..4e3cb2c 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -39,6 +39,8 @@ $Revision: $ +
+
/***************************** METHODS *************************************/
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
diff --git a/octvc1/irsc/octvc1_irsc_api_priv_swap.h b/octvc1/irsc/octvc1_irsc_api_priv_swap.h index d36fd0d..29ddfa1 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/irsc/octvc1_irsc_api_swap.h b/octvc1/irsc/octvc1_irsc_api_swap.h index cc44e41..45ef179 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IRSC_API_SWAP_H__
@@ -54,6 +54,29 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_SWAP( pType ){ \
+ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
+#else
+
+#define mOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_IPC_PORT_CLONE_SWAP( _f_pParms ){ tOCTVC1_IRSC_IPC_PORT_CLONE * pOCTVC1_IRSC_IPC_PORT_CLONE = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_IPC_PORT_CLONE)\
+ { mOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_SWAP( &((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulCloneState ); } \
+ ((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->hProcess = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->hProcess); \
+ ((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulPortId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulPortId); \
+ ((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulUserPortId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulUserPortId); \
+}
+#else
+#define mOCTVC1_IRSC_IPC_PORT_CLONE_SWAP( pOCTVC1_IRSC_IPC_PORT_CLONE )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_IRSC_API_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_API_STATS * pOCTVC1_IRSC_API_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_API_STATS)\
((tOCTVC1_IRSC_API_STATS *)pOCTVC1_IRSC_API_STATS)->ulMaxProcessingTimeUs = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_API_STATS *)pOCTVC1_IRSC_API_STATS)->ulMaxProcessingTimeUs); \
@@ -119,9 +142,11 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_IRSC_APPLICATION_TAP_INFO_SWAP( _f_pParms ){ tOCTVC1_IRSC_APPLICATION_TAP_INFO * pOCTVC1_IRSC_APPLICATION_TAP_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_APPLICATION_TAP_INFO)\
- { mOCTVC1_MODULE_ID_ENUM_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulModuleId ); } \
+ ((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulModuleId); \
((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->hProcess); \
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulProcessUserId ); } \
{ mOCTVC1_TAP_DIRECTION_ENUM_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulDirection ); } \
((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulDataSubType = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulDataSubType); \
@@ -131,12 +156,30 @@ 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 ); } \
}
#else
#define mOCTVC1_IRSC_APPLICATION_TAP_STATS_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_STATS )
@@ -151,12 +194,101 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulFilterIndex); \
((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulUserId = \
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); \
}
#else
#define mOCTVC1_IRSC_APPLICATION_TAP_START_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_START )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_SWAP( pType ){ \
+ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
+#else
+
+#define mOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_ROUTER_INTERFACE_INFO_SWAP( _f_pParms ){ tOCTVC1_IRSC_ROUTER_INTERFACE_INFO * pOCTVC1_IRSC_ROUTER_INTERFACE_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)\
+ ((tOCTVC1_IRSC_ROUTER_INTERFACE_INFO *)pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)->ulInterfaceIndex = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_INFO *)pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)->ulInterfaceIndex); \
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_ROUTER_INTERFACE_INFO *)pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)->ulProcessUserId ); } \
+ { mOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_SWAP( &((tOCTVC1_IRSC_ROUTER_INTERFACE_INFO *)pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)->ulType ); } \
+}
+#else
+#define mOCTVC1_IRSC_ROUTER_INTERFACE_INFO_SWAP( pOCTVC1_IRSC_ROUTER_INTERFACE_INFO )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_ROUTER_INTERFACE_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_ROUTER_INTERFACE_STATS * pOCTVC1_IRSC_ROUTER_INTERFACE_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)\
+ ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulInterfaceIndex = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulInterfaceIndex); \
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulProcessUserId ); } \
+ ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulSentPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulSentPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulRecvPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulRecvPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulErrSentPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulErrSentPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulErrRecvPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulErrRecvPktCnt); \
+}
+#else
+#define mOCTVC1_IRSC_ROUTER_INTERFACE_STATS_SWAP( pOCTVC1_IRSC_ROUTER_INTERFACE_STATS )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_ROUTER_INFO_SWAP( _f_pParms ){ tOCTVC1_IRSC_ROUTER_INFO * pOCTVC1_IRSC_ROUTER_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_ROUTER_INFO)\
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulProcessUserId ); } \
+ ((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulSafeModeFlag = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulSafeModeFlag); \
+ ((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulInterfaceMaxNum = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulInterfaceMaxNum); \
+ ((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulInterfaceNum = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulInterfaceNum); \
+ { tOCT_UINT32 jOCTVC1_IRSC_ROUTER_INFO; \
+ for( jOCTVC1_IRSC_ROUTER_INFO=0; \
+ jOCTVC1_IRSC_ROUTER_INFO<(cOCTVC1_IRSC_ROUTER_MAX_INTERFACE);jOCTVC1_IRSC_ROUTER_INFO++ ) \
+ { mOCTVC1_IRSC_ROUTER_INTERFACE_INFO_SWAP( &((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->aInterfaceInfo[jOCTVC1_IRSC_ROUTER_INFO] ); }} \
+}
+#else
+#define mOCTVC1_IRSC_ROUTER_INFO_SWAP( pOCTVC1_IRSC_ROUTER_INFO )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_ROUTER_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_ROUTER_STATS * pOCTVC1_IRSC_ROUTER_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_ROUTER_STATS)\
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalSentPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalSentPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalRecvPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalRecvPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalErrSentPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalErrSentPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalErrRecvPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalErrRecvPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulTotalSentPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulTotalSentPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulTotalRecvPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulTotalRecvPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulSentEvtPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulSentEvtPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulModuleDataTotalRecvPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulModuleDataTotalRecvPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulModuleDataTotalSentPktCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulModuleDataTotalSentPktCnt); \
+ ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceNum = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceNum); \
+ { tOCT_UINT32 jOCTVC1_IRSC_ROUTER_STATS; \
+ for( jOCTVC1_IRSC_ROUTER_STATS=0; \
+ jOCTVC1_IRSC_ROUTER_STATS<(cOCTVC1_IRSC_ROUTER_MAX_INTERFACE);jOCTVC1_IRSC_ROUTER_STATS++ ) \
+ { mOCTVC1_IRSC_ROUTER_INTERFACE_STATS_SWAP( &((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->aInterfaceStats[jOCTVC1_IRSC_ROUTER_STATS] ); }} \
+}
+#else
+#define mOCTVC1_IRSC_ROUTER_STATS_SWAP( pOCTVC1_IRSC_ROUTER_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 = \
@@ -171,7 +303,9 @@ extern "C" { { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->Header ); } \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->hProcess); \
- { mOCTVC1_PROCESS_TYPE_ENUM_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulType ); } \
+ { 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); \
}
#else
#define mOCTVC1_IRSC_MSG_PROCESS_INFO_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP )
@@ -199,6 +333,8 @@ extern "C" { ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->hProcess); \
{ 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); \
{ mOCTVC1_PROCESS_ERROR_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->Error ); } \
}
#else
@@ -245,6 +381,8 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulPortId); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulUserId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulUserId); \
+ ((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulModuleId); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->hRemoteProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->hRemoteProcess); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulRemotePortId = \
@@ -256,8 +394,7 @@ extern "C" { { mOCTVC1_IRSC_IPC_PORT_TYPE_ENUM_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulType ); } \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulSystemFlag = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulSystemFlag); \
- ((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulGhostFlag = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulGhostFlag); \
+ { mOCTVC1_IRSC_IPC_PORT_CLONE_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->Clone ); } \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulRecvMsgNum = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulRecvMsgNum); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulRecvMsgSize = \
@@ -338,6 +475,8 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->hProcess); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->ulTaskIndex = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->ulTaskIndex); \
+ ((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->ulModuleId); \
}
#else
#define mOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP )
@@ -741,6 +880,40 @@ extern "C" { #define mOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_MSG_ROUTER_INFO_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD * pOCTVC1_IRSC_MSG_ROUTER_INFO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_INFO_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD *)pOCTVC1_IRSC_MSG_ROUTER_INFO_CMD)->Header ); } \
+}
+#else
+#define mOCTVC1_IRSC_MSG_ROUTER_INFO_CMD_SWAP( pOCTVC1_IRSC_MSG_ROUTER_INFO_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_MSG_ROUTER_INFO_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP * pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP)->Header ); } \
+ { mOCTVC1_IRSC_ROUTER_INFO_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP)->Info ); } \
+}
+#else
+#define mOCTVC1_IRSC_MSG_ROUTER_INFO_RSP_SWAP( pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_MSG_ROUTER_STATS_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD * pOCTVC1_IRSC_MSG_ROUTER_STATS_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_STATS_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD *)pOCTVC1_IRSC_MSG_ROUTER_STATS_CMD)->Header ); } \
+}
+#else
+#define mOCTVC1_IRSC_MSG_ROUTER_STATS_CMD_SWAP( pOCTVC1_IRSC_MSG_ROUTER_STATS_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IRSC_MSG_ROUTER_STATS_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP * pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP *)pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP)->Header ); } \
+ { mOCTVC1_IRSC_ROUTER_STATS_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP *)pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP)->Stats ); } \
+}
+#else
+#define mOCTVC1_IRSC_MSG_ROUTER_STATS_RSP_SWAP( pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
#ifdef __cplusplus
}
diff --git a/octvc1/irsc/octvc1_irsc_base.h b/octvc1/irsc/octvc1_irsc_base.h index f6e3a88..6faaa22 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_default.h b/octvc1/irsc/octvc1_irsc_default.h index 174c2be..5fc061a 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -830,7 +830,8 @@ const tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD buf_tOCTVC1_IRSC_MSG_APPLICATIO cOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_STREAM, /* ulMode */
cOCTVC1_IRSC_APPLICATION_TRANSPORT_MAX_DATA_SIZE, /* ulMaxTransportDataSize */
cOCTVC1_INDEX_INVALID, /* ulFilterIndex */
- 0 /* ulUserId */
+ 0, /* ulUserId */
+ cOCT_FALSE /* ulRetryEnableFlag */
}
};
@@ -878,5 +879,65 @@ extern const tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD *g_pOctDef_tOCTVC1_IRSC_M }
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD buf_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_ROUTER_INFO_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_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD =
+ &buf_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_ROUTER_INFO_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD buf_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_IRSC_MSG_ROUTER_STATS_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_STATS_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD =
+ &buf_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_IRSC_MSG_ROUTER_STATS_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD; \
+ }
+
+
#endif /* __OCTVC1_IRSC_DEFAULT_H__ */
diff --git a/octvc1/irsc/octvc1_irsc_default_priv.h b/octvc1/irsc/octvc1_irsc_default_priv.h index d223e5d..2603008 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_evt.h b/octvc1/irsc/octvc1_irsc_evt.h index 8e9ed06..98dc341 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -44,10 +44,39 @@ $Octasic_Revision: $ typedef struct
{
tOCTVC1_EVENT_HEADER Header;
- tOCT_UINT32 hProcess;
+ tOCTVC1_HANDLE_OBJECT hProcess;
} 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 fad7dce..5208613 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_evt_priv_swap.h b/octvc1/irsc/octvc1_irsc_evt_priv_swap.h index 8362135..06ecd0e 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/irsc/octvc1_irsc_evt_swap.h b/octvc1/irsc/octvc1_irsc_evt_swap.h index b4f9de7..0adadbe 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IRSC_EVT_SWAP_H__
@@ -45,6 +45,24 @@ 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 1b79f0c..9298020 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -61,15 +61,18 @@ $Octasic_Revision: $ #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_CID_MAX (( 0x01a + 1 ) & 0xFFF)
+#define cOCTVC1_IRSC_CID_MAX (( 0x01c + 1 ) & 0xFFF)
/****************************************************************************
Event IDs
****************************************************************************/
-#define cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID ( 0x0001 + cOCTVC1_IRSC_EID_BASE )
+#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_EID_MAX (( 0x0001 + 1 ) & 0xFFFF)
+#define cOCTVC1_IRSC_EID_MAX (( 0x0002 + 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 4eb712c..932169c 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_rc.h b/octvc1/irsc/octvc1_irsc_rc.h index 42fe128..304e54f 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -49,6 +49,13 @@ $Octasic_Revision: $ #define cOCTVC1_IRSC_RC_OBJMGR_NOT_INIT ( 0x0004 + cOCTVC1_IRSC_OBJMGR_RC_BASE )
/****************************************************************************
+ ROUTER return codes
+ ****************************************************************************/
+#define cOCTVC1_IRSC_ROUTER_RC_BASE ( 0x0460 + cOCTVC1_IRSC_RC_BASE )
+
+#define cOCTVC1_IRSC_RC_ROUTER_ROUTER_IF_INVALID ( 0x0001 + cOCTVC1_IRSC_ROUTER_RC_BASE )
+
+/****************************************************************************
API_COMMAND return codes
****************************************************************************/
#define cOCTVC1_IRSC_API_COMMAND_RC_BASE ( 0x0550 + cOCTVC1_IRSC_RC_BASE )
diff --git a/octvc1/irsc/octvc1_irsc_rc_priv.h b/octvc1/irsc/octvc1_irsc_rc_priv.h index a057a83..e9e897a 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_version.h b/octvc1/irsc/octvc1_irsc_version.h index cd0a94c..efbc33f 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $ bit[10:0]: Build number
*/
#define cOCTVC1_IRSC_VERSION_MAJOR 2
-#define cOCTVC1_IRSC_VERSION_MINOR 3
+#define cOCTVC1_IRSC_VERSION_MINOR 5
#define cOCTVC1_IRSC_VERSION_MAINTENANCE 0
-#define cOCTVC1_IRSC_VERSION_BUILD 560
+#define cOCTVC1_IRSC_VERSION_BUILD 818
#define cOCTVC1_IRSC_VERSION_ID ( (cOCTVC1_IRSC_VERSION_MAJOR << 25) + \
(cOCTVC1_IRSC_VERSION_MINOR << 18) + \
diff --git a/octvc1/main/octvc1_main_api.h b/octvc1/main/octvc1_main_api.h index e1bd55e..d0a720b 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -43,6 +43,7 @@ $Revision: $ #include "../octvc1_process.h"
#include "../octvc1_api.h"
#include "../octvc1_module.h"
+#include "../octvc1_user_id.h"
#include "octvc1_main_id.h"
#include "octvc1_main_rc.h"
@@ -102,12 +103,11 @@ $Revision: $ Application Module information
Members:
- ulModuleId
- Current number of process active in this for this module.
+ ulReserved
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MODULE_ID_ENUM ulModuleId;
+ tOCT_UINT32 ulReserved;
} tOCTVC1_MAIN_APPLICATION_MODULE_INFO;
@@ -117,17 +117,33 @@ typedef struct Members:
ulState
- Current number of process active in this for this module.
ulConfigState
- Current number of process active in this for this module.
- ulProcessNum
- Current number of process active in this for this module.
+ ulProcessCnt
+ Current number of process active in this module.
+ ulIpcLinkCnt
+ Current number IPC Link.
+ ulIpcLinkErrCnt
+ Number IPC Link open with error.
+ ulStartTotalCnt
+ Total Count of start attempt.
+ ulStartErrCnt
+ Count of start with error.
+ ulStopTotalCnt
+ Total Count of stop attempt.
+ ulStopErrCnt
+ Count of stop with error.
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM ulState;
tOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM ulConfigState;
- tOCT_UINT32 ulProcessNum;
+ tOCT_UINT32 ulProcessCnt;
+ tOCT_UINT32 ulIpcLinkCnt;
+ tOCT_UINT32 ulIpcLinkErrCnt;
+ tOCT_UINT32 ulStartTotalCnt;
+ tOCT_UINT32 ulStartErrCnt;
+ tOCT_UINT32 ulStopTotalCnt;
+ tOCT_UINT32 ulStopErrCnt;
} tOCTVC1_MAIN_APPLICATION_MODULE_STATS;
@@ -194,7 +210,7 @@ typedef struct -------------------------------------------------------------------------------------*/
typedef struct
{
- tOCT_UINT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
tOCTVC1_OBJECT_CURSOR_ENUM ulGetMode;
} tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR;
@@ -208,6 +224,32 @@ typedef struct #define cOCTVC1_MAIN_FILE_OPEN_MODE_MASK_WRITE 0x2
/*-------------------------------------------------------------------------------------
+ Stream related definitions
+-------------------------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------------------------------
+ Stream state.
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_MAIN_STREAM_STATE_ENUM tOCT_UINT32
+
+#define cOCTVC1_MAIN_STREAM_STATE_ENUM_STOP 0
+#define cOCTVC1_MAIN_STREAM_STATE_ENUM_START 1
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_STREAM_INFO
+
+ Members:
+ hLogicalObj
+ ulState
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_HANDLE_OBJECT hLogicalObj;
+ tOCTVC1_MAIN_STREAM_STATE_ENUM ulState;
+
+} tOCTVC1_MAIN_STREAM_INFO;
+
+/*-------------------------------------------------------------------------------------
LOG related sections.
-------------------------------------------------------------------------------------*/
@@ -220,6 +262,7 @@ typedef struct #define cOCTVC1_MAIN_LOG_TRACE_STATE_ENUM_START 1
#define cOCTVC1_MAIN_LOG_MAX_NUM_FILES 32 /* Maximum total number of log files that can be logged to */
#define cOCTVC1_MAIN_LOG_FILE_PREFIX_MAX_LENGTH (cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH-2) /* Maximum length of the prefix of the log filename */
+#define cOCTVC1_MAIN_LOG_TRACE_FILTER_PROCESS_ENTRY_MAX 8 /* Max number of process entry in log trace filter */
/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_LOG_TRACE_STATS
@@ -249,7 +292,7 @@ typedef struct tOCT_UINT32 ulFileOverwriteCnt;
tOCT_UINT32 ulNumFiles;
tOCT_UINT8 abyFileIndexes[cOCTVC1_MAIN_LOG_MAX_NUM_FILES];
- tOCT_UINT8 szFileNamePrefix[cOCTVC1_MAIN_LOG_FILE_PREFIX_MAX_LENGTH];
+ tOCT_INT8 szFileNamePrefix[cOCTVC1_MAIN_LOG_FILE_PREFIX_MAX_LENGTH];
} tOCTVC1_MAIN_LOG_TRACE_STATS;
@@ -270,10 +313,35 @@ typedef struct {
tOCT_UINT32 ulMaxFileSize;
tOCT_UINT32 ulMaxNumFiles;
- tOCT_UINT8 szFileNamePrefix[cOCTVC1_MAIN_LOG_FILE_PREFIX_MAX_LENGTH];
+ tOCT_INT8 szFileNamePrefix[cOCTVC1_MAIN_LOG_FILE_PREFIX_MAX_LENGTH];
} tOCTVC1_MAIN_LOG_TRACE_INFO;
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_LOG_TRACE_FILTER
+
+ Members:
+ ulTraceProcessAllFlag
+ Default: cOCT_TRUE
+ When set to cOCT_TRUE, the trace will be started for all process
+ When set to cOCT_FALSE, the trace will be started only for specified process
+ aTraceProcessUserId
+ Default: cOCTVC1_USER_ID_PROCESS_ENUM_INVALID
+ Process User ID to start trace.
+ Only used, if ulTraceProcessAllFlag set to cOCT_FALSE
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCT_BOOL32 ulTraceProcessAllFlag;
+ tOCTVC1_USER_ID_PROCESS_ENUM aTraceProcessUserId[cOCTVC1_MAIN_LOG_TRACE_FILTER_PROCESS_ENTRY_MAX];
+
+} tOCTVC1_MAIN_LOG_TRACE_FILTER;
+
+/*-------------------------------------------------------------------------------------
+ Main Module Data Definitions
+-------------------------------------------------------------------------------------*/
+#define cOCTVC1_MAIN_MODULE_DATA_IPC ((0x0001)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_MODULE_ID_BIT_OFFSET))
+
/***************************** METHODS *************************************/
/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_TARGET_RESET_CMD
@@ -329,7 +397,7 @@ typedef struct {
tOCTVC1_MSG_HEADER Header;
tOCTDEV_DEVICES_TYPE_ENUM ulTargetType;
- tOCT_UINT8 abyTargetInfo[cOCTVC1_MAIN_TARGET_MAX_INFO_BYTE_SIZE];
+ tOCT_INT8 abyTargetInfo[cOCTVC1_MAIN_TARGET_MAX_INFO_BYTE_SIZE];
tOCT_UINT8 abyUserInfo[cOCTVC1_MAIN_USER_MAX_INFO_BYTE_SIZE];
} tOCTVC1_MAIN_MSG_TARGET_INFO_RSP;
@@ -471,14 +539,17 @@ typedef struct ulFileNumber
Default: 4
The maximum number of files for tracing
+ Filter
+ Trace Filter
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_BOOL32 ulFullAutoStopFlag;
- tOCTVC1_LOG_TRACE_MASK ulTraceMask;
- tOCT_UINT32 ulFileSize;
- tOCT_UINT32 ulFileNumber;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_BOOL32 ulFullAutoStopFlag;
+ tOCTVC1_LOG_TRACE_MASK ulTraceMask;
+ tOCT_UINT32 ulFileSize;
+ tOCT_UINT32 ulFileNumber;
+ tOCTVC1_MAIN_LOG_TRACE_FILTER Filter;
} tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD;
@@ -574,6 +645,8 @@ typedef struct The tracing masks that are currently active
TraceStats
Trace stats structure
+ Filter
+ Trace Filter
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -582,6 +655,7 @@ typedef struct tOCT_UINT32 ulFullAutoStopFlag;
tOCTVC1_LOG_TRACE_MASK ulTraceMask;
tOCTVC1_MAIN_LOG_TRACE_STATS TraceStats;
+ tOCTVC1_MAIN_LOG_TRACE_FILTER Filter;
} tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP;
@@ -638,7 +712,7 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
tOCTVC1_MAIN_FILE_OPEN_MODE_MASK ulAccessMode;
} tOCTVC1_MAIN_MSG_FILE_OPEN_CMD;
@@ -699,7 +773,7 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD;
@@ -715,7 +789,7 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP;
@@ -824,7 +898,7 @@ typedef struct {
tOCTVC1_MSG_HEADER Header;
tOCTVC1_HANDLE_OBJECT hFile;
- tOCT_UINT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
tOCTVC1_MAIN_FILE_OPEN_MODE_MASK ulAccessMode;
tOCT_UINT32 ulMinAlignBytes;
@@ -967,16 +1041,19 @@ typedef struct Process Name.
szProcessImageName
Process file name.
- ulType
- Process Type.
+ ulModuleId
+ Module Id.
+ ulUserId
+ Process user identifier
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 hProcess;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCT_UINT8 szProcessImageName[(cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCTVC1_PROCESS_TYPE_ENUM ulType;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 hProcess;
+ 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;
+ tOCTVC1_USER_ID_PROCESS_ENUM ulUserId;
} tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP;
@@ -1426,33 +1503,6 @@ typedef struct } tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_RSP;
/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_START_CMD
- This command starts the application.
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_MAIN_MSG_APPLICATION_START_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_START_RSP
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_MAIN_MSG_APPLICATION_START_RSP;
-
-/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD
This command stops the application.
@@ -1462,6 +1512,7 @@ typedef struct ulQuit
Whether the app should quit after stopping. If set to cOCT_TRUE,
the app will quit after stopping.
+ If set to cOCT_FALSE, the app will stop all but 'system' modules.
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -1476,10 +1527,16 @@ typedef struct Members:
Header
OCTVC1 Message Header
+ ulModuleStopCnt
+ Number of module stopped.
+ ulModuleStopErrCnt
+ Number of module not stopped cause of errors.
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 ulModuleStopCnt;
+ tOCT_UINT32 ulModuleStopErrCnt;
} tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP;
@@ -1514,9 +1571,9 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szName[(cOCTVC1_MAIN_APPLICATION_MAX_NAME_LENGTH+1)];
- tOCT_UINT8 szDescription[(cOCTVC1_MAIN_APPLICATION_MAX_DESCRIPTION_LENGTH+1)];
- tOCT_UINT8 szVersion[(cOCTVC1_MAIN_APPLICATION_MAX_VERSION_LENGTH+1)];
+ tOCT_INT8 szName[(cOCTVC1_MAIN_APPLICATION_MAX_NAME_LENGTH+1)];
+ tOCT_INT8 szDescription[(cOCTVC1_MAIN_APPLICATION_MAX_DESCRIPTION_LENGTH+1)];
+ tOCT_INT8 szVersion[(cOCTVC1_MAIN_APPLICATION_MAX_VERSION_LENGTH+1)];
tOCT_UINT8 abyInfo[cOCTVC1_MAIN_APPLICATION_MAX_INFO_BYTE_SIZE];
} tOCTVC1_MAIN_MSG_APPLICATION_INFO_RSP;
@@ -1548,8 +1605,8 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szPlatform[(cOCTVC1_MAIN_APPLICATION_SYSTEM_MAX_PLATFORM_LENGTH+1)];
- tOCT_UINT8 szVersion[cOCTVC1_MAIN_APPLICATION_SYSTEM_MAX_VERSION_LENGTH];
+ tOCT_INT8 szPlatform[(cOCTVC1_MAIN_APPLICATION_SYSTEM_MAX_PLATFORM_LENGTH+1)];
+ tOCT_INT8 szVersion[cOCTVC1_MAIN_APPLICATION_SYSTEM_MAX_VERSION_LENGTH];
} tOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_RSP;
@@ -1595,12 +1652,12 @@ typedef struct Members:
Header
OCTVC1 Message Header
- hModule
+ ulModuleId
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hModule;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 ulModuleId;
} tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD;
@@ -1610,7 +1667,7 @@ typedef struct Members:
Header
OCTVC1 Message Header
- hModule
+ ulModuleId
szName
Module Name.
Info
@@ -1619,8 +1676,8 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hModule;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+ tOCT_UINT32 ulModuleId;
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
tOCTVC1_MAIN_APPLICATION_MODULE_INFO Info;
} tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP;
@@ -1631,16 +1688,16 @@ typedef struct Members:
Header
OCTVC1 Message Header
- hModule
+ ulModuleId
ulResetStatsFlag
Default: cOCT_FALSE
Statistics counters will be reset to zero after the current values are returned.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hModule;
- tOCT_BOOL32 ulResetStatsFlag;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 ulModuleId;
+ tOCT_BOOL32 ulResetStatsFlag;
} tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD;
@@ -1650,14 +1707,14 @@ typedef struct Members:
Header
OCTVC1 Message Header
- hModule
+ ulModuleId
Stats
Module stats
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hModule;
+ tOCT_UINT32 ulModuleId;
tOCTVC1_MAIN_APPLICATION_MODULE_STATS Stats;
} tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP;
@@ -1676,7 +1733,7 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
tOCT_UINT32 ulMaxFilesize;
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD;
@@ -1693,10 +1750,167 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP;
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ Info
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_MAIN_STREAM_INFO Info;
+
+} tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD
+ This command starts the module.
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ ulModuleId
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 ulModuleId;
+
+} tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ ulModuleId
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 ulModuleId;
+
+} tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD
+ This command stops the module.
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ ulModuleId
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 ulModuleId;
+
+} tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+ ulModuleId
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 ulModuleId;
+
+} tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP;
+
+
+/***************************** MODULE_DATA *************************************/
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_DATA_MDA
+
+ Members:
+ ModuleData
+ OCTVC1 Module Data
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MODULE_DATA ModuleData;
+
+} tOCTVC1_MAIN_MSG_LOG_DATA_MDA;
+
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_main_evt.h"
diff --git a/octvc1/main/octvc1_main_api_priv.h b/octvc1/main/octvc1_main_api_priv.h index 4aa8175..cede304 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -45,8 +45,12 @@ $Revision: $ +
+
/***************************** METHODS *************************************/
+/***************************** MODULE_DATA *************************************/
+
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_main_evt_priv.h"
diff --git a/octvc1/main/octvc1_main_api_priv_swap.h b/octvc1/main/octvc1_main_api_priv_swap.h index 453fe68..0c96518 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/main/octvc1_main_api_swap.h b/octvc1/main/octvc1_main_api_swap.h index 903dae8..a43dd50 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MAIN_API_SWAP_H__
@@ -64,7 +64,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_APPLICATION_MODULE_INFO_SWAP( _f_pParms ){ tOCTVC1_MAIN_APPLICATION_MODULE_INFO * pOCTVC1_MAIN_APPLICATION_MODULE_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_APPLICATION_MODULE_INFO)\
- { mOCTVC1_MODULE_ID_ENUM_SWAP( &((tOCTVC1_MAIN_APPLICATION_MODULE_INFO *)pOCTVC1_MAIN_APPLICATION_MODULE_INFO)->ulModuleId ); } \
+ ((tOCTVC1_MAIN_APPLICATION_MODULE_INFO *)pOCTVC1_MAIN_APPLICATION_MODULE_INFO)->ulReserved = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_INFO *)pOCTVC1_MAIN_APPLICATION_MODULE_INFO)->ulReserved); \
}
#else
#define mOCTVC1_MAIN_APPLICATION_MODULE_INFO_SWAP( pOCTVC1_MAIN_APPLICATION_MODULE_INFO )
@@ -74,8 +75,20 @@ extern "C" { #define mOCTVC1_MAIN_APPLICATION_MODULE_STATS_SWAP( _f_pParms ){ tOCTVC1_MAIN_APPLICATION_MODULE_STATS * pOCTVC1_MAIN_APPLICATION_MODULE_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_APPLICATION_MODULE_STATS)\
{ mOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_SWAP( &((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulState ); } \
{ mOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_SWAP( &((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulConfigState ); } \
- ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulProcessNum = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulProcessNum); \
+ ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulProcessCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulProcessCnt); \
+ ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulIpcLinkCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulIpcLinkCnt); \
+ ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulIpcLinkErrCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulIpcLinkErrCnt); \
+ ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStartTotalCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStartTotalCnt); \
+ ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStartErrCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStartErrCnt); \
+ ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStopTotalCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStopTotalCnt); \
+ ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStopErrCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStopErrCnt); \
}
#else
#define mOCTVC1_MAIN_APPLICATION_MODULE_STATS_SWAP( pOCTVC1_MAIN_APPLICATION_MODULE_STATS )
@@ -129,6 +142,25 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_STREAM_STATE_ENUM_SWAP( pType ){ \
+ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
+#else
+
+#define mOCTVC1_MAIN_STREAM_STATE_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_STREAM_INFO_SWAP( _f_pParms ){ tOCTVC1_MAIN_STREAM_INFO * pOCTVC1_MAIN_STREAM_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_STREAM_INFO)\
+ ((tOCTVC1_MAIN_STREAM_INFO *)pOCTVC1_MAIN_STREAM_INFO)->hLogicalObj = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_STREAM_INFO *)pOCTVC1_MAIN_STREAM_INFO)->hLogicalObj); \
+ { mOCTVC1_MAIN_STREAM_STATE_ENUM_SWAP( &((tOCTVC1_MAIN_STREAM_INFO *)pOCTVC1_MAIN_STREAM_INFO)->ulState ); } \
+}
+#else
+#define mOCTVC1_MAIN_STREAM_INFO_SWAP( pOCTVC1_MAIN_STREAM_INFO )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_LOG_TRACE_STATE_ENUM_SWAP( pType ){ \
*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
#else
@@ -164,6 +196,19 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_LOG_TRACE_FILTER_SWAP( _f_pParms ){ tOCTVC1_MAIN_LOG_TRACE_FILTER * pOCTVC1_MAIN_LOG_TRACE_FILTER = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_LOG_TRACE_FILTER)\
+ ((tOCTVC1_MAIN_LOG_TRACE_FILTER *)pOCTVC1_MAIN_LOG_TRACE_FILTER)->ulTraceProcessAllFlag = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_LOG_TRACE_FILTER *)pOCTVC1_MAIN_LOG_TRACE_FILTER)->ulTraceProcessAllFlag); \
+ { tOCT_UINT32 jOCTVC1_MAIN_LOG_TRACE_FILTER; \
+ for( jOCTVC1_MAIN_LOG_TRACE_FILTER=0; \
+ jOCTVC1_MAIN_LOG_TRACE_FILTER<(cOCTVC1_MAIN_LOG_TRACE_FILTER_PROCESS_ENTRY_MAX);jOCTVC1_MAIN_LOG_TRACE_FILTER++ ) \
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_MAIN_LOG_TRACE_FILTER *)pOCTVC1_MAIN_LOG_TRACE_FILTER)->aTraceProcessUserId[jOCTVC1_MAIN_LOG_TRACE_FILTER] ); }} \
+}
+#else
+#define mOCTVC1_MAIN_LOG_TRACE_FILTER_SWAP( pOCTVC1_MAIN_LOG_TRACE_FILTER )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_TARGET_RESET_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_TARGET_RESET_CMD * pOCTVC1_MAIN_MSG_TARGET_RESET_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_TARGET_RESET_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_TARGET_RESET_CMD *)pOCTVC1_MAIN_MSG_TARGET_RESET_CMD)->Header ); } \
}
@@ -276,6 +321,7 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *)pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD)->ulFileSize); \
((tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *)pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD)->ulFileNumber = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *)pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD)->ulFileNumber); \
+ { mOCTVC1_MAIN_LOG_TRACE_FILTER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *)pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD)->Filter ); } \
}
#else
#define mOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD_SWAP( pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD )
@@ -337,6 +383,7 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP *)pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP)->ulFullAutoStopFlag); \
{ mOCTVC1_LOG_TRACE_MASK_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP *)pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP)->ulTraceMask ); } \
{ mOCTVC1_MAIN_LOG_TRACE_STATS_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP *)pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP)->TraceStats ); } \
+ { mOCTVC1_MAIN_LOG_TRACE_FILTER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP *)pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP)->Filter ); } \
}
#else
#define mOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP )
@@ -567,7 +614,9 @@ extern "C" { { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->Header ); } \
((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->hProcess); \
- { mOCTVC1_PROCESS_TYPE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->ulType ); } \
+ ((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->ulModuleId); \
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->ulUserId ); } \
}
#else
#define mOCTVC1_MAIN_MSG_PROCESS_INFO_RSP_SWAP( pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP )
@@ -832,22 +881,6 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_START_CMD * pOCTVC1_MAIN_MSG_APPLICATION_START_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_START_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_START_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_START_CMD)->Header ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_START_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_START_RSP * pOCTVC1_MAIN_MSG_APPLICATION_START_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_START_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_START_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_START_RSP)->Header ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_START_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD * pOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD)->Header ); } \
((tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD)->ulQuit = \
@@ -860,6 +893,10 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP * pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->Header ); } \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->ulModuleStopCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->ulModuleStopCnt); \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->ulModuleStopErrCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->ulModuleStopErrCnt); \
}
#else
#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP )
@@ -919,8 +956,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)->hModule = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)->hModule); \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)->ulModuleId); \
}
#else
#define mOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD )
@@ -929,8 +966,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->hModule = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->hModule); \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->ulModuleId); \
{ mOCTVC1_MAIN_APPLICATION_MODULE_INFO_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->Info ); } \
}
#else
@@ -940,8 +977,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->hModule = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->hModule); \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->ulModuleId); \
((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->ulResetStatsFlag = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->ulResetStatsFlag); \
}
@@ -952,8 +989,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->hModule = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->hModule); \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->ulModuleId); \
{ mOCTVC1_MAIN_APPLICATION_MODULE_STATS_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->Stats ); } \
}
#else
@@ -978,6 +1015,103 @@ extern "C" { #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD * pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD *)pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD)->Header ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD_SWAP( pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP * pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP)->Header ); } \
+ { mOCTVC1_MAIN_STREAM_INFO_SWAP( &((tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP)->Info ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD * pOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD *)pOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD)->Header ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD_SWAP( pOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#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 ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD * pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD *)pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD)->Header ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD_SWAP( pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP * pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP)->Header ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)->Header ); } \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)->ulModuleId); \
+}
+#else
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP)->Header ); } \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP)->ulModuleId); \
+}
+#else
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)->Header ); } \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)->ulModuleId); \
+}
+#else
+#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP)->Header ); } \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP)->ulModuleId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP)->ulModuleId); \
+}
+#else
+#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_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 ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_LOG_DATA_MDA_SWAP( pOCTVC1_MAIN_MSG_LOG_DATA_MDA )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
#ifdef __cplusplus
}
diff --git a/octvc1/main/octvc1_main_base.h b/octvc1/main/octvc1_main_base.h index 96654d0..ef4604c 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -43,6 +43,7 @@ $Octasic_Revision: $ /* Module: MAIN */
#define cOCTVC1_MAIN_CID_BASE ( (cOCTVC1_MAIN_UID << 16) + cOCTVC1_CID_BASE )
#define cOCTVC1_MAIN_EID_BASE ( (cOCTVC1_MAIN_UID << 16) + cOCTVC1_EID_BASE )
+#define cOCTVC1_MAIN_MID_BASE ( (cOCTVC1_MAIN_UID << 24) )
#define cOCTVC1_MAIN_RC_BASE ( (cOCTVC1_MAIN_UID << 16) + cOCTVC1_RC_BASE )
#endif /* __OCTVC1_MAIN_BASE_H__ */
diff --git a/octvc1/main/octvc1_main_default.h b/octvc1/main/octvc1_main_default.h index d4c3c01..6cb5162 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -231,7 +231,20 @@ const tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD buf_tOCTVC1_MAIN_MSG_LOG_START_TRACE_ cOCT_FALSE, /* ulFullAutoStopFlag */
cOCTVC1_LOG_TRACE_MASK_NONE, /* ulTraceMask */
16384, /* ulFileSize */
- 4 /* ulFileNumber */
+ 4, /* ulFileNumber */
+ { /* Filter */
+ cOCT_TRUE, /* ulTraceProcessAllFlag */
+ { /* aTraceProcessUserId */
+ cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[0] */
+ cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[1] */
+ cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[2] */
+ cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[3] */
+ cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[4] */
+ cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[5] */
+ cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[6] */
+ cOCTVC1_USER_ID_PROCESS_ENUM_INVALID /* aTraceProcessUserId[7] */
+ }
+ }
};
const tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD =
@@ -1086,36 +1099,6 @@ extern const tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CMD *g_pOctDef /*--------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_START_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_MAIN_MSG_APPLICATION_START_CMD buf_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_MAIN_MSG_APPLICATION_START_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_MAIN_MSG_APPLICATION_START_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_START_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD =
- &buf_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_MAIN_MSG_APPLICATION_START_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD
----------------------------------------------------------------------------*/
#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
@@ -1255,7 +1238,7 @@ const tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICAT 0, /* ulReturnCode */
0 /* ulUserInfo */
},
- 0 /* hModule */
+ 0 /* ulModuleId */
};
const tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD =
@@ -1286,7 +1269,7 @@ const tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICA 0, /* ulReturnCode */
0 /* ulUserInfo */
},
- 0, /* hModule */
+ 0, /* ulModuleId */
cOCT_FALSE /* ulResetStatsFlag */
};
@@ -1337,5 +1320,187 @@ extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_M }
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD buf_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_LOG_INFO_STREAM_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_LOG_INFO_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD =
+ &buf_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD buf_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_LOG_START_STREAM_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_LOG_START_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD =
+ &buf_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD buf_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_LOG_STOP_STREAM_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_LOG_STOP_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD =
+ &buf_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0 /* ulModuleId */
+};
+
+const tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD =
+ &buf_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ },
+ 0 /* ulModuleId */
+};
+
+const tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD =
+ &buf_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD; \
+ }
+
+
+/***************************** MODULE_DATA *************************************/
+
+/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_LOG_DATA_MDA
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_LOG_DATA_MDA buf_tOCTVC1_MAIN_MSG_LOG_DATA_MDA =
+{
+ { /* ModuleData */
+ (cOCTVC1_MAIN_MSG_LOG_DATA_MID), /* ulModuleDataId */
+ (sizeof(tOCTVC1_MAIN_MSG_LOG_DATA_MDA)), /* ulModuleDataSize */
+ 0, /* hLogicalObj */
+ 0 /* ulTimestamp */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_LOG_DATA_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_DATA_MDA =
+ &buf_tOCTVC1_MAIN_MSG_LOG_DATA_MDA;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_LOG_DATA_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_DATA_MDA;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_LOG_DATA_MDA_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_DATA_MDA; \
+ }
+
+
#endif /* __OCTVC1_MAIN_DEFAULT_H__ */
diff --git a/octvc1/main/octvc1_main_default_priv.h b/octvc1/main/octvc1_main_default_priv.h index b491449..ce006bd 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -34,5 +34,7 @@ $Octasic_Revision: $ /***************************** COMMAND DEFAULT *****************************/
+/***************************** MODULE_DATA *************************************/
+
#endif /* __OCTVC1_MAIN_DEFAULT_PRIV_H__ */
diff --git a/octvc1/main/octvc1_main_evt.h b/octvc1/main/octvc1_main_evt.h index 06f3424..163ee05 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -48,16 +48,16 @@ $Octasic_Revision: $ Members:
Header
hProcess
- ulProcessImageType
- Process Type identifier. Value INVALID means no process running on this core.
+ ulProcessUserId
+ Process User identifier. Value INVALID means no process running on this core.
ulProcessCpuUsagePercent
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_EVENT_HEADER Header;
- tOCT_UINT32 hProcess;
- tOCTVC1_PROCESS_TYPE_ENUM ulProcessImageType;
- tOCT_UINT32 ulProcessCpuUsagePercent;
+ tOCTVC1_EVENT_HEADER Header;
+ tOCT_UINT32 hProcess;
+ tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
+ tOCT_UINT32 ulProcessCpuUsagePercent;
} tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT;
@@ -76,6 +76,28 @@ typedef struct } tOCTVC1_MAIN_MSG_PROCESS_DUMP_EVT;
/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT
+
+ Members:
+ Header
+ OCTVC1 Event Header
+ hProcess
+ Process handle identifier.
+ ulUserId
+ Process user identifier
+ ulState
+ Process new state
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_EVENT_HEADER Header;
+ tOCT_UINT32 hProcess;
+ tOCTVC1_USER_ID_PROCESS_ENUM ulUserId;
+ tOCTVC1_PROCESS_STATE_ENUM ulState;
+
+} tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT;
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT
Members:
@@ -104,7 +126,7 @@ typedef struct {
tOCTVC1_EVENT_HEADER Header;
tOCTVC1_MAIN_APPLICATION_STATE_ENUM ulState;
- tOCT_UINT8 szAppName[(cOCTVC1_MAIN_APPLICATION_MAX_NAME_LENGTH+1)];
+ tOCT_INT8 szAppName[(cOCTVC1_MAIN_APPLICATION_MAX_NAME_LENGTH+1)];
} tOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EVT;
diff --git a/octvc1/main/octvc1_main_evt_priv.h b/octvc1/main/octvc1_main_evt_priv.h index f13a048..2cb134c 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/main/octvc1_main_evt_priv_swap.h b/octvc1/main/octvc1_main_evt_priv_swap.h index eaed04b..94704b9 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/main/octvc1_main_evt_swap.h b/octvc1/main/octvc1_main_evt_swap.h index 24bdb81..d6edd08 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MAIN_EVT_SWAP_H__
@@ -49,7 +49,7 @@ extern "C" { { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->Header ); } \
((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->hProcess); \
- { mOCTVC1_PROCESS_TYPE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->ulProcessImageType ); } \
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->ulProcessUserId ); } \
((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->ulProcessCpuUsagePercent = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->ulProcessCpuUsagePercent); \
}
@@ -68,6 +68,18 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT * pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)\
+ { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->Header ); } \
+ ((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->hProcess = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->hProcess); \
+ { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->ulUserId ); } \
+ { mOCTVC1_PROCESS_STATE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->ulState ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT_SWAP( pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT * pOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT)\
{ mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT *)pOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT)->Header ); } \
((tOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT *)pOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT)->ulSessionIndex = \
diff --git a/octvc1/main/octvc1_main_id.h b/octvc1/main/octvc1_main_id.h index d31edf2..27d7140 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -68,16 +68,20 @@ $Octasic_Revision: $ #define cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID ( 0x023 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID ( 0x024 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID ( 0x025 + cOCTVC1_MAIN_CID_BASE )
-#define cOCTVC1_MAIN_MSG_APPLICATION_START_CID ( 0x026 + cOCTVC1_MAIN_CID_BASE )
-#define cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID ( 0x027 + cOCTVC1_MAIN_CID_BASE )
+#define cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID ( ( 0x027 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
#define cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID ( 0x028 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID ( 0x029 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID ( 0x02a + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID ( 0x02b + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID ( 0x02c + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID ( 0x02d + cOCTVC1_MAIN_CID_BASE )
+#define cOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CID ( 0x02e + cOCTVC1_MAIN_CID_BASE )
+#define cOCTVC1_MAIN_MSG_LOG_START_STREAM_CID ( 0x02f + cOCTVC1_MAIN_CID_BASE )
+#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_CID_MAX (( 0x02d + 1 ) & 0xFFF)
+#define cOCTVC1_MAIN_CID_MAX (( 0x032 + 1 ) & 0xFFF)
/****************************************************************************
Event IDs
@@ -86,8 +90,16 @@ $Octasic_Revision: $ #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_EID_MAX (( 0x0004 + 1 ) & 0xFFFF)
+#define cOCTVC1_MAIN_EID_MAX (( 0x0005 + 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)
#endif /* __OCTVC1_MAIN_ID_H__ */
diff --git a/octvc1/main/octvc1_main_id_priv.h b/octvc1/main/octvc1_main_id_priv.h index 2bf43ec..d56741a 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -40,6 +40,10 @@ $Octasic_Revision: $ Event IDs
****************************************************************************/
+/****************************************************************************
+ Module Data IDs
+ ****************************************************************************/
+
#endif /* __OCTVC1_MAIN_ID_PRIV_H__ */
diff --git a/octvc1/main/octvc1_main_rc.h b/octvc1/main/octvc1_main_rc.h index 4011cdb..5843eb2 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -77,9 +77,12 @@ $Octasic_Revision: $ /****************************************************************************
APPLICATION return codes
****************************************************************************/
-#define cOCTVC1_MAIN_APPLICATION_RC_BASE ( 0x0350 + cOCTVC1_MAIN_RC_BASE )
+#define cOCTVC1_MAIN_APPLICATION_RC_BASE ( 0x0350 + cOCTVC1_MAIN_RC_BASE )
-#define cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START ( 0x0001 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
+#define cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START ( 0x0001 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
+#define cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_START ( 0x0002 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
+#define cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_STOP ( 0x0003 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
+#define cOCTVC1_MAIN_RC_APPLICATION_MODULE_MAIN_CANNOT_BE_STOP ( 0x0004 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
/****************************************************************************
CPU_USAGE return codes
@@ -109,6 +112,8 @@ $Octasic_Revision: $ #define cOCTVC1_MAIN_RC_LOG_INTERNAL_ERROR ( 0x0003 + cOCTVC1_MAIN_LOG_RC_BASE )
#define cOCTVC1_MAIN_RC_LOG_TRACE_ALREADY_START ( 0x0004 + cOCTVC1_MAIN_LOG_RC_BASE )
#define cOCTVC1_MAIN_RC_LOG_TRACE_NOT_START ( 0x0005 + cOCTVC1_MAIN_LOG_RC_BASE )
+#define cOCTVC1_MAIN_RC_LOG_TRACE_MASK_INVALID ( 0x0006 + cOCTVC1_MAIN_LOG_RC_BASE )
+#define cOCTVC1_MAIN_RC_LOG_TRACE_FILTER_PROCESS_EMPTY ( 0x0007 + cOCTVC1_MAIN_LOG_RC_BASE )
/****************************************************************************
Validate return codes
diff --git a/octvc1/main/octvc1_main_rc_priv.h b/octvc1/main/octvc1_main_rc_priv.h index 93f6369..b5987d3 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/main/octvc1_main_version.h b/octvc1/main/octvc1_main_version.h index d20b44b..597d745 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $ bit[10:0]: Build number
*/
#define cOCTVC1_MAIN_VERSION_MAJOR 2
-#define cOCTVC1_MAIN_VERSION_MINOR 3
+#define cOCTVC1_MAIN_VERSION_MINOR 5
#define cOCTVC1_MAIN_VERSION_MAINTENANCE 0
-#define cOCTVC1_MAIN_VERSION_BUILD 560
+#define cOCTVC1_MAIN_VERSION_BUILD 818
#define cOCTVC1_MAIN_VERSION_ID ( (cOCTVC1_MAIN_VERSION_MAJOR << 25) + \
(cOCTVC1_MAIN_VERSION_MINOR << 18) + \
diff --git a/octvc1/octvc1_api.h b/octvc1/octvc1_api.h index 7d821b3..cda39b9 100644 --- a/octvc1/octvc1_api.h +++ b/octvc1/octvc1_api.h @@ -2,7 +2,7 @@ File: OCTVC1_API.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_api_swap.h b/octvc1/octvc1_api_swap.h index 5e878e8..af439b0 100644 --- a/octvc1/octvc1_api_swap.h +++ b/octvc1/octvc1_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_api_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_API_SWAP_H__
diff --git a/octvc1/octvc1_app.h b/octvc1/octvc1_app.h index ed60705..83eb168 100644 --- a/octvc1/octvc1_app.h +++ b/octvc1/octvc1_app.h @@ -2,7 +2,7 @@ File: OCTVC1_APP.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$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 3
+#define cOCTVC1_APP_VERSION_MINOR 5
#define cOCTVC1_APP_VERSION_MAINTENANCE 0
-#define cOCTVC1_APP_VERSION_BUILD 560
+#define cOCTVC1_APP_VERSION_BUILD 818
#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 7c14171..eaf25d8 100644 --- a/octvc1/octvc1_base.h +++ b/octvc1/octvc1_base.h @@ -2,7 +2,7 @@ File: OCTVC1_BASE.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -55,8 +55,8 @@ $Octasic_Revision: $ Module unique identifiers
****************************************************************************/
#define cOCTVC1_GENERIC_UID ( 0x00 )
-#define cOCTVC1_PKT_API_UID ( 0x02 )
#define cOCTVC1_LICENSING_UID ( 0x04 )
+#define cOCTVC1_PKT_API_UID ( 0x02 )
/****************************************************************************
Module identifier bases
diff --git a/octvc1/octvc1_buffer.h b/octvc1/octvc1_buffer.h index 8985a83..a4d7194 100644 --- a/octvc1/octvc1_buffer.h +++ b/octvc1/octvc1_buffer.h @@ -2,7 +2,7 @@ File: OCTVC1_BUFFER.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_buffer_swap.h b/octvc1/octvc1_buffer_swap.h index aad9b86..1a352ba 100644 --- a/octvc1/octvc1_buffer_swap.h +++ b/octvc1/octvc1_buffer_swap.h @@ -2,7 +2,7 @@ File: octvc1_buffer_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_BUFFER_SWAP_H__
diff --git a/octvc1/octvc1_cursor.h b/octvc1/octvc1_cursor.h index 135e7ba..0fdb146 100644 --- a/octvc1/octvc1_cursor.h +++ b/octvc1/octvc1_cursor.h @@ -2,7 +2,7 @@ File: OCTVC1_CURSOR.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_cursor_swap.h b/octvc1/octvc1_cursor_swap.h index 4a48042..538e95f 100644 --- a/octvc1/octvc1_cursor_swap.h +++ b/octvc1/octvc1_cursor_swap.h @@ -2,7 +2,7 @@ File: octvc1_cursor_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_CURSOR_SWAP_H__
diff --git a/octvc1/octvc1_eth.h b/octvc1/octvc1_eth.h index 5a08079..f42e37e 100644 --- a/octvc1/octvc1_eth.h +++ b/octvc1/octvc1_eth.h @@ -2,7 +2,7 @@ File: OCTVC1_ETH.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_eth_swap.h b/octvc1/octvc1_eth_swap.h index 763e9c2..62e08cb 100644 --- a/octvc1/octvc1_eth_swap.h +++ b/octvc1/octvc1_eth_swap.h @@ -2,7 +2,7 @@ File: octvc1_eth_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_ETH_SWAP_H__
diff --git a/octvc1/octvc1_fifo.h b/octvc1/octvc1_fifo.h index 05635a7..44419b9 100644 --- a/octvc1/octvc1_fifo.h +++ b/octvc1/octvc1_fifo.h @@ -2,7 +2,7 @@ File: OCTVC1_FIFO.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -31,12 +31,19 @@ $Revision: $ /************************ COMMON DEFINITIONS *******************************/
/*-------------------------------------------------------------------------------------
- Control process _FIFO-ID definition
+ Control process FIFO-ID definition
+ Deprecated should use cOCTVC1_FIFO_ID_CONTROL
-------------------------------------------------------------------------------------*/
#define cOCTVC1_FIFO_ID_MGW_CONTROL 0x00000000
/*-------------------------------------------------------------------------------------
+ Control process _FIFO-ID definition
+-------------------------------------------------------------------------------------*/
+
+#define cOCTVC1_FIFO_ID_CONTROL 0x00000000
+
+/*-------------------------------------------------------------------------------------
Invalid _FIFO-ID
-------------------------------------------------------------------------------------*/
diff --git a/octvc1/octvc1_file.h b/octvc1/octvc1_file.h index 5e8a49b..8ddca36 100644 --- a/octvc1/octvc1_file.h +++ b/octvc1/octvc1_file.h @@ -2,7 +2,7 @@ File: OCTVC1_FILE.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_file_swap.h b/octvc1/octvc1_file_swap.h index 560a513..befe5b4 100644 --- a/octvc1/octvc1_file_swap.h +++ b/octvc1/octvc1_file_swap.h @@ -2,7 +2,7 @@ File: octvc1_file_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_FILE_SWAP_H__
diff --git a/octvc1/octvc1_generic_rc.h b/octvc1/octvc1_generic_rc.h index 035daa3..8b6b841 100644 --- a/octvc1/octvc1_generic_rc.h +++ b/octvc1/octvc1_generic_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_GENERIC_RC.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -63,6 +63,8 @@ $Octasic_Revision: $ #define cOCTVC1_GENERIC_RC_API_SESSION_INACTIVE ( 0x0004 + cOCTVC1_GENERIC_API_RC_BASE )
#define cOCTVC1_GENERIC_RC_API_INVALID_CMD_LENGTH ( 0x0005 + cOCTVC1_GENERIC_API_RC_BASE )
#define cOCTVC1_GENERIC_RC_API_INVALID_CMD_ID ( 0x0006 + cOCTVC1_GENERIC_API_RC_BASE )
+#define cOCTVC1_GENERIC_RC_API_ROUTING_ERROR ( 0x0007 + cOCTVC1_GENERIC_API_RC_BASE )
+#define cOCTVC1_GENERIC_RC_API_RSP_ERROR ( 0x0008 + cOCTVC1_GENERIC_API_RC_BASE )
/****************************************************************************
MEMORY return codes
diff --git a/octvc1/octvc1_handle.h b/octvc1/octvc1_handle.h index 9de84ef..4e54a60 100644 --- a/octvc1/octvc1_handle.h +++ b/octvc1/octvc1_handle.h @@ -2,7 +2,7 @@ File: OCTVC1_HANDLE.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -93,7 +93,7 @@ $Revision: $ typedef struct
{
tOCT_UINT32 ulObject32;
- tOCT_UINT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
} tOCTVC1_OBJECT32_NAME;
diff --git a/octvc1/octvc1_handle_swap.h b/octvc1/octvc1_handle_swap.h index cdbfc0e..715f757 100644 --- a/octvc1/octvc1_handle_swap.h +++ b/octvc1/octvc1_handle_swap.h @@ -2,7 +2,7 @@ File: octvc1_handle_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_HANDLE_SWAP_H__
diff --git a/octvc1/octvc1_id2string.h b/octvc1/octvc1_id2string.h index d35d8ed..0c19c14 100644 --- a/octvc1/octvc1_id2string.h +++ b/octvc1/octvc1_id2string.h @@ -2,7 +2,7 @@ File: octvc1_id2string.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -34,7 +34,7 @@ $Revision: $ /* -------------------------------------------------------------------------------------
OCTVC1_ID2STRING
-------------------------------------------------------------------------------------*/
-#define mOCTVC1_ID2STRING( _f_ulId ) \
+#define mOCTVC1_ID2STRING( _f_ulId ) \
octvc1_id2string( _f_ulId )
#ifndef OCTVC1_ID2STRING_DECLARE
@@ -56,275 +56,299 @@ extern const char * octvc1_id2string( tOCT_UINT32 f_ulId ); const char * octvc1_id2string( tOCT_UINT32 f_ulId )
{
static char g_szUnknownoctvc1_id2string[32];
- switch( f_ulId )
+ switch( f_ulId & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET ))
{
/* OCTVC1_MAIN */
- case cOCTVC1_MAIN_MSG_TARGET_RESET_CID:
+ case ( cOCTVC1_MAIN_MSG_TARGET_RESET_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_TARGET_RESET_CID";
- case cOCTVC1_MAIN_MSG_TARGET_INFO_CID:
+ case ( cOCTVC1_MAIN_MSG_TARGET_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_TARGET_INFO_CID";
- case cOCTVC1_MAIN_MSG_LOG_ERASE_CID:
+ case ( cOCTVC1_MAIN_MSG_LOG_ERASE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_LOG_ERASE_CID";
- case cOCTVC1_MAIN_MSG_LOG_INFO_CID:
+ case ( cOCTVC1_MAIN_MSG_LOG_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_LOG_INFO_CID";
- case cOCTVC1_MAIN_MSG_LOG_STATS_CID:
+ case ( cOCTVC1_MAIN_MSG_LOG_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_LOG_STATS_CID";
- case cOCTVC1_MAIN_MSG_LOG_INFO_TRACE_CID:
+ case ( cOCTVC1_MAIN_MSG_LOG_INFO_TRACE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_LOG_INFO_TRACE_CID";
- case cOCTVC1_MAIN_MSG_LOG_START_TRACE_CID:
+ case ( cOCTVC1_MAIN_MSG_LOG_START_TRACE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_LOG_START_TRACE_CID";
- case cOCTVC1_MAIN_MSG_LOG_STOP_TRACE_CID:
+ case ( cOCTVC1_MAIN_MSG_LOG_STOP_TRACE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_LOG_STOP_TRACE_CID";
- case cOCTVC1_MAIN_MSG_LOG_ERASE_TRACE_CID:
+ case ( cOCTVC1_MAIN_MSG_LOG_ERASE_TRACE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_LOG_ERASE_TRACE_CID";
- case cOCTVC1_MAIN_MSG_LOG_STATS_TRACE_CID:
+ case ( cOCTVC1_MAIN_MSG_LOG_STATS_TRACE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_LOG_STATS_TRACE_CID";
- case cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID:
+ case ( cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID";
- case cOCTVC1_MAIN_MSG_FILE_OPEN_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_OPEN_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_OPEN_CID";
- case cOCTVC1_MAIN_MSG_FILE_CLOSE_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_CLOSE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_CLOSE_CID";
- case cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID";
- case cOCTVC1_MAIN_MSG_FILE_WRITE_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_WRITE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_WRITE_CID";
- case cOCTVC1_MAIN_MSG_FILE_READ_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_READ_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_READ_CID";
- case cOCTVC1_MAIN_MSG_FILE_INFO_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_INFO_CID";
- case cOCTVC1_MAIN_MSG_FILE_LIST_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_LIST_CID";
- case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID";
- case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID";
- case cOCTVC1_MAIN_MSG_PROCESS_INFO_CID:
+ case ( cOCTVC1_MAIN_MSG_PROCESS_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_PROCESS_INFO_CID";
- case cOCTVC1_MAIN_MSG_PROCESS_LIST_CID:
+ case ( cOCTVC1_MAIN_MSG_PROCESS_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_PROCESS_LIST_CID";
- case cOCTVC1_MAIN_MSG_PROCESS_MONITOR_CPU_USAGE_CID:
+ case ( cOCTVC1_MAIN_MSG_PROCESS_MONITOR_CPU_USAGE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_PROCESS_MONITOR_CPU_USAGE_CID";
- case cOCTVC1_MAIN_MSG_PROCESS_STATS_CPU_USAGE_CID:
+ case ( cOCTVC1_MAIN_MSG_PROCESS_STATS_CPU_USAGE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_PROCESS_STATS_CPU_USAGE_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_LIST_SESSION_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_LIST_SESSION_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_LIST_SESSION_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_EVT_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_EVT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_EVT_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_HEARTBEAT_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_HEARTBEAT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_HEARTBEAT_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_STATS_SESSION_HEARTBEAT_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_STATS_SESSION_HEARTBEAT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_STATS_SESSION_HEARTBEAT_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID";
- case cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID:
+ case ( cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID";
- case cOCTVC1_MAIN_MSG_APPLICATION_START_CID:
- return "cOCTVC1_MAIN_MSG_APPLICATION_START_CID";
- case cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID:
+ case ( cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID";
- case cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID:
+ case ( cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID";
- case cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID:
+ case ( cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID";
- case cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID:
+ case ( cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID";
- case cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID:
+ case ( cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID";
- case cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID:
+ case ( cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID";
- case cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID:
+ case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID";
- case cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID:
+ case ( cOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CID";
+ case ( cOCTVC1_MAIN_MSG_LOG_START_STREAM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_MAIN_MSG_LOG_START_STREAM_CID";
+ case ( cOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CID";
+ case ( cOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ 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_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:
+ case (cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID";
- case cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID:
+ case (cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID";
- case cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID:
+ case (cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID";
+ case (cOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EID";
/* OCTVC1_HW */
- case cOCTVC1_HW_MSG_PCB_INFO_CID:
+ case ( cOCTVC1_HW_MSG_PCB_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_PCB_INFO_CID";
- case cOCTVC1_HW_MSG_CPU_CORE_STATS_CID:
+ case ( cOCTVC1_HW_MSG_CPU_CORE_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_CPU_CORE_STATS_CID";
- case cOCTVC1_HW_MSG_CPU_CORE_INFO_CID:
+ case ( cOCTVC1_HW_MSG_CPU_CORE_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_CPU_CORE_INFO_CID";
- case cOCTVC1_HW_MSG_CPU_CORE_LIST_CID:
+ case ( cOCTVC1_HW_MSG_CPU_CORE_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_CPU_CORE_LIST_CID";
- case cOCTVC1_HW_MSG_ETH_PORT_INFO_CID:
+ case ( cOCTVC1_HW_MSG_ETH_PORT_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_ETH_PORT_INFO_CID";
- case cOCTVC1_HW_MSG_ETH_PORT_LIST_CID:
+ case ( cOCTVC1_HW_MSG_ETH_PORT_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_ETH_PORT_LIST_CID";
- case cOCTVC1_HW_MSG_ETH_PORT_STATS_CID:
+ case ( cOCTVC1_HW_MSG_ETH_PORT_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_ETH_PORT_STATS_CID";
- case cOCTVC1_HW_MSG_ETH_PORT_MODIFY_CID:
+ case ( cOCTVC1_HW_MSG_ETH_PORT_MODIFY_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_ETH_PORT_MODIFY_CID";
- case cOCTVC1_HW_MSG_RF_PORT_INFO_CID:
+ case ( cOCTVC1_HW_MSG_RF_PORT_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_RF_PORT_INFO_CID";
- case cOCTVC1_HW_MSG_RF_PORT_STATS_CID:
+ case ( cOCTVC1_HW_MSG_RF_PORT_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_RF_PORT_STATS_CID";
- case cOCTVC1_HW_MSG_RF_PORT_LIST_CID:
+ case ( cOCTVC1_HW_MSG_RF_PORT_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_RF_PORT_LIST_CID";
- case cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID:
+ case ( cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID";
- case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID:
+ case ( cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID";
- case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID:
+ case ( cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID";
- case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID:
+ case ( cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID";
- case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_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:
+ 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:
+ 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_CPU_CORE_EXEC_REPORT_EID:
+ case (cOCTVC1_HW_MSG_CPU_CORE_EXEC_REPORT_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_CPU_CORE_EXEC_REPORT_EID";
- case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EID:
+ case (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EID";
/* OCTVC1_IRSC */
- case cOCTVC1_IRSC_MSG_PROCESS_INFO_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_INFO_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_STATS_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_STATS_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_LIST_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_LIST_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID:
+ case ( cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID";
- case cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID:
+ case ( cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID";
- case cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID:
+ case ( cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID";
- case cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID:
+ case ( cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID";
- case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID:
+ case ( cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID";
- case cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID:
+ case ( cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID";
- case cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID:
+ case ( cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID";
- case cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID:
+ case ( cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID";
- case cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID:
+ case ( cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID";
- case cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID:
+ case ( cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID";
- case cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID:
+ case ( cOCTVC1_IRSC_MSG_ROUTER_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ 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_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:
+ case ( cOCTVC1_GSM_MSG_TRX_OPEN_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_OPEN_CID";
- case cOCTVC1_GSM_MSG_TRX_CLOSE_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_CLOSE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_CLOSE_CID";
- case cOCTVC1_GSM_MSG_TRX_STATUS_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_STATUS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_STATUS_CID";
- case cOCTVC1_GSM_MSG_TRX_INFO_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_INFO_CID";
- case cOCTVC1_GSM_MSG_TRX_RESET_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_RESET_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_RESET_CID";
- case cOCTVC1_GSM_MSG_TRX_MODIFY_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_MODIFY_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_MODIFY_CID";
- case cOCTVC1_GSM_MSG_TRX_LIST_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_LIST_CID";
- case cOCTVC1_GSM_MSG_TRX_CLOSE_ALL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_CLOSE_ALL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_CLOSE_ALL_CID";
- case cOCTVC1_GSM_MSG_TRX_START_RECORD_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_START_RECORD_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_START_RECORD_CID";
- case cOCTVC1_GSM_MSG_TRX_STOP_RECORD_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_STOP_RECORD_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_STOP_RECORD_CID";
- case cOCTVC1_GSM_MSG_TRX_ACTIVATE_LOGICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_ACTIVATE_LOGICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_ACTIVATE_LOGICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_DEACTIVATE_LOGICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_DEACTIVATE_LOGICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_DEACTIVATE_LOGICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_STATUS_LOGICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_STATUS_LOGICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_STATUS_LOGICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_INFO_LOGICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_INFO_LOGICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_INFO_LOGICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_LIST_LOGICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_LIST_LOGICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_LIST_LOGICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID";
- case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID";
- case cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_RESET_PHYSICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_RESET_PHYSICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_RESET_PHYSICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_LIST_PHYSICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_LIST_PHYSICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_LIST_PHYSICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CID";
- case cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID";
- case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID";
- case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID";
- case cOCTVC1_GSM_MSG_TRX_INFO_RF_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_INFO_RF_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_INFO_RF_CID";
- case cOCTVC1_GSM_MSG_TRX_MODIFY_RF_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_MODIFY_RF_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_MODIFY_RF_CID";
- case cOCTVC1_GSM_MSG_TAP_FILTER_LIST_CID:
+ case ( cOCTVC1_GSM_MSG_TAP_FILTER_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TAP_FILTER_LIST_CID";
- case cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID:
+ case ( cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID";
- case cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID:
+ case ( cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID";
- case cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID:
+ case ( cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID";
- case cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID";
- case cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID:
+ case ( cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID";
- case cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID:
+ case ( cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID";
+ case ( cOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CID";
+ case ( cOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CID";
+ case ( cOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_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:
+ case (cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID";
- case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_DATA_INDICATION_EID:
+ case (cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_DATA_INDICATION_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_DATA_INDICATION_EID";
- case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION_EID:
+ case (cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION_EID";
- case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RACH_INDICATION_EID:
+ case (cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RACH_INDICATION_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RACH_INDICATION_EID";
- case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION_EID:
+ case (cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION_EID";
default:
diff --git a/octvc1/octvc1_id2string_priv.h b/octvc1/octvc1_id2string_priv.h index ebc60e3..706336d 100644 --- a/octvc1/octvc1_id2string_priv.h +++ b/octvc1/octvc1_id2string_priv.h @@ -2,7 +2,7 @@ File: octvc1_id2string_priv.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -35,7 +35,7 @@ $Revision: $ /* -------------------------------------------------------------------------------------
OCTVC1_ID2STRING_PRIV
-------------------------------------------------------------------------------------*/
-#define mOCTVC1_ID2STRING_PRIV( _f_ulId ) \
+#define mOCTVC1_ID2STRING_PRIV( _f_ulId ) \
octvc1_id2string_priv( _f_ulId )
#ifndef OCTVC1_ID2STRING_PRIV_DECLARE
@@ -55,45 +55,45 @@ extern const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId ); const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId )
{
static char g_szUnknownoctvc1_id2string_priv[32];
- switch( f_ulId )
+ switch( f_ulId & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET ))
{
/* OCTVC1_TEST */
- case cOCTVC1_TEST_MSG_DESCR_LIST_CID:
+ case ( cOCTVC1_TEST_MSG_DESCR_LIST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_DESCR_LIST_CID";
- case cOCTVC1_TEST_MSG_DESCR_INFO_CID:
+ case ( cOCTVC1_TEST_MSG_DESCR_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_DESCR_INFO_CID";
- case cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID:
+ case ( cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID";
- case cOCTVC1_TEST_MSG_DESCR_STATS_CID:
+ case ( cOCTVC1_TEST_MSG_DESCR_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_DESCR_STATS_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID";
- case cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID:
+ case ( cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID";
/* OCTVC1_GENERIC */
- case cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID:
+ 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:
+ 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:
+ 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";
default:
diff --git a/octvc1/octvc1_ip.h b/octvc1/octvc1_ip.h index 34bf5e6..1b7a8ab 100644 --- a/octvc1/octvc1_ip.h +++ b/octvc1/octvc1_ip.h @@ -2,7 +2,7 @@ File: OCTVC1_IP.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_ip_swap.h b/octvc1/octvc1_ip_swap.h index 356b5ab..4566b37 100644 --- a/octvc1/octvc1_ip_swap.h +++ b/octvc1/octvc1_ip_swap.h @@ -2,7 +2,7 @@ File: octvc1_ip_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IP_SWAP_H__
diff --git a/octvc1/octvc1_ipc.h b/octvc1/octvc1_ipc.h new file mode 100644 index 0000000..34e195c --- /dev/null +++ b/octvc1/octvc1_ipc.h @@ -0,0 +1,84 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+File: OCTVC1_IPC.h
+
+Copyright (c) 2016 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.05.00-B818 (2016/02/11)
+
+$Revision: $
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+
+#ifndef __OCTVC1_IPC_H__
+#define __OCTVC1_IPC_H__
+
+
+/***************************** INCLUDE FILES *******************************/
+#include "../octdev_types.h"
+
+
+/************************ COMMON DEFINITIONS *******************************/
+
+/*-------------------------------------------------------------------------------------
+ Interprocess communication
+-------------------------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------------------------------
+ IPC Header Definition
+-------------------------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IPC_MSG_FLAG_MASK :
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_IPC_MSG_FLAG_MASK tOCT_UINT8
+
+#define cOCTVC1_IPC_MSG_FLAG_MASK_VALID 0x1
+#define cOCTVC1_IPC_MSG_FLAG_MASK_ERROR 0x8
+#define cOCTVC1_IPC_MSG_FLAG_BIT_OFFSET 28
+#define cOCTVC1_IPC_MSG_FLAG_BIT_MASK 0xF0000000
+
+/*-------------------------------------------------------------------------------------
+ IPC Message Header sequence.
+-------------------------------------------------------------------------------------*/
+#define cOCTVC1_IPC_MSG_SEQUENCE_BIT_OFFSET 20
+#define cOCTVC1_IPC_MSG_SEQUENCE_BIT_MASK 0x0FF00000
+
+/*-------------------------------------------------------------------------------------
+ IPC Message Header ID.
+-------------------------------------------------------------------------------------*/
+#define cOCTVC1_IPC_MSG_ID_BIT_OFFSET 0
+#define cOCTVC1_IPC_MSG_ID_BIT_MASK 0x000FFFFF
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_IPC_MSG_HEADER
+ IPC message Header
+
+ Members:
+ ulFlag_Seq_Id
+ bits[31:28] = Message flag tOCTVC1_IPC_MSG_FLAG_MASK_.
+ bits[27:20] = Sequence number
+ bits[19:0] = IPC Message Id.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCT_UINT32 ulFlag_Seq_Id;
+
+} tOCTVC1_IPC_MSG_HEADER;
+
+
+#endif /* __OCTVC1_IPC_H__ */
+
diff --git a/octvc1/octvc1_ipc_swap.h b/octvc1/octvc1_ipc_swap.h new file mode 100644 index 0000000..10529f9 --- /dev/null +++ b/octvc1/octvc1_ipc_swap.h @@ -0,0 +1,55 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+
+File: octvc1_ipc_swap.h
+
+Copyright (c) 2016 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.05.00-B818 (2016/02/11)
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+#ifndef __OCTVC1_IPC_SWAP_H__
+#define __OCTVC1_IPC_SWAP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/***************************** INCLUDE FILES *******************************/
+#include "octvc1_swap_hdrs.h"
+#include "octvc1_ipc.h"
+
+/********************************* MACROS **********************************/
+
+
+
+#define mOCTVC1_IPC_MSG_FLAG_MASK_SWAP( pType ) /* tOCT_UINT8 */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_IPC_MSG_HEADER_SWAP( _f_pParms ){ tOCTVC1_IPC_MSG_HEADER * pOCTVC1_IPC_MSG_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVC1_IPC_MSG_HEADER)\
+ ((tOCTVC1_IPC_MSG_HEADER *)pOCTVC1_IPC_MSG_HEADER)->ulFlag_Seq_Id = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IPC_MSG_HEADER *)pOCTVC1_IPC_MSG_HEADER)->ulFlag_Seq_Id); \
+}
+#else
+#define mOCTVC1_IPC_MSG_HEADER_SWAP( pOCTVC1_IPC_MSG_HEADER )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#ifdef __cplusplus
+}
+
+#endif
+
+#endif /* __OCTVC1_IPC_SWAP_H__ */
diff --git a/octvc1/octvc1_licensing_rc.h b/octvc1/octvc1_licensing_rc.h index 6f06147..25473ab 100644 --- a/octvc1/octvc1_licensing_rc.h +++ b/octvc1/octvc1_licensing_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_LICENSING_RC.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the return codes for the LICENSING 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/octvc1_list.h b/octvc1/octvc1_list.h index e97519d..5e4eae6 100644 --- a/octvc1/octvc1_list.h +++ b/octvc1/octvc1_list.h @@ -2,7 +2,7 @@ File: OCTVC1_LIST.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_list_swap.h b/octvc1/octvc1_list_swap.h index 058c2da..4cf6a1d 100644 --- a/octvc1/octvc1_list_swap.h +++ b/octvc1/octvc1_list_swap.h @@ -2,7 +2,7 @@ File: octvc1_list_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_LIST_SWAP_H__
diff --git a/octvc1/octvc1_log.h b/octvc1/octvc1_log.h index 433152e..a922e89 100644 --- a/octvc1/octvc1_log.h +++ b/octvc1/octvc1_log.h @@ -2,7 +2,7 @@ File: OCTVC1_LOG.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -65,6 +65,7 @@ $Revision: $ #define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_DATA 0
#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_STRING 1
#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_RC 2
+#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_MODULE_DATA 3
/*-------------------------------------------------------------------------------------
tOCTVC1_LOG_TRACE_MASK :
@@ -141,10 +142,10 @@ $Revision: $ -------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_LOG_ID ulId;
- tOCT_UINT32 ulTime;
- tOCT_UINT32 hProcess;
- tOCT_UINT32 ul_Type_Info_Length;
+ tOCT_UINT32 ulId;
+ tOCT_UINT32 ulTime;
+ tOCT_UINT32 hProcess;
+ tOCT_UINT32 ul_Type_Info_Length;
} tOCTVC1_LOG_HEADER;
diff --git a/octvc1/octvc1_log_swap.h b/octvc1/octvc1_log_swap.h index 8765304..b8b9b47 100644 --- a/octvc1/octvc1_log_swap.h +++ b/octvc1/octvc1_log_swap.h @@ -2,7 +2,7 @@ File: octvc1_log_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_LOG_SWAP_H__
@@ -73,7 +73,8 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_LOG_HEADER_SWAP( _f_pParms ){ tOCTVC1_LOG_HEADER * pOCTVC1_LOG_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVC1_LOG_HEADER)\
- { mOCTVC1_LOG_ID_SWAP( &((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulId ); } \
+ ((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulId = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulId); \
((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulTime = \
mOCT_SWAP32_IF_LE(((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulTime); \
((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->hProcess = \
diff --git a/octvc1/octvc1_mac.h b/octvc1/octvc1_mac.h index 86c5b4f..d2d04ef 100644 --- a/octvc1/octvc1_mac.h +++ b/octvc1/octvc1_mac.h @@ -2,7 +2,7 @@ File: OCTVC1_MAC.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_macro.h b/octvc1/octvc1_macro.h index c5bb02c..12064a6 100644 --- a/octvc1/octvc1_macro.h +++ b/octvc1/octvc1_macro.h @@ -2,7 +2,7 @@ File: OCTVC1_MACRO.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_module.h b/octvc1/octvc1_module.h index 9d9e099..ce93611 100644 --- a/octvc1/octvc1_module.h +++ b/octvc1/octvc1_module.h @@ -2,7 +2,7 @@ File: OCTVC1_MODULE.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -31,12 +31,19 @@ $Revision: $ /***************************** INCLUDE FILES *******************************/
#include "../octdev_types.h"
#include "octvc1_base.h"
+#include "octvc1_handle.h"
/************************ COMMON DEFINITIONS *******************************/
/*-------------------------------------------------------------------------------------
- Module ID identifiers
+ Last process identifiers
+-------------------------------------------------------------------------------------*/
+
+#define cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID 5
+
+/*-------------------------------------------------------------------------------------
+ Module Data Header Definition
-------------------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------------------
tOCTVC1_MODULE_ID_ENUM :
@@ -51,27 +58,76 @@ $Revision: $ #define cOCTVC1_MODULE_ID_ENUM_TEST 0x05
#define cOCTVC1_MODULE_ID_ENUM_HW 0x06
#define cOCTVC1_MODULE_ID_ENUM_IRSC 0x07
+
+/*-------------------------------------------------------------------------------------
+ Application modules definitions.
+-------------------------------------------------------------------------------------*/
#define cOCTVC1_MODULE_ID_ENUM_OBM 0x08
+#define cOCTVC1_MODULE_ID_ENUM_APP_TEST 0x09
#define cOCTVC1_MODULE_ID_ENUM_SDR 0x0A
#define cOCTVC1_MODULE_ID_ENUM_GSM 0x0B
#define cOCTVC1_MODULE_ID_ENUM_LTE 0x0C
#define cOCTVC1_MODULE_ID_ENUM_UMTS 0x0D
#define cOCTVC1_MODULE_ID_ENUM_RUS 0x0E
+#define cOCTVC1_MODULE_ID_BIT_OFFSET 24
+#define cOCTVC1_MODULE_ID_BIT_MASK 0xFF
+
+/*-------------------------------------------------------------------------------------
+ Module Application ID
+-------------------------------------------------------------------------------------*/
+
+
+/*----------------------------------------------------------------------------
+ tOCTVC1_MODULE_APPLICATION_ID
+
+ [cOCTVC1_MODULE_ID|Value]
+ [31:16] : reserved
+ [15:8] : API Module ID tOCTVC1_MODULE_ID_ENUM:
+ [7:0] : Index
+----------------------------------------------------------------------------*/
+typedef tOCT_UINT32 tOCTVC1_MODULE_APPLICATION_ID;
+
+
+#define cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_OFFSET 8
+#define cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_MASK 0x000000FF
+#define cOCTVC1_MODULE_APPLICATION_ID_INDEX_BIT_OFFSET 0
+#define cOCTVC1_MODULE_APPLICATION_ID_INDEX_BIT_MASK 0x000000FF
+
+/*-------------------------------------------------------------------------------------
+ Main Application Module Id
+-------------------------------------------------------------------------------------*/
+
+#define cOCTVC1_MODULE_APPLICATION_ID_MAIN_SYSTEM ((0x00)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_OFFSET))
+
+/*-------------------------------------------------------------------------------------
+ Module Data ID
+-------------------------------------------------------------------------------------*/
+
+#define cOCTVC1_MODULE_DATA_ID_BIT_OFFSET 0
+#define cOCTVC1_MODULE_DATA_ID_BIT_MASK 0x0000FFFF
+
/*-------------------------------------------------------------------------------------
tOCTVC1_MODULE_DATA
Format Module Data
Members:
- ulModuleId
- Module Id.
ulModuleDataId
- Module Data Id.
+ bits[31:24] = ModuleId -> cOCTVC1_MODULE_ID_ENUM_.
+ bits[23:16] = Reserved
+ bits[15:0] = DataId -> Module specific data exchange.
+ ulModuleDataSize
+ Size of Module Data structure.
+ hLogicalObj
+ Associated object.
+ ulTimestamp
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MODULE_ID_ENUM ulModuleId;
tOCT_UINT32 ulModuleDataId;
+ tOCT_UINT32 ulModuleDataSize;
+ tOCTVC1_HANDLE_OBJECT hLogicalObj;
+ tOCT_UINT32 ulTimestamp;
} tOCTVC1_MODULE_DATA;
diff --git a/octvc1/octvc1_module_swap.h b/octvc1/octvc1_module_swap.h index 740ded0..3af9bb9 100644 --- a/octvc1/octvc1_module_swap.h +++ b/octvc1/octvc1_module_swap.h @@ -2,7 +2,7 @@ File: octvc1_module_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MODULE_SWAP_H__
@@ -45,10 +45,24 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MODULE_APPLICATION_ID_SWAP( pType ){ \
+ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
+#else
+
+#define mOCTVC1_MODULE_APPLICATION_ID_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MODULE_DATA_SWAP( _f_pParms ){ tOCTVC1_MODULE_DATA * pOCTVC1_MODULE_DATA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MODULE_DATA)\
- { mOCTVC1_MODULE_ID_ENUM_SWAP( &((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleId ); } \
((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleDataId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleDataId); \
+ ((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleDataSize = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleDataSize); \
+ ((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->hLogicalObj = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->hLogicalObj); \
+ ((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulTimestamp = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulTimestamp); \
}
#else
#define mOCTVC1_MODULE_DATA_SWAP( pOCTVC1_MODULE_DATA )
diff --git a/octvc1/octvc1_msg.h b/octvc1/octvc1_msg.h index b811782..1e09f42 100644 --- a/octvc1/octvc1_msg.h +++ b/octvc1/octvc1_msg.h @@ -2,7 +2,7 @@ File: OCTVC1_MSG.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -67,12 +67,18 @@ $Revision: $ Message identifier - Module ID
-------------------------------------------------------------------------------------*/
#define cOCTVC1_MSG_MODULE_ID_BIT_OFFSET 16
-#define cOCTVC1_MSG_MODULE_BIT_MASK 0x000000FF
+#define cOCTVC1_MSG_MODULE_BIT_MASK 0x0000001F
+
+/*-------------------------------------------------------------------------------------
+ Message identifier - SUB Module ID
+-------------------------------------------------------------------------------------*/
+#define cOCTVC1_MSG_SUB_MODULE_ID_BIT_OFFSET 21
+#define cOCTVC1_MSG_SUB_MODULE_BIT_MASK 0x00000007
/*-------------------------------------------------------------------------------------
Message identifier - Module and MethodID
-------------------------------------------------------------------------------------*/
-#define cOCTVC1_MSG_MODULE_AND_METHOD_BIT_MASK ((cOCTVC1_MSG_MODULE_BIT_MASK<<cOCTVC1_MSG_MODULE_ID_BIT_OFFSET)|(cOCTVC1_MSG_METHOD_BIT_MASK<<cOCTVC1_MSG_METHOD_ID_BIT_OFFSET))
+#define cOCTVC1_MSG_MODULE_AND_METHOD_BIT_MASK ((cOCTVC1_MSG_SUB_MODULE_BIT_MASK<<cOCTVC1_MSG_SUB_MODULE_ID_BIT_OFFSET)|(cOCTVC1_MSG_MODULE_BIT_MASK<<cOCTVC1_MSG_MODULE_ID_BIT_OFFSET)|(cOCTVC1_MSG_METHOD_BIT_MASK<<cOCTVC1_MSG_METHOD_ID_BIT_OFFSET))
/*-------------------------------------------------------------------------------------
Message data length
diff --git a/octvc1/octvc1_msg_swap.h b/octvc1/octvc1_msg_swap.h index fcdbd38..d3c96aa 100644 --- a/octvc1/octvc1_msg_swap.h +++ b/octvc1/octvc1_msg_swap.h @@ -2,7 +2,7 @@ File: octvc1_msg_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MSG_SWAP_H__
diff --git a/octvc1/octvc1_priv_swap_hdrs.h b/octvc1/octvc1_priv_swap_hdrs.h index cdd8ff1..bc13af8 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_PRIV_SWAP_HDRS_H__
diff --git a/octvc1/octvc1_privacy.h b/octvc1/octvc1_privacy.h index eada18f..51aea9d 100644 --- a/octvc1/octvc1_privacy.h +++ b/octvc1/octvc1_privacy.h @@ -2,7 +2,7 @@ File: OCTVC1_PRIVACY.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_process.h b/octvc1/octvc1_process.h index d9f2dd7..248313f 100644 --- a/octvc1/octvc1_process.h +++ b/octvc1/octvc1_process.h @@ -2,7 +2,7 @@ File: OCTVC1_PROCESS.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -48,10 +48,11 @@ $Revision: $ #define cOCTVC1_PROCESS_TYPE_ENUM_INVALID 0
#define cOCTVC1_PROCESS_TYPE_ENUM_CONTROL 1
-#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_SCHED 2
-#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_DL 3
-#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_ULIM 4
-#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_ULOM 5
+#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_ULOM ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+4) )
#define cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH 63 /* Process image string length restriction. */
/*-------------------------------------------------------------------------------------
@@ -125,6 +126,8 @@ typedef struct Task's maximum cache miss in one execution
ulLastExecCacheMissCnt
Task's last execution cache miss count
+ ulTotalCacheMissCnt
+ Task's last execution cache miss count
ulExecCnt
Number of times the task has been executed
ulDoneCnt
@@ -141,6 +144,7 @@ typedef struct tOCT_UINT32 ulLastExecTimeUs;
tOCT_UINT32 ulMaxExecCacheMissCnt;
tOCT_UINT32 ulLastExecCacheMissCnt;
+ tOCT_UINT32 ulTotalCacheMissCnt;
tOCT_UINT32 ulExecCnt;
tOCT_UINT32 ulDoneCnt;
tOCT_UINT32 ulErrorCnt;
diff --git a/octvc1/octvc1_process_swap.h b/octvc1/octvc1_process_swap.h index 24b3aeb..34f913f 100644 --- a/octvc1/octvc1_process_swap.h +++ b/octvc1/octvc1_process_swap.h @@ -2,7 +2,7 @@ File: octvc1_process_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_PROCESS_SWAP_H__
@@ -95,6 +95,8 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulMaxExecCacheMissCnt); \
((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulLastExecCacheMissCnt = \
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)->ulExecCnt = \
mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulExecCnt); \
((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulDoneCnt = \
diff --git a/octvc1/octvc1_radio.h b/octvc1/octvc1_radio.h index 10ad009..a0f63ef 100644 --- a/octvc1/octvc1_radio.h +++ b/octvc1/octvc1_radio.h @@ -2,7 +2,7 @@ File: OCTVC1_RADIO.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -45,6 +45,7 @@ $Revision: $ #define cOCTVC1_RADIO_STANDARD_ENUM_GSM 0
#define cOCTVC1_RADIO_STANDARD_ENUM_UMTS 1
#define cOCTVC1_RADIO_STANDARD_ENUM_LTE 2
+#define cOCTVC1_RADIO_STANDARD_ENUM_CUSTOM 3
#define cOCTVC1_RADIO_STANDARD_ENUM_INVALID 0xCAFEDECA
/*-------------------------------------------------------------------------------------
@@ -176,6 +177,26 @@ $Revision: $ #define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_INVALID 0xCAFEDECA
/*-------------------------------------------------------------------------------------
+ Radio Standard Frequency Band Identifiers
+-------------------------------------------------------------------------------------*/
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID
+
+ Members:
+ ulStandard
+ Radio standard
+ ulBandNumber
+ Default: 0
+ Band number value.
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_RADIO_STANDARD_ENUM ulStandard;
+ tOCT_UINT32 ulBandNumber;
+
+} tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID;
+
+/*-------------------------------------------------------------------------------------
Radio Configiguration Script Identifiers
-------------------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------------------
diff --git a/octvc1/octvc1_radio_swap.h b/octvc1/octvc1_radio_swap.h index 75340ff..65cc802 100644 --- a/octvc1/octvc1_radio_swap.h +++ b/octvc1/octvc1_radio_swap.h @@ -2,7 +2,7 @@ File: octvc1_radio_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_RADIO_SWAP_H__
@@ -72,6 +72,16 @@ extern "C" { #endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_RADIO_STANDARD_FREQ_BAND_ID_SWAP( _f_pParms ){ tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID * pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID = (_f_pParms); SWAP_UNUSED(pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID)\
+ { mOCTVC1_RADIO_STANDARD_ENUM_SWAP( &((tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID *)pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID)->ulStandard ); } \
+ ((tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID *)pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID)->ulBandNumber = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID *)pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID)->ulBandNumber); \
+}
+#else
+#define mOCTVC1_RADIO_STANDARD_FREQ_BAND_ID_SWAP( pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_RADIO_CONFIG_SCRIPT_TYPE_ENUM_SWAP( pType ){ \
*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
#else
diff --git a/octvc1/octvc1_rc2string.h b/octvc1/octvc1_rc2string.h index 6ddb275..6169f3d 100644 --- a/octvc1/octvc1_rc2string.h +++ b/octvc1/octvc1_rc2string.h @@ -2,7 +2,7 @@ File: octvc1_rc2string.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -108,6 +108,10 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_GENERIC_RC_API_INVALID_CMD_LENGTH";
case cOCTVC1_GENERIC_RC_API_INVALID_CMD_ID:
return "cOCTVC1_GENERIC_RC_API_INVALID_CMD_ID";
+ case cOCTVC1_GENERIC_RC_API_ROUTING_ERROR:
+ return "cOCTVC1_GENERIC_RC_API_ROUTING_ERROR";
+ case cOCTVC1_GENERIC_RC_API_RSP_ERROR:
+ return "cOCTVC1_GENERIC_RC_API_RSP_ERROR";
case cOCTVC1_GENERIC_RC_MEMORY_LOCAL_ALLOC:
return "cOCTVC1_GENERIC_RC_MEMORY_LOCAL_ALLOC";
case cOCTVC1_GENERIC_RC_MEMORY_LOCAL_FREE:
@@ -244,6 +248,12 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE";
case cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START:
return "cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START";
+ case cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_START:
+ return "cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_START";
+ case cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_STOP:
+ return "cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_STOP";
+ case cOCTVC1_MAIN_RC_APPLICATION_MODULE_MAIN_CANNOT_BE_STOP:
+ return "cOCTVC1_MAIN_RC_APPLICATION_MODULE_MAIN_CANNOT_BE_STOP";
case cOCTVC1_MAIN_RC_CPU_USAGE_HANDLE_INVALID:
return "cOCTVC1_MAIN_RC_CPU_USAGE_HANDLE_INVALID";
case cOCTVC1_MAIN_RC_CPU_USAGE_THRESHOLD_INVALID:
@@ -266,6 +276,10 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_MAIN_RC_LOG_TRACE_ALREADY_START";
case cOCTVC1_MAIN_RC_LOG_TRACE_NOT_START:
return "cOCTVC1_MAIN_RC_LOG_TRACE_NOT_START";
+ case cOCTVC1_MAIN_RC_LOG_TRACE_MASK_INVALID:
+ return "cOCTVC1_MAIN_RC_LOG_TRACE_MASK_INVALID";
+ case cOCTVC1_MAIN_RC_LOG_TRACE_FILTER_PROCESS_EMPTY:
+ return "cOCTVC1_MAIN_RC_LOG_TRACE_FILTER_PROCESS_EMPTY";
case cOCTVC1_MAIN_RC_PROCESS_CPU_USAGE_MONITOR_INVALID_ALARM_THRESHOLD_HIGH_PERCENT:
return "cOCTVC1_MAIN_RC_PROCESS_CPU_USAGE_MONITOR_INVALID_ALARM_THRESHOLD_HIGH_PERCENT";
case cOCTVC1_MAIN_RC_PROCESS_CPU_USAGE_MONITOR_INVALID_ALARM_THRESHOLD_LOW_PERCENT:
@@ -314,6 +328,8 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_IRSC_RC_OBJMGR_INTERNAL_ERROR";
case cOCTVC1_IRSC_RC_OBJMGR_NOT_INIT:
return "cOCTVC1_IRSC_RC_OBJMGR_NOT_INIT";
+ case cOCTVC1_IRSC_RC_ROUTER_ROUTER_IF_INVALID:
+ return "cOCTVC1_IRSC_RC_ROUTER_ROUTER_IF_INVALID";
case cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_DISABLE:
return "cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_DISABLE";
case cOCTVC1_IRSC_RC_API_COMMAND_MAX_REACHED:
@@ -370,6 +386,10 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) return "cOCTVC1_GSM_RC_RF_CONFIG_INVALID_TX_ATTND_B";
case cOCTVC1_GSM_RC_TRX_CONFIG_INVALID_US_TSC:
return "cOCTVC1_GSM_RC_TRX_CONFIG_INVALID_US_TSC";
+ case cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__TCHFS:
+ return "cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__TCHFS";
+ case cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__RACH:
+ return "cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__RACH";
case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_FRAME_NUMBER:
return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_FRAME_NUMBER";
case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_DATA_LENGTH:
diff --git a/octvc1/octvc1_swap_hdrs.h b/octvc1/octvc1_swap_hdrs.h index a420284..3500dcf 100644 --- a/octvc1/octvc1_swap_hdrs.h +++ b/octvc1/octvc1_swap_hdrs.h @@ -2,7 +2,7 @@ File: octvc1_swap_hdrs.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_SWAP_HDRS_H__
@@ -53,7 +53,9 @@ extern "C" { #include "octvc1_file_swap.h"
#include "octvc1_module_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_api_swap.h"
#include "ctrl/octvc1_ctrl_api_swap.h"
diff --git a/octvc1/octvc1_tap.h b/octvc1/octvc1_tap.h index 410e21b..315d825 100644 --- a/octvc1/octvc1_tap.h +++ b/octvc1/octvc1_tap.h @@ -2,7 +2,7 @@ File: OCTVC1_TAP.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -46,21 +46,21 @@ $Revision: $ #define cOCTVC1_TAP_DIRECTION_ENUM_RX 1
/*-------------------------------------------------------------------------------------
- tOCTVC1_TAP_ID : TAP_ID : [ModuleId|Direction|Index].
- ModuleId -> cOCTVC1_MODULE_ID_ENUM_ .
+ tOCTVC1_TAP_ID : TAP_ID : [ApplicationModuleId|Direction|Index].
+ ModuleId (16bits)-> Application Module Id[tOCTVC1_MODULE_ID_ENUM|index] .
Direction -> cOCTVC1_TAP_DIRECTION_ENUM_ .
-------------------------------------------------------------------------------------*/
#define tOCTVC1_TAP_ID tOCT_UINT32
-#define cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT 0x000000FF
-#define cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET 24
+#define cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT 0x0000FFFF
+#define cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET 16
#define cOCTVC1_TAP_ID_MASK_MODULE_ID ((tOCT_UINT32)(cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET) )
#define cOCTVC1_TAP_ID_MASK_DIRECTION_BIT 0x000000FF
-#define cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET 16
+#define cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET 8
#define cOCTVC1_TAP_ID_MASK_DIRECTION ((tOCT_UINT32)(cOCTVC1_TAP_ID_MASK_DIRECTION_BIT<<cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET) )
-#define cOCTVC1_TAP_ID_MASK_INDEX_BIT 0x0000FFFF
+#define cOCTVC1_TAP_ID_MASK_INDEX_BIT 0x000000FF
#define cOCTVC1_TAP_ID_MASK_INDEX_BIT_OFFSET 0
#define cOCTVC1_TAP_ID_MASK_INDEX ((tOCT_UINT32)(cOCTVC1_TAP_ID_MASK_INDEX_BIT<<cOCTVC1_TAP_ID_MASK_INDEX_BIT_OFFSET) )
diff --git a/octvc1/octvc1_tap_swap.h b/octvc1/octvc1_tap_swap.h index 82ec673..6aba987 100644 --- a/octvc1/octvc1_tap_swap.h +++ b/octvc1/octvc1_tap_swap.h @@ -2,7 +2,7 @@ File: octvc1_tap_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_TAP_SWAP_H__
diff --git a/octvc1/octvc1_udp.h b/octvc1/octvc1_udp.h index e7e4582..ec4f80a 100644 --- a/octvc1/octvc1_udp.h +++ b/octvc1/octvc1_udp.h @@ -2,7 +2,7 @@ File: OCTVC1_UDP.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_user_id.h b/octvc1/octvc1_user_id.h new file mode 100644 index 0000000..8f2c8b3 --- /dev/null +++ b/octvc1/octvc1_user_id.h @@ -0,0 +1,57 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
+
+File: OCTVC1_USER_ID.h
+
+Copyright (c) 2016 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.05.00-B818 (2016/02/11)
+
+$Revision: $
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+
+#ifndef __OCTVC1_USER_ID_H__
+#define __OCTVC1_USER_ID_H__
+
+
+/***************************** INCLUDE FILES *******************************/
+#include "../octdev_types.h"
+#include "octvc1_base.h"
+#include "octvc1_module.h"
+
+
+/************************ COMMON DEFINITIONS *******************************/
+
+#define cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT 24 /* Number of bit the module id is shifted in user id. */
+
+/*-------------------------------------------------------------------------------------
+ Base process user id.
+ Octadf_internal Process user id.
+-------------------------------------------------------------------------------------*/
+#define tOCTVC1_USER_ID_PROCESS_ENUM tOCT_UINT32
+
+#define cOCTVC1_USER_ID_PROCESS_ENUM_INVALID 0x00000000
+#define cOCTVC1_USER_ID_PROCESS_ENUM_MAIN_APP ((tOCT_UINT32)((0x00000000)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
+#define cOCTVC1_USER_ID_PROCESS_ENUM_MAIN_ROUTER ((tOCT_UINT32)((0x00000001)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
+#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_DL_0 ((tOCT_UINT32)((0x00000100)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
+#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)) )
+
+
+#endif /* __OCTVC1_USER_ID_H__ */
+
diff --git a/octvc1/octvc1_user_id_swap.h b/octvc1/octvc1_user_id_swap.h new file mode 100644 index 0000000..e8e8a2d --- /dev/null +++ b/octvc1/octvc1_user_id_swap.h @@ -0,0 +1,52 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
+
+File: octvc1_user_id_swap.h
+
+Copyright (c) 2016 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.05.00-B818 (2016/02/11)
+
+\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
+#ifndef __OCTVC1_USER_ID_SWAP_H__
+#define __OCTVC1_USER_ID_SWAP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/***************************** INCLUDE FILES *******************************/
+#include "octvc1_swap_hdrs.h"
+#include "octvc1_user_id.h"
+
+/********************************* MACROS **********************************/
+
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( pType ){ \
+ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
+#else
+
+#define mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( pType )
+
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#ifdef __cplusplus
+}
+
+#endif
+
+#endif /* __OCTVC1_USER_ID_SWAP_H__ */
diff --git a/octvc1/octvc1_vlan.h b/octvc1/octvc1_vlan.h index eaed84f..0525101 100644 --- a/octvc1/octvc1_vlan.h +++ b/octvc1/octvc1_vlan.h @@ -2,7 +2,7 @@ File: OCTVC1_VLAN.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
diff --git a/octvc1/octvc1_vlan_swap.h b/octvc1/octvc1_vlan_swap.h index be6558c..460e4aa 100644 --- a/octvc1/octvc1_vlan_swap.h +++ b/octvc1/octvc1_vlan_swap.h @@ -2,7 +2,7 @@ File: octvc1_vlan_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_VLAN_SWAP_H__
diff --git a/octvc1/octvocnet_pkt.h b/octvc1/octvocnet_pkt.h index 9286714..4195de7 100644 --- a/octvc1/octvocnet_pkt.h +++ b/octvc1/octvocnet_pkt.h @@ -2,7 +2,7 @@ File: OCTVOCNET_PKT.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -63,6 +63,7 @@ $Revision: $ #define cOCTVOCNET_PKT_FORMAT_CTRL 0x00
#define cOCTVOCNET_PKT_FORMAT_F 0x01
#define cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT 0x02
+#define cOCTVOCNET_PKT_FORMAT_MODULE_DATA 0x03 /* Use to send OCTVC1 MODULE DATA */
/*-------------------------------------------------------------------------------------
VocalloNet Format Control Bit Shifted
@@ -70,9 +71,10 @@ $Revision: $ #define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_CTRL (cOCTVOCNET_PKT_FORMAT_CTRL<<cOCTVOCNET_PKT_FORMAT_BIT_OFFSET)
#define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_F (cOCTVOCNET_PKT_FORMAT_F<<cOCTVOCNET_PKT_FORMAT_BIT_OFFSET)
#define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_DATA_FRAGMENT (cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT<<cOCTVOCNET_PKT_FORMAT_BIT_OFFSET)
+#define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_MODULE_DATA (cOCTVOCNET_PKT_FORMAT_MODULE_DATA<<cOCTVOCNET_PKT_FORMAT_BIT_OFFSET)
/*-------------------------------------------------------------------------------------
- VocalloNet Packet sub-type Values
+ VocalloNet Packet F sub-type Values
-------------------------------------------------------------------------------------*/
#define cOCTVOCNET_PKT_SUBTYPE_UNSPECIFIED 0x0
#define cOCTVOCNET_PKT_SUBTYPE_API_EVENT 0x1
@@ -156,7 +158,7 @@ typedef struct ulTimestamp
bits[31:0] = Timestamp
ulSubType
- bits[31:4] = Reserved, bits[3:0] = SubType
+ bits[31:0] = SubType
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -175,11 +177,11 @@ typedef struct ulSequenceId
Sequence id.
ulTransfertTotalSize
- Total byte transert for that ulSequenceId (for all ulFragmentTotalNum fragment).
+ Total byte transert for that ulSequenceId (for all ulFragmentTotalCnt fragment).
If ulTransfertTotalSize set 0, the total ulTransfertTotalSize is unknown
- ulFragmentTotalNum
- Total number of fragment.
- If ulFragmentTotalNum set 0, the total ulFragmentTotalNum is unknown
+ ulFragmentTotalCnt
+ Total count of fragment.
+ If ulFragmentTotalCnt set 0, the total ulFragmentTotalCnt is unknown
ulFragmentId
Fragment id.
ulFragmentDataOffset
@@ -194,7 +196,7 @@ typedef struct tOCTVOCNET_PKT_DATA_F_HEADER DataHeader;
tOCT_UINT32 ulSequenceId;
tOCT_UINT32 ulTransfertTotalSize;
- tOCT_UINT32 ulFragmentTotalNum;
+ tOCT_UINT32 ulFragmentTotalCnt;
tOCT_UINT32 ulFragmentId;
tOCT_UINT32 ulFragmentDataOffset;
tOCT_UINT32 ulFragmentDataSize;
diff --git a/octvc1/octvocnet_pkt_swap.h b/octvc1/octvocnet_pkt_swap.h index 1e504c8..b3e18f7 100644 --- a/octvc1/octvocnet_pkt_swap.h +++ b/octvc1/octvocnet_pkt_swap.h @@ -2,7 +2,7 @@ File: octvocnet_pkt_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVOCNET_PKT_SWAP_H__
@@ -83,8 +83,8 @@ extern "C" { mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulSequenceId); \
((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulTransfertTotalSize = \
mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulTransfertTotalSize); \
- ((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentTotalNum = \
- mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentTotalNum); \
+ ((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentTotalCnt = \
+ mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentTotalCnt); \
((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentId = \
mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentId); \
((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentDataOffset = \
diff --git a/octvc1/pkt_api/octvc1_pkt_api.h b/octvc1/pkt_api/octvc1_pkt_api.h index 8919315..313e0fd 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.00.00-B1829 (2015/07/02)
+Release: Octasic Application Development Framework OCTADF-04.02.01-B2322 (2016/02/01)
$Revision: $
diff --git a/octvc1/pkt_api/octvc1_pkt_api_default.h b/octvc1/pkt_api/octvc1_pkt_api_default.h index 950adcd..1c273bc 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.00.00-B1829 (2015/07/02)
+Release: Octasic Application Development Framework OCTADF-04.02.01-B2322 (2016/02/01)
$Revision: $
@@ -264,7 +264,7 @@ extern "C" { { \
tOCTVC1_PKT_API_SESS_OPEN_PARMS * _pParms; \
_pParms = (_f_pParms); \
- _pParms->ulControlProcessFifoId = cOCTVC1_FIFO_ID_MGW_CONTROL; \
+ _pParms->ulControlProcessFifoId = cOCTVC1_FIFO_ID_CONTROL; \
_pParms->pUserSessionContext = NULL; \
_pParms->pSession = NULL; \
}
@@ -329,7 +329,7 @@ extern "C" { { \
tOCTVC1_PKT_API_DATA_SEND_PARMS * _pParms; \
_pParms = (_f_pParms); \
- _pParms->ulFormat = cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT; \
+ _pParms->ulFormat = cOCTVOCNET_PKT_FORMAT_MODULE_DATA; \
_pParms->ulLength = 0; \
_pParms->pData = NULL; \
}
diff --git a/octvc1/pkt_api/octvc1_pkt_api_rc.h b/octvc1/pkt_api/octvc1_pkt_api_rc.h index 0a0ebd7..6f14e5e 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/pkt_api/octvc1_pkt_api_version.h b/octvc1/pkt_api/octvc1_pkt_api_version.h index 245b30c..0ce555b 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) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.00.00-B1829 (2015/07/02)
+Release: Octasic Application Development Framework OCTADF-04.02.01-B2322 (2016/02/01)
$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 3
-#define cOCTVC1_PKT_API_VERSION_MAINTENANCE 0
-#define cOCTVC1_PKT_API_VERSION_BUILD 1829
+#define cOCTVC1_PKT_API_VERSION_MINOR 2
+#define cOCTVC1_PKT_API_VERSION_MAINTENANCE 1
+#define cOCTVC1_PKT_API_VERSION_BUILD 2322
#define cOCTVC1_PKT_API_VERSION_ID ( (cOCTVC1_PKT_API_VERSION_MAJOR << 25) + \
(cOCTVC1_PKT_API_VERSION_MINOR << 18) + \
diff --git a/octvc1/test/octvc1_test_api.h b/octvc1/test/octvc1_test_api.h index 354a523..836ee07 100644 --- a/octvc1/test/octvc1_test_api.h +++ b/octvc1/test/octvc1_test_api.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_API.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the definition of the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -66,7 +66,7 @@ $Revision: $ typedef struct
{
tOCTVC1_HANDLE_OBJECT ahObj[cOCTVC1_TEST_RUNNER_TEST_MAX_OBJ];
- tOCT_UINT8 szParms[(cOCTVC1_TEST_PARMS_MAX_LENGTH+1)];
+ tOCT_INT8 szParms[(cOCTVC1_TEST_PARMS_MAX_LENGTH+1)];
} tOCTVC1_TEST_EXEC_PARMS;
diff --git a/octvc1/test/octvc1_test_api_priv.h b/octvc1/test/octvc1_test_api_priv.h index 440cc96..88ca3f5 100644 --- a/octvc1/test/octvc1_test_api_priv.h +++ b/octvc1/test/octvc1_test_api_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_API_PRIV.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the definition of the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Revision: $
@@ -113,9 +113,9 @@ typedef struct {
tOCTVC1_MSG_HEADER Header;
tOCTVC1_HANDLE_OBJECT hDescr;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
- tOCT_UINT8 szDescription[(cOCTVC1_TEST_DESCR_MAX_LENGTH+1)];
- tOCT_UINT8 szUsage[(cOCTVC1_TEST_USAGE_MAX_LENGTH+1)];
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szDescription[(cOCTVC1_TEST_DESCR_MAX_LENGTH+1)];
+ tOCT_INT8 szUsage[(cOCTVC1_TEST_USAGE_MAX_LENGTH+1)];
} tOCTVC1_TEST_MSG_DESCR_INFO_RSP;
@@ -133,7 +133,7 @@ typedef struct typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
} tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CMD;
@@ -162,9 +162,9 @@ typedef struct {
tOCTVC1_MSG_HEADER Header;
tOCTVC1_HANDLE_OBJECT hDescr;
- tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
- tOCT_UINT8 szDescription[(cOCTVC1_TEST_DESCR_MAX_LENGTH+1)];
- tOCT_UINT8 szUsage[(cOCTVC1_TEST_USAGE_MAX_LENGTH+1)];
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szDescription[(cOCTVC1_TEST_DESCR_MAX_LENGTH+1)];
+ tOCT_INT8 szUsage[(cOCTVC1_TEST_USAGE_MAX_LENGTH+1)];
} tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_RSP;
@@ -342,7 +342,7 @@ typedef struct {
tOCTVC1_MSG_HEADER Header;
tOCTVC1_HANDLE_OBJECT hTest;
- tOCT_UINT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
+ tOCT_INT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
} tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_RSP;
@@ -490,7 +490,7 @@ typedef struct {
tOCTVC1_MSG_HEADER Header;
tOCTVC1_HANDLE_OBJECT hTest;
- tOCT_UINT8 szStats[(cOCTVC1_TEST_RUNNER_TEST_STATS_MAX_LENGTH+1)];
+ tOCT_INT8 szStats[(cOCTVC1_TEST_RUNNER_TEST_STATS_MAX_LENGTH+1)];
} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_RSP;
diff --git a/octvc1/test/octvc1_test_api_priv_swap.h b/octvc1/test/octvc1_test_api_priv_swap.h index 65c29b4..927b18a 100644 --- a/octvc1/test/octvc1_test_api_priv_swap.h +++ b/octvc1/test/octvc1_test_api_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
File: octvc1_test_api_priv_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/test/octvc1_test_api_swap.h b/octvc1/test/octvc1_test_api_swap.h index a2abebf..26a6404 100644 --- a/octvc1/test/octvc1_test_api_swap.h +++ b/octvc1/test/octvc1_test_api_swap.h @@ -2,7 +2,7 @@ File: octvc1_test_api_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_TEST_API_SWAP_H__
diff --git a/octvc1/test/octvc1_test_base.h b/octvc1/test/octvc1_test_base.h index cfc3561..0f4cedc 100644 --- a/octvc1/test/octvc1_test_base.h +++ b/octvc1/test/octvc1_test_base.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_BASE.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_default.h b/octvc1/test/octvc1_test_default.h index 3c3e92d..3a315a9 100644 --- a/octvc1/test/octvc1_test_default.h +++ b/octvc1/test/octvc1_test_default.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_DEFAULT.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the event definition of the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_default_priv.h b/octvc1/test/octvc1_test_default_priv.h index a4f6a13..4c62e19 100644 --- a/octvc1/test/octvc1_test_default_priv.h +++ b/octvc1/test/octvc1_test_default_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_DEFAULT_PRIV.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the event definition of the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_evt.h b/octvc1/test/octvc1_test_evt.h index 5ebd72b..32dd3d1 100644 --- a/octvc1/test/octvc1_test_evt.h +++ b/octvc1/test/octvc1_test_evt.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
File: OCTVC1_TEST_EVT.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the event definition of the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_evt_priv.h b/octvc1/test/octvc1_test_evt_priv.h index fc3d932..cdc8d32 100644 --- a/octvc1/test/octvc1_test_evt_priv.h +++ b/octvc1/test/octvc1_test_evt_priv.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
File: OCTVC1_TEST_EVT_PRIV.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the event definition of the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_evt_priv_swap.h b/octvc1/test/octvc1_test_evt_priv_swap.h index 42e1c62..30fbf06 100644 --- a/octvc1/test/octvc1_test_evt_priv_swap.h +++ b/octvc1/test/octvc1_test_evt_priv_swap.h @@ -1,7 +1,7 @@ /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
File: octvc1_test_evt_priv_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/test/octvc1_test_evt_swap.h b/octvc1/test/octvc1_test_evt_swap.h index 0c14301..0ebe50a 100644 --- a/octvc1/test/octvc1_test_evt_swap.h +++ b/octvc1/test/octvc1_test_evt_swap.h @@ -2,7 +2,7 @@ File: octvc1_test_evt_swap.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_TEST_EVT_SWAP_H__
diff --git a/octvc1/test/octvc1_test_id.h b/octvc1/test/octvc1_test_id.h index d132f81..03e50da 100644 --- a/octvc1/test/octvc1_test_id.h +++ b/octvc1/test/octvc1_test_id.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_ID.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the identifiers for the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_id_priv.h b/octvc1/test/octvc1_test_id_priv.h index 96d6356..8472d74 100644 --- a/octvc1/test/octvc1_test_id_priv.h +++ b/octvc1/test/octvc1_test_id_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_ID_PRIV.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the identifiers for the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -41,15 +41,15 @@ $Octasic_Revision: $ #define cOCTVC1_TEST_MSG_DESCR_STATS_CID ( 0x004 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID ( 0x010 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID ( 0x011 + cOCTVC1_TEST_CID_BASE )
-#define cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID ( 0x012 + cOCTVC1_TEST_CID_BASE )
-#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID ( 0x013 + cOCTVC1_TEST_CID_BASE )
+#define cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID ( ( 0x012 + cOCTVC1_TEST_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
+#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID ( ( 0x013 + cOCTVC1_TEST_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID ( 0x020 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID ( 0x021 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID ( 0x022 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID ( 0x023 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID ( 0x024 + cOCTVC1_TEST_CID_BASE )
-#define cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID ( 0x025 + cOCTVC1_TEST_CID_BASE )
-#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID ( 0x026 + cOCTVC1_TEST_CID_BASE )
+#define cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID ( ( 0x025 + cOCTVC1_TEST_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
+#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID ( ( 0x026 + cOCTVC1_TEST_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
#endif /* __OCTVC1_TEST_ID_PRIV_H__ */
diff --git a/octvc1/test/octvc1_test_rc.h b/octvc1/test/octvc1_test_rc.h index e10bcaa..f878a0e 100644 --- a/octvc1/test/octvc1_test_rc.h +++ b/octvc1/test/octvc1_test_rc.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_RC.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the return codes for the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_rc_priv.h b/octvc1/test/octvc1_test_rc_priv.h index 3d3021a..41d08b8 100644 --- a/octvc1/test/octvc1_test_rc_priv.h +++ b/octvc1/test/octvc1_test_rc_priv.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_RC_PRIV.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the return codes for the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_version.h b/octvc1/test/octvc1_test_version.h index 980f5e9..8d92fc8 100644 --- a/octvc1/test/octvc1_test_version.h +++ b/octvc1/test/octvc1_test_version.h @@ -2,7 +2,7 @@ File: OCTVC1_TEST_VERSION.h
-Copyright (c) 2015 Octasic Inc. All rights reserved.
+Copyright (c) 2016 Octasic Inc. All rights reserved.
Description: Contains the version of the TEST 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.03.00-B560 (2015/08/07)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B818 (2016/02/11)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $ bit[10:0]: Build number
*/
#define cOCTVC1_TEST_VERSION_MAJOR 1
-#define cOCTVC1_TEST_VERSION_MINOR 3
+#define cOCTVC1_TEST_VERSION_MINOR 5
#define cOCTVC1_TEST_VERSION_MAINTENANCE 0
-#define cOCTVC1_TEST_VERSION_BUILD 560
+#define cOCTVC1_TEST_VERSION_BUILD 818
#define cOCTVC1_TEST_VERSION_ID ( (cOCTVC1_TEST_VERSION_MAJOR << 25) + \
(cOCTVC1_TEST_VERSION_MINOR << 18) + \
|