diff --git a/application/tool/wireshark/1.2.6/plugins/oct_rfc4175_yuv_ws.dll b/application/tool/wireshark/1.2.6/plugins/oct_rfc4175_yuv_ws.dll index b4973b4..7a71619 100644 Binary files a/application/tool/wireshark/1.2.6/plugins/oct_rfc4175_yuv_ws.dll and b/application/tool/wireshark/1.2.6/plugins/oct_rfc4175_yuv_ws.dll differ diff --git a/application/tool/wireshark/1.2.6/plugins/octpkt_ws.dll b/application/tool/wireshark/1.2.6/plugins/octpkt_ws.dll index 8bf9d62..55dc659 100644 Binary files a/application/tool/wireshark/1.2.6/plugins/octpkt_ws.dll and b/application/tool/wireshark/1.2.6/plugins/octpkt_ws.dll differ diff --git a/application/tool/wireshark/1.6.5/plugins/oct_rfc4175_yuv_ws.dll b/application/tool/wireshark/1.6.5/plugins/oct_rfc4175_yuv_ws.dll index 1a2290b..409ca47 100644 Binary files a/application/tool/wireshark/1.6.5/plugins/oct_rfc4175_yuv_ws.dll and b/application/tool/wireshark/1.6.5/plugins/oct_rfc4175_yuv_ws.dll differ diff --git a/application/tool/wireshark/1.6.5/plugins/octpkt_ws.dll b/application/tool/wireshark/1.6.5/plugins/octpkt_ws.dll index b52c818..05a93de 100644 Binary files a/application/tool/wireshark/1.6.5/plugins/octpkt_ws.dll and b/application/tool/wireshark/1.6.5/plugins/octpkt_ws.dll differ diff --git a/application/tool/wireshark/plugins/octasic/include/oct_ws_macro.h b/application/tool/wireshark/plugins/octasic/include/oct_ws_macro.h index f5f6aaf..906affc 100644 --- a/application/tool/wireshark/plugins/octasic/include/oct_ws_macro.h +++ b/application/tool/wireshark/plugins/octasic/include/oct_ws_macro.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Octasic_Revision: 4 $ diff --git a/application/tool/wireshark/plugins/octasic/include/oct_ws_priv.h b/application/tool/wireshark/plugins/octasic/include/oct_ws_priv.h index ea33d90..5155284 100644 --- a/application/tool/wireshark/plugins/octasic/include/oct_ws_priv.h +++ b/application/tool/wireshark/plugins/octasic/include/oct_ws_priv.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Octasic_Revision: 4 $ diff --git a/application/tool/wireshark/plugins/octasic/include/oct_ws_version.h b/application/tool/wireshark/plugins/octasic/include/oct_ws_version.h index 0356513..ef88936 100644 --- a/application/tool/wireshark/plugins/octasic/include/oct_ws_version.h +++ b/application/tool/wireshark/plugins/octasic/include/oct_ws_version.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Octasic_Revision: 4 $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/module.h b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/module.h index 7a8ce21..71fabab 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/module.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/module.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Octasic_Revision: 4 $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octdev_common.h b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octdev_common.h index 2ef044c..cc27002 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octdev_common.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octdev_common.h @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octpkt_common.h b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octpkt_common.h index 852a275..ac37b15 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octpkt_common.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octpkt_common.h @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -38,6 +38,7 @@ $Octasic_Revision: $ ****************************************************************************/ extern const value_string vals_tOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK[13]; extern const value_string vals_tOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM[]; +extern const value_string vals_tOCTPKT_HDR_TYPE_ENUM[]; extern const value_string vals_tOCTPKT_HDRXL_FORMAT_PROTO_TYPE_LEN_MASK[10]; #endif /* _OCTPKT_COMMON_H__ */ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvc1_common.h b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvc1_common.h index 30e0bc5..98fb309 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvc1_common.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvc1_common.h @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -53,6 +53,8 @@ extern const value_string vals_tOCTVC1_LOG_TRACE_MASK[11]; extern const value_string vals_tOCTVC1_FILE_TYPE_ENUM[]; extern const value_string vals_tOCTVC1_FILE_FORMAT_ENUM[]; extern const value_string vals_tOCTVC1_MODULE_ID_ENUM[]; +extern const value_string vals_tOCTVC1_TAP_DIRECTION_ENUM[]; +extern const value_string vals_tOCTVC1_TAP_ID[10]; extern const value_string vals_tOCTVC1_RADIO_STANDARD_ENUM[]; extern const value_string vals_tOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM[]; extern const value_string vals_tOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM[]; @@ -68,21 +70,14 @@ extern const value_string vals_tOCTVC1_PROCESS_TASK_STATE_ENUM[]; /**************************************************************************** COMMON API DISSECTOR ****************************************************************************/ -extern unsigned int dissect_tOCTVC1_CURSOR_HANDLE_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); -extern unsigned int dissect_tOCTVC1_CURSOR_HANDLE_GET_HANDLE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); -extern unsigned int dissect_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); -extern unsigned int dissect_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET_HANDLE_OBJECT(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_CURSOR_INDEX_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_CURSOR_INDEX_GET_SUB_INDEX(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); -extern unsigned int dissect_tOCTVC1_HANDLE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_OBJECT32_NAME(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_VLAN_TAG(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_VLAN_HEADER_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); -extern unsigned int dissect_tOCTVC1_LIST_HANDLE_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); -extern unsigned int dissect_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_LIST_HANDLE_OBJECT_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_LIST_NAME_OBJECT32_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); @@ -93,6 +88,7 @@ extern unsigned int dissect_tOCTVC1_MSG_HEADER(tvbuff_t *tvb, packet_info *pinf extern unsigned int dissect_tOCTVC1_EVENT_HEADER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_LOG_HEADER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_FILE_HEADER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); +extern unsigned int dissect_tOCTVC1_MODULE_DATA(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_API_SESSION_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_API_SESSION_EVT_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); extern unsigned int dissect_tOCTVC1_PROCESS_ERROR(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ); diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvocnet_common.h b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvocnet_common.h index 3f42501..d06fb11 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvocnet_common.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/octvocnet_common.h @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/plugin_info.h b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/plugin_info.h index cebec28..28981cd 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/plugin_info.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/plugin_info.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Octasic_Revision: 4 $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/ws_util.h b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/ws_util.h index 1c5c8f8..dde46cd 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/ws_util.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/include/ws_util.h @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Octasic_Revision: 4 $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/octvc1.pcap b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/octvc1.pcap index b548173..035d674 100644 Binary files a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/octvc1.pcap and b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/octvc1.pcap differ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octdev_common.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octdev_common.c index 0cc8bf2..3e58f9f 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octdev_common.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octdev_common.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octpkt_common.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octpkt_common.c index 35b5dcb..3dc2faf 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octpkt_common.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octpkt_common.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -69,6 +69,14 @@ const value_string vals_tOCTPKT_HDR_CONTROL_PROTOCOL_TYPE_ENUM[] = { 0, NULL } }; +const value_string vals_tOCTPKT_HDR_TYPE_ENUM[] = + { + { cOCTPKT_HDR_TYPE_ENUM_NONE, "cOCTPKT_HDR_TYPE_ENUM_NONE" }, + { cOCTPKT_HDR_TYPE_ENUM_NORMAL, "cOCTPKT_HDR_TYPE_ENUM_NORMAL" }, + { cOCTPKT_HDR_TYPE_ENUM_XL, "cOCTPKT_HDR_TYPE_ENUM_XL" }, + { 0, NULL } + }; + #include /**************************************************************************** diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_cid_eid_value_string.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_cid_eid_value_string.c index 5fcd113..8d8f62b 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_cid_eid_value_string.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_cid_eid_value_string.c @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -71,6 +71,7 @@ const value_string vals_OCTVC1_MAIN_CID[] = { (cOCTVC1_MAIN_MSG_FILE_LIST_CID& 0x00000FFF), "FILE_LIST" }, { (cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID& 0x00000FFF), "FILE_SYSTEM_INFO" }, { (cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID& 0x00000FFF), "FILE_SYSTEM_INFO_FILE" }, + { (cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID& 0x00000FFF), "FILE_SYSTEM_ADD_FILE" }, { (cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID& 0x00000FFF), "FILE_SYSTEM_DELETE_FILE" }, { (cOCTVC1_MAIN_MSG_LOG_ERASE_CID& 0x00000FFF), "LOG_ERASE" }, { (cOCTVC1_MAIN_MSG_LOG_INFO_CID& 0x00000FFF), "LOG_INFO" }, @@ -98,6 +99,9 @@ const value_string vals_OCTVC1_MAIN_CID[] = { (cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID& 0x00000FFF), "APPLICATION_STOP" }, { (cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID& 0x00000FFF), "APPLICATION_INFO" }, { (cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID& 0x00000FFF), "APPLICATION_INFO_SYSTEM" }, + { (cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID& 0x00000FFF), "APPLICATION_LIST_MODULE" }, + { (cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID& 0x00000FFF), "APPLICATION_INFO_MODULE" }, + { (cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID& 0x00000FFF), "APPLICATION_STATS_MODULE" }, { 0, NULL }, }; const value_string vals_OCTVC1_MAIN_CID_PRIV[] = @@ -196,9 +200,7 @@ const value_string vals_OCTVC1_HW_CID[] = { (cOCTVC1_HW_MSG_RF_PORT_LIST_CID& 0x00000FFF), "RF_PORT_LIST" }, { (cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID& 0x00000FFF), "RF_PORT_LIST_ANTENNA" }, { (cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID& 0x00000FFF), "RF_PORT_INFO_ANTENNA_RX_CONFIG" }, - { (cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID& 0x00000FFF), "RF_PORT_MODIFY_ANTENNA_RX_CONFIG" }, { (cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID& 0x00000FFF), "RF_PORT_INFO_ANTENNA_TX_CONFIG" }, - { (cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CID& 0x00000FFF), "RF_PORT_MODIFY_ANTENNA_TX_CONFIG" }, { (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID& 0x00000FFF), "CLOCK_SYNC_MGR_INFO" }, { (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID& 0x00000FFF), "CLOCK_SYNC_MGR_STATS" }, { (cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID& 0x00000FFF), "CLOCK_SYNC_MGR_INFO_SOURCE" }, @@ -243,6 +245,11 @@ const value_string vals_OCTVC1_IRSC_CID[] = { (cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID& 0x00000FFF), "API_SYSTEM_STATS_SESSION" }, { (cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID& 0x00000FFF), "API_SYSTEM_INFO_SESSION_EVT" }, { (cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID& 0x00000FFF), "API_SYSTEM_STATS_SESSION_EVT" }, + { (cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID& 0x00000FFF), "APPLICATION_LIST_TAP" }, + { (cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID& 0x00000FFF), "APPLICATION_INFO_TAP" }, + { (cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID& 0x00000FFF), "APPLICATION_STATS_TAP" }, + { (cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID& 0x00000FFF), "APPLICATION_START_TAP" }, + { (cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID& 0x00000FFF), "APPLICATION_STOP_TAP" }, { 0, NULL }, }; const value_string vals_OCTVC1_IRSC_CID_PRIV[] = @@ -272,6 +279,7 @@ const value_string vals_OCTVC1_GSM_CID[] = { (cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID& 0x00000FFF), "TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS" }, { (cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID& 0x00000FFF), "TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME" }, { (cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID& 0x00000FFF), "TRX_REQUEST_LOGICAL_CHANNEL_DATA" }, + { (cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID& 0x00000FFF), "TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST" }, { (cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID& 0x00000FFF), "TRX_ACTIVATE_PHYSICAL_CHANNEL" }, { (cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID& 0x00000FFF), "TRX_DEACTIVATE_PHYSICAL_CHANNEL" }, { (cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID& 0x00000FFF), "TRX_STATUS_PHYSICAL_CHANNEL" }, @@ -281,6 +289,10 @@ const value_string vals_OCTVC1_GSM_CID[] = { (cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID& 0x00000FFF), "TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING" }, { (cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID& 0x00000FFF), "TRX_INFO_PHYSICAL_CHANNEL_CIPHERING" }, { (cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID& 0x00000FFF), "TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT" }, + { (cOCTVC1_GSM_MSG_TAP_FILTER_LIST_CID& 0x00000FFF), "TAP_FILTER_LIST" }, + { (cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID& 0x00000FFF), "TAP_FILTER_INFO" }, + { (cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID& 0x00000FFF), "TAP_FILTER_STATS" }, + { (cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID& 0x00000FFF), "TAP_FILTER_MODIFY" }, { 0, NULL }, }; const value_string vals_OCTVC1_GSM_CID_PRIV[] = diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_common.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_common.c index d200caa..aab4b22 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_common.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_common.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -57,155 +57,6 @@ const value_string vals_tOCTVC1_OBJECT_CURSOR_ENUM[] = COMMON Registered ****************************************************************************/ -int ahf_tOCTVC1_CURSOR_HANDLE_GET[2]; -tWS_ENTITY_HANDLE ws_htOCTVC1_CURSOR_HANDLE_GET; - -void register_tOCTVC1_CURSOR_HANDLE_GET(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET[0], - { "hObject", "octvc1.cursor.handle_get.hobject", - FT_NONE, BASE_NONE, NULL, 0x0, - "hObject",HFILL } - - }, - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET[1], - { "ulGetMode", "octvc1.cursor.handle_get.ulgetmode", - FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_OBJECT_CURSOR_ENUM), 0x0, - "ulGetMode",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_CURSOR_HANDLE_GET.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - -int ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE[3]; -tWS_ENTITY_HANDLE ws_htOCTVC1_CURSOR_HANDLE_GET_HANDLE; - -void register_tOCTVC1_CURSOR_HANDLE_GET_HANDLE(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE[0], - { "hObject", "octvc1.cursor.handle_get_handle.hobject", - FT_NONE, BASE_NONE, NULL, 0x0, - "hObject",HFILL } - - }, - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE[1], - { "ulGetMode", "octvc1.cursor.handle_get_handle.ulgetmode", - FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_OBJECT_CURSOR_ENUM), 0x0, - "ulGetMode",HFILL } - - }, - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE[2], - { "hSubObject", "octvc1.cursor.handle_get_handle.hsubobject", - FT_NONE, BASE_NONE, NULL, 0x0, - "hSubObject",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_CURSOR_HANDLE_GET_HANDLE.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - -int ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT[3]; -tWS_ENTITY_HANDLE ws_htOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT; - -void register_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT[0], - { "hObject", "octvc1.cursor.handle_get_handle_object.hobject", - FT_NONE, BASE_NONE, NULL, 0x0, - "hObject",HFILL } - - }, - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT[1], - { "ulGetMode", "octvc1.cursor.handle_get_handle_object.ulgetmode", - FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_OBJECT_CURSOR_ENUM), 0x0, - "ulGetMode",HFILL } - - }, - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT[2], - { "hHandleObject", "octvc1.cursor.handle_get_handle_object.hhandleobject", - FT_UINT32,BASE_HEX, NULL, 0x0, - "hHandleObject",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - -int ahf_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID[3]; -tWS_ENTITY_HANDLE ws_htOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID; - -void register_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID[0], - { "hObject", "octvc1.cursor.handle_get_sub_object_id.hobject", - FT_NONE, BASE_NONE, NULL, 0x0, - "hObject",HFILL } - - }, - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID[1], - { "ulGetMode", "octvc1.cursor.handle_get_sub_object_id.ulgetmode", - FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_OBJECT_CURSOR_ENUM), 0x0, - "ulGetMode",HFILL } - - }, - { - &ahf_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID[2], - { "ulSubObjectId", "octvc1.cursor.handle_get_sub_object_id.ulsubobjectid", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulSubObjectId",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - int ahf_tOCTVC1_CURSOR_HANDLE_OBJECT_GET[2]; tWS_ENTITY_HANDLE ws_htOCTVC1_CURSOR_HANDLE_OBJECT_GET; @@ -392,217 +243,6 @@ void register_tOCTVC1_CURSOR_INDEX_GET_SUB_INDEX(void) ****************************************************************************/ -unsigned int dissect_tOCTVC1_CURSOR_HANDLE_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_CURSOR_HANDLE_GET))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_CURSOR_HANDLE_GET (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_CURSOR_HANDLE_GET)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - bytes = sizeof(tOCTVC1_CURSOR_HANDLE_GET); - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET, hObject), "hObject:tOCTVC1_HANDLE"); - { - proto_tree* sub_tree2; - sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); - offset = dissect_tOCTVC1_HANDLE( tvb, pinfo, sub_tree2, offset, pExtValue ); - } - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET[1], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET, ulGetMode), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET, ulGetMode); - - } - - - return offset; - -}; - - -unsigned int dissect_tOCTVC1_CURSOR_HANDLE_GET_HANDLE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_CURSOR_HANDLE_GET_HANDLE))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_CURSOR_HANDLE_GET_HANDLE (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_CURSOR_HANDLE_GET_HANDLE)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - bytes = sizeof(tOCTVC1_CURSOR_HANDLE_GET_HANDLE); - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE, hObject), "hObject:tOCTVC1_HANDLE"); - { - proto_tree* sub_tree2; - sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); - offset = dissect_tOCTVC1_HANDLE( tvb, pinfo, sub_tree2, offset, pExtValue ); - } - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE[1], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE, ulGetMode), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE, ulGetMode); - - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE, hSubObject), "hSubObject:tOCTVC1_HANDLE"); - { - proto_tree* sub_tree2; - sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); - offset = dissect_tOCTVC1_HANDLE( tvb, pinfo, sub_tree2, offset, pExtValue ); - } - } - - - return offset; - -}; - - -unsigned int dissect_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - bytes = sizeof(tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT); - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT, hObject), "hObject:tOCTVC1_HANDLE"); - { - proto_tree* sub_tree2; - sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); - offset = dissect_tOCTVC1_HANDLE( tvb, pinfo, sub_tree2, offset, pExtValue ); - } - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT[1], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT, ulGetMode), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT, ulGetMode); - - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT[2], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT, hHandleObject), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT[2], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT, hHandleObject); - - } - - - return offset; - -}; - - -unsigned int dissect_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - bytes = sizeof(tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID); - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID, hObject), "hObject:tOCTVC1_HANDLE"); - { - proto_tree* sub_tree2; - sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); - offset = dissect_tOCTVC1_HANDLE( tvb, pinfo, sub_tree2, offset, pExtValue ); - } - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID[1], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID, ulGetMode), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID, ulGetMode); - - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID[2], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID, ulSubObjectId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID[2], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID, ulSubObjectId); - - } - - - return offset; - -}; - - unsigned int dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) { proto_tree *field_tree = tree; @@ -924,31 +564,6 @@ const value_string vals_tOCTVC1_ETH_PORT_ID_ENUM[] = COMMON Registered ****************************************************************************/ -int ahf_tOCTVC1_HANDLE[1]; -tWS_ENTITY_HANDLE ws_htOCTVC1_HANDLE; - -void register_tOCTVC1_HANDLE(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_HANDLE[0], - { "aulHandle", "octvc1.handle.toctvc1_handle.aulhandle", - FT_UINT32,BASE_HEX, NULL, 0x0, - "aulHandle",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_HANDLE.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - int ahf_tOCTVC1_OBJECT32_NAME[2]; tWS_ENTITY_HANDLE ws_htOCTVC1_OBJECT32_NAME; @@ -986,52 +601,6 @@ void register_tOCTVC1_OBJECT32_NAME(void) ****************************************************************************/ -unsigned int dissect_tOCTVC1_HANDLE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_HANDLE))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HANDLE (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_HANDLE)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - bytes = sizeof(tOCTVC1_HANDLE); - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_HANDLE, aulHandle), "aulHandle"); - { - int i, ofs=offset; - proto_tree* sub_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); - for( i=0; i<3; i++ ) - { - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(sub_tree, ahf_tOCTVC1_HANDLE[0], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_HANDLE, aulHandle), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint_format(sub_tree, ahf_tOCTVC1_HANDLE[0], tvb, offset, - 4, temp_data, "[%d]: 0x%08x", i, temp_data ); - } - offset+=4; - } - } - } - - - return offset; - -}; - - unsigned int dissect_tOCTVC1_OBJECT32_NAME(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) { proto_tree *field_tree = tree; @@ -1323,77 +892,6 @@ unsigned int dissect_tOCTVC1_VLAN_HEADER_INFO(tvbuff_t *tvb, packet_info *pinfo COMMON Registered ****************************************************************************/ -int ahf_tOCTVC1_LIST_HANDLE_GET[2]; -tWS_ENTITY_HANDLE ws_htOCTVC1_LIST_HANDLE_GET; - -void register_tOCTVC1_LIST_HANDLE_GET(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_LIST_HANDLE_GET[0], - { "ulNumHandle", "octvc1.list.handle_get.ulnumhandle", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulNumHandle",HFILL } - - }, - { - &ahf_tOCTVC1_LIST_HANDLE_GET[1], - { "aHandle", "octvc1.list.handle_get.ahandle", - FT_NONE, BASE_NONE, NULL, 0x0, - "aHandle",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_LIST_HANDLE_GET.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - -int ahf_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID[3]; -tWS_ENTITY_HANDLE ws_htOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID; - -void register_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID[0], - { "hParent", "octvc1.list.handle_get_sub_object_id.hparent", - FT_NONE, BASE_NONE, NULL, 0x0, - "hParent",HFILL } - - }, - { - &ahf_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID[1], - { "ulNumSubObjectId", "octvc1.list.handle_get_sub_object_id.ulnumsubobjectid", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulNumSubObjectId",HFILL } - - }, - { - &ahf_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID[2], - { "aSubObjectId", "octvc1.list.handle_get_sub_object_id.asubobjectid", - FT_UINT32,BASE_HEX, NULL, 0x0, - "aSubObjectId",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - int ahf_tOCTVC1_LIST_HANDLE_OBJECT_GET[2]; tWS_ENTITY_HANDLE ws_htOCTVC1_LIST_HANDLE_OBJECT_GET; @@ -1612,125 +1110,6 @@ void register_tOCTVC1_LIST_INDEX_GET_SUB_INDEX(void) ****************************************************************************/ -unsigned int dissect_tOCTVC1_LIST_HANDLE_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_LIST_HANDLE_GET))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_LIST_HANDLE_GET (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_LIST_HANDLE_GET)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - bytes = sizeof(tOCTVC1_LIST_HANDLE_GET); - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_LIST_HANDLE_GET[0], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_LIST_HANDLE_GET, ulNumHandle), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_LIST_HANDLE_GET[0], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_LIST_HANDLE_GET, ulNumHandle); - - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_LIST_HANDLE_GET, aHandle), "aHandle:tOCTVC1_HANDLE"); - { - int i, ofs=offset; - proto_tree* sub_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); - for( i=0; i<100; i++ ) - { - { - proto_tree* sub_tree2; - ti = proto_tree_add_text(sub_tree, tvb, offset, - sizeof(tOCTVC1_HANDLE), "[%d]:", i); - sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); - offset = dissect_tOCTVC1_HANDLE( tvb, pinfo, sub_tree2, offset, pExtValue ); - } - } - } - } - - - return offset; - -}; - - -unsigned int dissect_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - bytes = sizeof(tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID); - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID, hParent), "hParent:tOCTVC1_HANDLE"); - { - proto_tree* sub_tree2; - sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); - offset = dissect_tOCTVC1_HANDLE( tvb, pinfo, sub_tree2, offset, pExtValue ); - } - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID[1], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID, ulNumSubObjectId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID, ulNumSubObjectId); - - ti = proto_tree_add_text(field_tree, tvb, offset, - mWS_FIELDSIZE(tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID, aSubObjectId), "aSubObjectId"); - { - int i, ofs=offset; - proto_tree* sub_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); - for( i=0; i<100; i++ ) - { - temp_data = tvb_get_ntohl( tvb, offset ); - if( pExtValue && (pExtValue->lValue == temp_data ) ) - { - ti = proto_tree_add_uint_format_value(sub_tree, ahf_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID[2], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID, aSubObjectId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); - }else - { - ti = proto_tree_add_uint_format(sub_tree, ahf_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID[2], tvb, offset, - 4, temp_data, "[%d]: 0x%08x", i, temp_data ); - } - offset+=4; - } - } - } - - - return offset; - -}; - - unsigned int dissect_tOCTVC1_LIST_HANDLE_OBJECT_GET(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) { proto_tree *field_tree = tree; @@ -2732,6 +2111,7 @@ const value_string vals_tOCTVC1_MODULE_ID_ENUM[] = { cOCTVC1_MODULE_ID_ENUM_TEST, "cOCTVC1_MODULE_ID_ENUM_TEST" }, { cOCTVC1_MODULE_ID_ENUM_HW, "cOCTVC1_MODULE_ID_ENUM_HW" }, { cOCTVC1_MODULE_ID_ENUM_IRSC, "cOCTVC1_MODULE_ID_ENUM_IRSC" }, + { cOCTVC1_MODULE_ID_ENUM_OBM, "cOCTVC1_MODULE_ID_ENUM_OBM" }, { cOCTVC1_MODULE_ID_ENUM_SDR, "cOCTVC1_MODULE_ID_ENUM_SDR" }, { cOCTVC1_MODULE_ID_ENUM_GSM, "cOCTVC1_MODULE_ID_ENUM_GSM" }, { cOCTVC1_MODULE_ID_ENUM_LTE, "cOCTVC1_MODULE_ID_ENUM_LTE" }, @@ -2740,6 +2120,123 @@ const value_string vals_tOCTVC1_MODULE_ID_ENUM[] = { 0, NULL } }; +/**************************************************************************** + COMMON Registered + ****************************************************************************/ + +int ahf_tOCTVC1_MODULE_DATA[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MODULE_DATA; + +void register_tOCTVC1_MODULE_DATA(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MODULE_DATA[0], + { "ulModuleId", "octvc1.module.data.ulmoduleid", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_MODULE_ID_ENUM), 0x0, + "ulModuleId",HFILL } + + }, + { + &ahf_tOCTVC1_MODULE_DATA[1], + { "ulModuleDataId", "octvc1.module.data.ulmoduledataid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulModuleDataId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MODULE_DATA.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +/**************************************************************************** + COMMON dissectors + ****************************************************************************/ + + +unsigned int dissect_tOCTVC1_MODULE_DATA(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MODULE_DATA))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MODULE_DATA (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MODULE_DATA)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_MODULE_DATA); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_MODULE_DATA[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MODULE_DATA, ulModuleId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MODULE_DATA[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MODULE_DATA, ulModuleId); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_MODULE_DATA[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MODULE_DATA, ulModuleDataId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MODULE_DATA[1], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MODULE_DATA, ulModuleDataId); + + } + + + return offset; + +}; + +#include + +/**************************************************************************** + MODULE API ENUMERATION STRING VALUES + ****************************************************************************/ + +const value_string vals_tOCTVC1_TAP_DIRECTION_ENUM[] = + { + { cOCTVC1_TAP_DIRECTION_ENUM_TX, "cOCTVC1_TAP_DIRECTION_ENUM_TX" }, + { cOCTVC1_TAP_DIRECTION_ENUM_RX, "cOCTVC1_TAP_DIRECTION_ENUM_RX" }, + { 0, NULL } + }; + +const value_string vals_tOCTVC1_TAP_ID[] = + { + { cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT, "cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT" }, + { cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET, "cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET" }, + { cOCTVC1_TAP_ID_MASK_MODULE_ID, "cOCTVC1_TAP_ID_MASK_MODULE_ID" }, + { cOCTVC1_TAP_ID_MASK_DIRECTION_BIT, "cOCTVC1_TAP_ID_MASK_DIRECTION_BIT" }, + { cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET, "cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET" }, + { cOCTVC1_TAP_ID_MASK_DIRECTION, "cOCTVC1_TAP_ID_MASK_DIRECTION" }, + { cOCTVC1_TAP_ID_MASK_INDEX_BIT, "cOCTVC1_TAP_ID_MASK_INDEX_BIT" }, + { cOCTVC1_TAP_ID_MASK_INDEX_BIT_OFFSET, "cOCTVC1_TAP_ID_MASK_INDEX_BIT_OFFSET" }, + { cOCTVC1_TAP_ID_MASK_INDEX, "cOCTVC1_TAP_ID_MASK_INDEX" }, + { 0, NULL } + }; + #include /**************************************************************************** @@ -2757,9 +2254,13 @@ const value_string vals_tOCTVC1_RADIO_STANDARD_ENUM[] = const value_string vals_tOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM[] = { + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_380, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_380" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_410, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_410" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_450, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_450" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_480, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_480" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_710, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_710" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_750, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_750" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_810, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_810" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_850, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_850" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_E_900, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_E_900" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_P_900, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_GSM_ENUM_P_900" }, @@ -2778,10 +2279,39 @@ const value_string vals_tOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM[] = { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_3, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_3" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_4, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_4" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_5, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_5" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_6, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_6" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_7, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_7" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_8, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_8" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_9, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_9" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_10, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_10" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_11, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_11" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_12, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_12" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_13, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_13" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_14, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_14" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_15, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_15" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_16, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_16" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_17, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_17" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_18, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_18" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_19, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_19" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_20, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_20" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_21, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_21" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_22, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_22" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_23, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_23" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_24, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_24" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_25, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_25" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_26, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_26" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_2, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_2" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_4, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_4" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_5, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_5" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_6, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_6" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_7, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_7" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_10, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_10" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_12, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_12" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_13, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_13" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_14, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_14" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_19, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_19" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_25, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_25" }, + { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_26, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_ADD_26" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_LAST, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_LAST" }, { cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_INVALID, "cOCTVC1_RADIO_STANDARD_FREQ_BAND_UMTS_ENUM_INVALID" }, { 0, NULL } @@ -3634,21 +3164,14 @@ unsigned int dissect_tOCTVC1_PROCESS_CPU_USAGE_STATS(tvbuff_t *tvb, packet_info void ws_register_OCTVC1_common(void) { - register_tOCTVC1_CURSOR_HANDLE_GET(); - register_tOCTVC1_CURSOR_HANDLE_GET_HANDLE(); - register_tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT(); - register_tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID(); register_tOCTVC1_CURSOR_HANDLE_OBJECT_GET(); register_tOCTVC1_CURSOR_HANDLE_OBJECT_GET_HANDLE_OBJECT(); register_tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID(); register_tOCTVC1_CURSOR_INDEX_GET(); register_tOCTVC1_CURSOR_INDEX_GET_SUB_INDEX(); - register_tOCTVC1_HANDLE(); register_tOCTVC1_OBJECT32_NAME(); register_tOCTVC1_VLAN_TAG(); register_tOCTVC1_VLAN_HEADER_INFO(); - register_tOCTVC1_LIST_HANDLE_GET(); - register_tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID(); register_tOCTVC1_LIST_HANDLE_OBJECT_GET(); register_tOCTVC1_LIST_NAME_OBJECT32_GET(); register_tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME(); @@ -3659,6 +3182,7 @@ void ws_register_OCTVC1_common(void) register_tOCTVC1_EVENT_HEADER(); register_tOCTVC1_LOG_HEADER(); register_tOCTVC1_FILE_HEADER(); + register_tOCTVC1_MODULE_DATA(); register_tOCTVC1_API_SESSION_INFO(); register_tOCTVC1_API_SESSION_EVT_INFO(); register_tOCTVC1_PROCESS_ERROR(); diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_ctrl.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_ctrl.c index 84932e5..88282bd 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_ctrl.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_ctrl.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_gsm.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_gsm.c index c86a203..73beda1 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_gsm.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_gsm.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -277,6 +277,22 @@ const value_string vals_tOCTVC1_GSM_TRX_STATUS_ENUM[] = { 0, NULL } }; +const value_string vals_tOCTVC1_GSM_TAP_FILTER_TYPE_ENUM[] = + { + { cOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_NONE, "cOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_NONE" }, + { cOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_TRX, "cOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_TRX" }, + { cOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_PHYSICAL_CHANNEL, "cOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_PHYSICAL_CHANNEL" }, + { cOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_LOGICAL_CHANNEL, "cOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_LOGICAL_CHANNEL" }, + { 0, NULL } + }; + +const value_string vals_tOCTVC1_GSM_TAP_FILTER_MASK[] = + { + { cOCTVC1_GSM_TAP_FILTER_MASK_NONE, "cOCTVC1_GSM_TAP_FILTER_MASK_NONE" }, + { cOCTVC1_GSM_TAP_FILTER_MASK_REMOVE_REJECTED_DATA, "cOCTVC1_GSM_TAP_FILTER_MASK_REMOVE_REJECTED_DATA" }, + { 0, NULL } + }; + /**************************************************************************** COMMON Registered ****************************************************************************/ @@ -905,7 +921,7 @@ void register_tOCTVC1_GSM_LOGICAL_CHANNEL_RAW_DATA(void) }; -int ahf_tOCTVC1_GSM_MEASUREMENT_INFO[7]; +int ahf_tOCTVC1_GSM_MEASUREMENT_INFO[8]; tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MEASUREMENT_INFO; void register_tOCTVC1_GSM_MEASUREMENT_INFO(void) @@ -914,16 +930,16 @@ void register_tOCTVC1_GSM_MEASUREMENT_INFO(void) { { &ahf_tOCTVC1_GSM_MEASUREMENT_INFO[0], - { "sSNR", "octvc1.gsm.measurement_info.ssnr", + { "sSNRDb", "octvc1.gsm.measurement_info.ssnrdb", FT_INT16,BASE_DEC, NULL, 0x0, - "sSNR",HFILL } + "sSNRDb",HFILL } }, { &ahf_tOCTVC1_GSM_MEASUREMENT_INFO[1], - { "sRSSI", "octvc1.gsm.measurement_info.srssi", + { "sRSSIDbm", "octvc1.gsm.measurement_info.srssidbm", FT_INT16,BASE_DEC, NULL, 0x0, - "sRSSI",HFILL } + "sRSSIDbm",HFILL } }, { @@ -935,29 +951,36 @@ void register_tOCTVC1_GSM_MEASUREMENT_INFO(void) }, { &ahf_tOCTVC1_GSM_MEASUREMENT_INFO[3], - { "usBERCount", "octvc1.gsm.measurement_info.usbercount", - FT_UINT16,BASE_HEX, NULL, 0x0, - "usBERCount",HFILL } + { "sBurstTiming4x", "octvc1.gsm.measurement_info.sbursttiming4x", + FT_INT16,BASE_DEC, NULL, 0x0, + "sBurstTiming4x",HFILL } }, { &ahf_tOCTVC1_GSM_MEASUREMENT_INFO[4], - { "usBERTOtalBitCOunt", "octvc1.gsm.measurement_info.usbertotalbitcount", + { "usBERCnt", "octvc1.gsm.measurement_info.usbercnt", FT_UINT16,BASE_HEX, NULL, 0x0, - "usBERTOtalBitCOunt",HFILL } + "usBERCnt",HFILL } }, { &ahf_tOCTVC1_GSM_MEASUREMENT_INFO[5], - { "usRxQualFullUp", "octvc1.gsm.measurement_info.usrxqualfullup", - FT_UINT8,BASE_HEX, NULL, 0x0, - "usRxQualFullUp",HFILL } + { "usBERTotalBitCnt", "octvc1.gsm.measurement_info.usbertotalbitcnt", + FT_UINT16,BASE_HEX, NULL, 0x0, + "usBERTotalBitCnt",HFILL } }, { &ahf_tOCTVC1_GSM_MEASUREMENT_INFO[6], + { "usRxQualFullUp", "octvc1.gsm.measurement_info.usrxqualfullup", + FT_UINT16,BASE_HEX, NULL, 0x0, + "usRxQualFullUp",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MEASUREMENT_INFO[7], { "usRxLevelFullUp", "octvc1.gsm.measurement_info.usrxlevelfullup", - FT_UINT8,BASE_HEX, NULL, 0x0, + FT_UINT16,BASE_HEX, NULL, 0x0, "usRxLevelFullUp",HFILL } }, @@ -972,7 +995,7 @@ void register_tOCTVC1_GSM_MEASUREMENT_INFO(void) }; -int ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[8]; +int ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[9]; tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_RAW_MEASUREMENT_INFO; void register_tOCTVC1_GSM_RAW_MEASUREMENT_INFO(void) @@ -981,16 +1004,16 @@ void register_tOCTVC1_GSM_RAW_MEASUREMENT_INFO(void) { { &ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[0], - { "sSNR", "octvc1.gsm.raw_measurement_info.ssnr", + { "sSNRDb", "octvc1.gsm.raw_measurement_info.ssnrdb", FT_INT16,BASE_DEC, NULL, 0x0, - "sSNR",HFILL } + "sSNRDb",HFILL } }, { &ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[1], - { "sRSSI", "octvc1.gsm.raw_measurement_info.srssi", + { "sRSSIDbm", "octvc1.gsm.raw_measurement_info.srssidbm", FT_INT16,BASE_DEC, NULL, 0x0, - "sRSSI",HFILL } + "sRSSIDbm",HFILL } }, { @@ -1002,37 +1025,44 @@ void register_tOCTVC1_GSM_RAW_MEASUREMENT_INFO(void) }, { &ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[3], - { "usBERCount", "octvc1.gsm.raw_measurement_info.usbercount", - FT_UINT16,BASE_HEX, NULL, 0x0, - "usBERCount",HFILL } + { "sBurstTiming4x", "octvc1.gsm.raw_measurement_info.sbursttiming4x", + FT_INT16,BASE_DEC, NULL, 0x0, + "sBurstTiming4x",HFILL } }, { &ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[4], - { "usBERTOtalBitCOunt", "octvc1.gsm.raw_measurement_info.usbertotalbitcount", + { "usBERCnt", "octvc1.gsm.raw_measurement_info.usbercnt", FT_UINT16,BASE_HEX, NULL, 0x0, - "usBERTOtalBitCOunt",HFILL } + "usBERCnt",HFILL } }, { &ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[5], - { "usTrnSqErrorCount", "octvc1.gsm.raw_measurement_info.ustrnsqerrorcount", + { "usBERTotalBitCnt", "octvc1.gsm.raw_measurement_info.usbertotalbitcnt", FT_UINT16,BASE_HEX, NULL, 0x0, - "usTrnSqErrorCount",HFILL } + "usBERTotalBitCnt",HFILL } }, { &ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[6], - { "usTrnSqTotalBitCount", "octvc1.gsm.raw_measurement_info.ustrnsqtotalbitcount", + { "usTrSqErrCnt", "octvc1.gsm.raw_measurement_info.ustrsqerrcnt", FT_UINT16,BASE_HEX, NULL, 0x0, - "usTrnSqTotalBitCount",HFILL } + "usTrSqErrCnt",HFILL } }, { &ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[7], - { "sfrquencyError", "octvc1.gsm.raw_measurement_info.sfrquencyerror", + { "usTrSqTotalBitCnt", "octvc1.gsm.raw_measurement_info.ustrsqtotalbitcnt", + FT_UINT16,BASE_HEX, NULL, 0x0, + "usTrSqTotalBitCnt",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[8], + { "sFreqErrHz", "octvc1.gsm.raw_measurement_info.sfreqerrhz", FT_INT16,BASE_DEC, NULL, 0x0, - "sfrquencyError",HFILL } + "sFreqErrHz",HFILL } }, }; @@ -1266,6 +1296,346 @@ void register_tOCTVC1_GSM_SCHED_STATUS(void) }; +int ahf_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY; + +void register_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY[0], + { "TrxId", "octvc1.gsm.tap_filter_physical_channel_entry.trxid", + FT_NONE, BASE_NONE, NULL, 0x0, + "TrxId",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY[1], + { "PchId", "octvc1.gsm.tap_filter_physical_channel_entry.pchid", + FT_NONE, BASE_NONE, NULL, 0x0, + "PchId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY; + +void register_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY[0], + { "TrxId", "octvc1.gsm.tap_filter_logical_channel_entry.trxid", + FT_NONE, BASE_NONE, NULL, 0x0, + "TrxId",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY[1], + { "LchId", "octvc1.gsm.tap_filter_logical_channel_entry.lchid", + FT_NONE, BASE_NONE, NULL, 0x0, + "LchId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_TAP_FILTER_TRX[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_TAP_FILTER_TRX; + +void register_tOCTVC1_GSM_TAP_FILTER_TRX(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_TAP_FILTER_TRX[0], + { "ulAllTrxFlag", "octvc1.gsm.tap_filter_trx.ulalltrxflag", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + "ulAllTrxFlag",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER_TRX[1], + { "TrxId", "octvc1.gsm.tap_filter_trx.trxid", + FT_NONE, BASE_NONE, NULL, 0x0, + "TrxId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_TAP_FILTER_TRX.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL; + +void register_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL[0], + { "ulEntryCnt", "octvc1.gsm.tap_filter_physical_channel.ulentrycnt", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulEntryCnt",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL[1], + { "aEntry", "octvc1.gsm.tap_filter_physical_channel.aentry", + FT_NONE, BASE_NONE, NULL, 0x0, + "aEntry",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL; + +void register_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL[0], + { "ulEntryCnt", "octvc1.gsm.tap_filter_logical_channel.ulentrycnt", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulEntryCnt",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL[1], + { "aEntry", "octvc1.gsm.tap_filter_logical_channel.aentry", + FT_NONE, BASE_NONE, NULL, 0x0, + "aEntry",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_TAP_FILTER[5]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_TAP_FILTER; + +void register_tOCTVC1_GSM_TAP_FILTER(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_TAP_FILTER[0], + { "ulType", "octvc1.gsm.tap_filter.ultype", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_GSM_TAP_FILTER_TYPE_ENUM), 0x0, + "ulType",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER[1], + { "ulMask", "octvc1.gsm.tap_filter.ulmask", + FT_NONE, BASE_NONE, NULL, 0x0, + "ulMask",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER[2], + { "Trx", "octvc1.gsm.tap_filter.trx", + FT_NONE, BASE_NONE, NULL, 0x0, + "Trx",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER[3], + { "PhysicalChannel", "octvc1.gsm.tap_filter.physicalchannel", + FT_NONE, BASE_NONE, NULL, 0x0, + "PhysicalChannel",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER[4], + { "LogicalChannel", "octvc1.gsm.tap_filter.logicalchannel", + FT_NONE, BASE_NONE, NULL, 0x0, + "LogicalChannel",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_TAP_FILTER.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_TAP_FILTER_STATS[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_TAP_FILTER_STATS; + +void register_tOCTVC1_GSM_TAP_FILTER_STATS(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_TAP_FILTER_STATS[0], + { "ulTapIdCnt", "octvc1.gsm.tap_filter_stats.ultapidcnt", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulTapIdCnt",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_TAP_FILTER_STATS[1], + { "ahTapId", "octvc1.gsm.tap_filter_stats.ahtapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ahTapId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_TAP_FILTER_STATS.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[11]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER; + +void register_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[0], + { "ModuleData", "octvc1.gsm.module_data_rf_uplink_input_header.moduledata", + FT_NONE, BASE_NONE, NULL, 0x0, + "ModuleData",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[1], + { "TrxId", "octvc1.gsm.module_data_rf_uplink_input_header.trxid", + FT_NONE, BASE_NONE, NULL, 0x0, + "TrxId",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[2], + { "LchId", "octvc1.gsm.module_data_rf_uplink_input_header.lchid", + FT_NONE, BASE_NONE, NULL, 0x0, + "LchId",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[3], + { "ulAntennaIndex", "octvc1.gsm.module_data_rf_uplink_input_header.ulantennaindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulAntennaIndex",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[4], + { "ulFrameNumber", "octvc1.gsm.module_data_rf_uplink_input_header.ulframenumber", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFrameNumber",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[5], + { "ulPower", "octvc1.gsm.module_data_rf_uplink_input_header.ulpower", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulPower",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[6], + { "ulDataSizeInBytes", "octvc1.gsm.module_data_rf_uplink_input_header.uldatasizeinbytes", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulDataSizeInBytes",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[7], + { "byBadFlag", "octvc1.gsm.module_data_rf_uplink_input_header.bybadflag", + FT_UINT8,BASE_HEX, NULL, 0x0, + "byBadFlag",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[8], + { "byBurstId", "octvc1.gsm.module_data_rf_uplink_input_header.byburstid", + FT_UINT8,BASE_HEX, NULL, 0x0, + "byBurstId",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[9], + { "byReserved0", "octvc1.gsm.module_data_rf_uplink_input_header.byreserved0", + FT_UINT8,BASE_HEX, NULL, 0x0, + "byReserved0",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[10], + { "byReserved1", "octvc1.gsm.module_data_rf_uplink_input_header.byreserved1", + FT_UINT8,BASE_HEX, NULL, 0x0, + "byReserved1",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + /**************************************************************************** Event Registered ****************************************************************************/ @@ -2834,6 +3204,77 @@ void register_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_RSP(void) }; +int ahf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD[4]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD; + +void register_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD[0], + { "TrxId", "octvc1.gsm.trx.logical_channel.cmu_loopback_test.request.trxid", + FT_NONE, BASE_NONE, NULL, 0x0, + "TrxId",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD[1], + { "LchId", "octvc1.gsm.trx.logical_channel.cmu_loopback_test.request.lchid", + FT_NONE, BASE_NONE, NULL, 0x0, + "LchId",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD[2], + { "ulResetFlag", "octvc1.gsm.trx.logical_channel.cmu_loopback_test.request.ulresetflag", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + "ulResetFlag",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP; + +void register_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP[0], + { "TrxId", "octvc1.gsm.trx.logical_channel.cmu_loopback_test.request.trxid", + FT_NONE, BASE_NONE, NULL, 0x0, + "TrxId",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP[1], + { "LchId", "octvc1.gsm.trx.logical_channel.cmu_loopback_test.request.lchid", + FT_NONE, BASE_NONE, NULL, 0x0, + "LchId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + int ahf_tOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CMD[5]; tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CMD; @@ -3515,6 +3956,234 @@ void register_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_RSP(void) }; +int ahf_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD; + +void register_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD[0], + { "IndexGet", "octvc1.gsm.tap_filter.list.indexget", + FT_NONE, BASE_NONE, NULL, 0x0, + "IndexGet",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP; + +void register_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP[0], + { "IndexGet", "octvc1.gsm.tap_filter.list.indexget", + FT_NONE, BASE_NONE, NULL, 0x0, + "IndexGet",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP[1], + { "IndexList", "octvc1.gsm.tap_filter.list.indexlist", + FT_NONE, BASE_NONE, NULL, 0x0, + "IndexList",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD; + +void register_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD[0], + { "ulFilterIndex", "octvc1.gsm.tap_filter.info.ulfilterindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFilterIndex",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP; + +void register_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP[0], + { "ulFilterIndex", "octvc1.gsm.tap_filter.info.ulfilterindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFilterIndex",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP[1], + { "Filter", "octvc1.gsm.tap_filter.info.filter", + FT_NONE, BASE_NONE, NULL, 0x0, + "Filter",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD; + +void register_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD[0], + { "ulFilterIndex", "octvc1.gsm.tap_filter.stats.ulfilterindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFilterIndex",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP; + +void register_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP[0], + { "ulFilterIndex", "octvc1.gsm.tap_filter.stats.ulfilterindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFilterIndex",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP[1], + { "Stats", "octvc1.gsm.tap_filter.stats.stats", + FT_NONE, BASE_NONE, NULL, 0x0, + "Stats",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD; + +void register_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD[0], + { "ulFilterIndex", "octvc1.gsm.tap_filter.modify.ulfilterindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFilterIndex",HFILL } + + }, + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD[1], + { "Filter", "octvc1.gsm.tap_filter.modify.filter", + FT_NONE, BASE_NONE, NULL, 0x0, + "Filter",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP; + +void register_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP[0], + { "ulFilterIndex", "octvc1.gsm.tap_filter.modify.ulfilterindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFilterIndex",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + /**************************************************************************** COMMON dissectors ****************************************************************************/ @@ -4615,25 +5284,25 @@ unsigned int dissect_tOCTVC1_GSM_MEASUREMENT_INFO(tvbuff_t *tvb, packet_info *p if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_int_format_value(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[0], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sSNR), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sSNRDb), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[0], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sSNR); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sSNRDb); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_int_format_value(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[1], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sRSSI), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sRSSIDbm), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[1], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sRSSI); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sRSSIDbm); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) @@ -4650,48 +5319,60 @@ unsigned int dissect_tOCTVC1_GSM_MEASUREMENT_INFO(tvbuff_t *tvb, packet_info *p temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[3], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usBERCount), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + ti = proto_tree_add_int_format_value(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[3], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sBurstTiming4x), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[3], tvb, offset, + ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[3], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usBERCount); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, sBurstTiming4x); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[4], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usBERTOtalBitCOunt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usBERCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[4], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usBERTOtalBitCOunt); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usBERCnt); - temp_data = tvb_get_guint8( tvb, offset ); + temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[5], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usRxQualFullUp), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usBERTotalBitCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[5], tvb, offset, - 1, temp_data); + 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usRxQualFullUp); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usBERTotalBitCnt); - temp_data = tvb_get_guint8( tvb, offset ); + temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[6], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usRxLevelFullUp), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usRxQualFullUp), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[6], tvb, offset, - 1, temp_data); + 2, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usRxQualFullUp); + + temp_data = tvb_get_ntohs( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[7], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usRxLevelFullUp), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MEASUREMENT_INFO[7], tvb, offset, + 2, temp_data); } offset += mWS_FIELDSIZE(tOCTVC1_GSM_MEASUREMENT_INFO, usRxLevelFullUp); @@ -4725,25 +5406,25 @@ unsigned int dissect_tOCTVC1_GSM_RAW_MEASUREMENT_INFO(tvbuff_t *tvb, packet_inf if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_int_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[0], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sSNR), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sSNRDb), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[0], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sSNR); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sSNRDb); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_int_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[1], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sRSSI), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sRSSIDbm), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[1], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sRSSI); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sRSSIDbm); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) @@ -4760,62 +5441,74 @@ unsigned int dissect_tOCTVC1_GSM_RAW_MEASUREMENT_INFO(tvbuff_t *tvb, packet_inf temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { - ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[3], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usBERCount), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + ti = proto_tree_add_int_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[3], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sBurstTiming4x), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[3], tvb, offset, + ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[3], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usBERCount); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sBurstTiming4x); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[4], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usBERTOtalBitCOunt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usBERCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[4], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usBERTOtalBitCOunt); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usBERCnt); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[5], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usTrnSqErrorCount), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usBERTotalBitCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[5], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usTrnSqErrorCount); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usBERTotalBitCnt); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[6], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usTrnSqTotalBitCount), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usTrSqErrCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[6], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usTrnSqTotalBitCount); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usTrSqErrCnt); temp_data = tvb_get_ntohs( tvb, offset ); if( pExtValue && (pExtValue->lValue == temp_data ) ) { - ti = proto_tree_add_int_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[7], tvb, offset, - mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sfrquencyError), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[7], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usTrSqTotalBitCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); }else { - ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[7], tvb, offset, + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[7], tvb, offset, 2, temp_data); } - offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sfrquencyError); + offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, usTrSqTotalBitCnt); + + temp_data = tvb_get_ntohs( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_int_format_value(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[8], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sFreqErrHz), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_GSM_RAW_MEASUREMENT_INFO[8], tvb, offset, + 2, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_RAW_MEASUREMENT_INFO, sFreqErrHz); } @@ -5162,6 +5855,544 @@ unsigned int dissect_tOCTVC1_GSM_SCHED_STATUS(tvbuff_t *tvb, packet_info *pinfo }; + +unsigned int dissect_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY, TrxId), "TrxId:tOCTVC1_GSM_TRX_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TRX_ID( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY, PchId), "PchId:tOCTVC1_GSM_PHYSICAL_CHANNEL_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_PHYSICAL_CHANNEL_ID( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY, TrxId), "TrxId:tOCTVC1_GSM_TRX_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TRX_ID( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY, LchId), "LchId:tOCTVC1_GSM_LOGICAL_CHANNEL_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_LOGICAL_CHANNEL_ID( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_GSM_TAP_FILTER_TRX(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_TAP_FILTER_TRX))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_TAP_FILTER_TRX (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_TAP_FILTER_TRX)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_GSM_TAP_FILTER_TRX); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_boolean_format_value(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER_TRX[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_TRX, ulAllTrxFlag), temp_data, "%s (0x%x)", pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_boolean(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER_TRX[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_TRX, ulAllTrxFlag), temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_TRX, ulAllTrxFlag); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_TRX, TrxId), "TrxId:tOCTVC1_GSM_TRX_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TRX_ID( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL, ulEntryCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL[0], tvb, offset, + 4, temp_data); + if( ( (unsigned int)temp_data < 0) || ( (unsigned int)temp_data > cOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY_COUNT_MAX ) ) + { + proto_item_set_expert_flags(ti, PI_MALFORMED, PI_ERROR); + proto_item_append_text(ti," [Out of range - (0..cOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY_COUNT_MAX)]" ); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL, ulEntryCnt); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL, aEntry), "aEntry:tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY"); + { + int i, ofs=offset; + proto_tree* sub_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + for( i=0; i<8; i++ ) + { + { + proto_tree* sub_tree2; + ti = proto_tree_add_text(sub_tree, tvb, offset, + sizeof(tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY), "[%d]:", i); + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + } + } + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL, ulEntryCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL[0], tvb, offset, + 4, temp_data); + if( ( (unsigned int)temp_data < 0) || ( (unsigned int)temp_data > cOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY_COUNT_MAX ) ) + { + proto_item_set_expert_flags(ti, PI_MALFORMED, PI_ERROR); + proto_item_append_text(ti," [Out of range - (0..cOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY_COUNT_MAX)]" ); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL, ulEntryCnt); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL, aEntry), "aEntry:tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY"); + { + int i, ofs=offset; + proto_tree* sub_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + for( i=0; i<8; i++ ) + { + { + proto_tree* sub_tree2; + ti = proto_tree_add_text(sub_tree, tvb, offset, + sizeof(tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY), "[%d]:", i); + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + } + } + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_GSM_TAP_FILTER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_TAP_FILTER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_TAP_FILTER (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_TAP_FILTER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_GSM_TAP_FILTER); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER, ulType), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER, ulType); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_none_format(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER[1], tvb, offset, + 4,"ulMask:%s (0x%08x)", pExtValue->pszValue, temp_data); + }else{ + ti = proto_tree_add_none_format(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER[1], tvb, offset, + 4,"ulMask: (0x%08x)", temp_data); + if(temp_data) + { + int i; + proto_tree* sub_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + for( i=0; i< mWS_COUNTOF(vals_tOCTVC1_GSM_TAP_FILTER_MASK); i++ ) + { + if( ( vals_tOCTVC1_GSM_TAP_FILTER_MASK[i].value && + ( vals_tOCTVC1_GSM_TAP_FILTER_MASK[i].value & temp_data ) == + vals_tOCTVC1_GSM_TAP_FILTER_MASK[i].value)) + proto_tree_add_text(sub_tree, tvb, offset,4,"%s", + decode_enumerated_bitfield(vals_tOCTVC1_GSM_TAP_FILTER_MASK[i].value, 0xFFFFFFFF, (4*8), + VALS(vals_tOCTVC1_GSM_TAP_FILTER_MASK),"%s")); + } + } + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER, ulMask); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER, Trx), "Trx:tOCTVC1_GSM_TAP_FILTER_TRX"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TAP_FILTER_TRX( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER, PhysicalChannel), "PhysicalChannel:tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER, LogicalChannel), "LogicalChannel:tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_GSM_TAP_FILTER_STATS(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_TAP_FILTER_STATS))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_TAP_FILTER_STATS (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_TAP_FILTER_STATS)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_GSM_TAP_FILTER_STATS); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER_STATS[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_STATS, ulTapIdCnt), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_TAP_FILTER_STATS[0], tvb, offset, + 4, temp_data); + if( ( (unsigned int)temp_data < 0) || ( (unsigned int)temp_data > cOCTVC1_GSM_TAP_FILTER_TAP_COUNT_MAX ) ) + { + proto_item_set_expert_flags(ti, PI_MALFORMED, PI_ERROR); + proto_item_append_text(ti," [Out of range - (0..cOCTVC1_GSM_TAP_FILTER_TAP_COUNT_MAX)]" ); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_STATS, ulTapIdCnt); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_STATS, ahTapId), "ahTapId"); + { + int i, ofs=offset; + proto_tree* sub_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + for( i=0; i<16; i++ ) + { + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(sub_tree, ahf_tOCTVC1_GSM_TAP_FILTER_STATS[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_TAP_FILTER_STATS, ahTapId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint_format(sub_tree, ahf_tOCTVC1_GSM_TAP_FILTER_STATS[1], tvb, offset, + 4, temp_data, "[%d]: 0x%08x", i, temp_data ); + } + offset+=4; + } + } + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ModuleData), "ModuleData:tOCTVC1_MODULE_DATA"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_MODULE_DATA( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, TrxId), "TrxId:tOCTVC1_GSM_TRX_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TRX_ID( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, LchId), "LchId:tOCTVC1_GSM_LOGICAL_CHANNEL_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_LOGICAL_CHANNEL_ID( tvb, pinfo, sub_tree2, offset, pExtValue ); + } + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[3], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ulAntennaIndex), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[3], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ulAntennaIndex); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[4], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ulFrameNumber), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[4], tvb, offset, + 4, temp_data); + if( (unsigned int)temp_data > cOCTVC1_GSM_MAX_FRAME_COUNT) + { + proto_item_set_expert_flags(ti, PI_MALFORMED, PI_ERROR); + proto_item_append_text(ti," [Out of range - (..cOCTVC1_GSM_MAX_FRAME_COUNT)]" ); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ulFrameNumber); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[5], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ulPower), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[5], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ulPower); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[6], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ulDataSizeInBytes), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[6], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, ulDataSizeInBytes); + + temp_data = tvb_get_guint8( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[7], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, byBadFlag), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[7], tvb, offset, + 1, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, byBadFlag); + + temp_data = tvb_get_guint8( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[8], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, byBurstId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[8], tvb, offset, + 1, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, byBurstId); + + temp_data = tvb_get_guint8( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[9], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, byReserved0), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[9], tvb, offset, + 1, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, byReserved0); + + temp_data = tvb_get_guint8( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[10], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, byReserved1), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER[10], tvb, offset, + 1, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER, byReserved1); + + } + + + return offset; + +}; + /**************************************************************************** Event dissectors ****************************************************************************/ @@ -7309,6 +8540,99 @@ unsigned int dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_RSP(tvbuf }; +unsigned int dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD, TrxId), "TrxId:tOCTVC1_GSM_TRX_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TRX_ID( tvb, pinfo, sub_tree2, offset, NULL ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD, LchId), "LchId:tOCTVC1_GSM_LOGICAL_CHANNEL_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_LOGICAL_CHANNEL_ID( tvb, pinfo, sub_tree2, offset, NULL ); + } + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_boolean(field_tree, ahf_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD[2], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD, ulResetFlag), temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD, ulResetFlag); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP, TrxId), "TrxId:tOCTVC1_GSM_TRX_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TRX_ID( tvb, pinfo, sub_tree2, offset, NULL ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP, LchId), "LchId:tOCTVC1_GSM_LOGICAL_CHANNEL_ID"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_LOGICAL_CHANNEL_ID( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + unsigned int dissect_tOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) { proto_tree *field_tree = tree; @@ -8248,6 +9572,322 @@ unsigned int dissect_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_RSP( } + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD, IndexGet), "IndexGet:tOCTVC1_CURSOR_INDEX_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_CURSOR_INDEX_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP, IndexGet), "IndexGet:tOCTVC1_CURSOR_INDEX_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_CURSOR_INDEX_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP, IndexList), "IndexList:tOCTVC1_LIST_INDEX_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_LIST_INDEX_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD, ulFilterIndex); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP, ulFilterIndex); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP, Filter), "Filter:tOCTVC1_GSM_TAP_FILTER"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TAP_FILTER( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD, ulFilterIndex); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP, ulFilterIndex); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP, Stats), "Stats:tOCTVC1_GSM_TAP_FILTER_STATS"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TAP_FILTER_STATS( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD, ulFilterIndex); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD, Filter), "Filter:tOCTVC1_GSM_TAP_FILTER"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_GSM_TAP_FILTER( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP, ulFilterIndex); + + } + + return 0; }; @@ -8284,6 +9924,14 @@ void ws_register_OCTVC1_GSM(void) register_tOCTVC1_GSM_DL_STATUS(); register_tOCTVC1_GSM_UL_STATUS(); register_tOCTVC1_GSM_SCHED_STATUS(); + register_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY(); + register_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY(); + register_tOCTVC1_GSM_TAP_FILTER_TRX(); + register_tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL(); + register_tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL(); + register_tOCTVC1_GSM_TAP_FILTER(); + register_tOCTVC1_GSM_TAP_FILTER_STATS(); + register_tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER(); /**************************************************************************** CMD/RSP Registered @@ -8329,6 +9977,8 @@ void ws_register_OCTVC1_GSM(void) register_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_RSP(); register_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CMD(); register_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_RSP(); + register_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD(); + register_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP(); register_tOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CMD(); register_tOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_RSP(); register_tOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CMD(); @@ -8347,6 +9997,14 @@ void ws_register_OCTVC1_GSM(void) register_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_RSP(); register_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CMD(); register_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_RSP(); + register_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD(); + register_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP(); + register_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD(); + register_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP(); + register_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD(); + register_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP(); + register_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD(); + register_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP(); /**************************************************************************** Event Registered @@ -8389,6 +10047,7 @@ int ws_dissect_OCTVC1_GSM_CMD( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, p case cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID: return dissect_tOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID: return dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID: return dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID: return dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID: return dissect_tOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID: return dissect_tOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID: return dissect_tOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CMD( tvb, pinfo, tree, 0 ); break; @@ -8398,6 +10057,10 @@ int ws_dissect_OCTVC1_GSM_CMD( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, p case cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID: return dissect_tOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID: return dissect_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID: return dissect_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TAP_FILTER_LIST_CID: return dissect_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID: return dissect_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID: return dissect_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID: return dissect_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD( tvb, pinfo, tree, 0 ); break; default: return 1; } } @@ -8430,6 +10093,7 @@ int ws_dissect_OCTVC1_GSM_RSP( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, p case cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID: return dissect_tOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID: return dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID: return dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID: return dissect_tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID: return dissect_tOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID: return dissect_tOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID: return dissect_tOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_RSP( tvb, pinfo, tree, 0 ); break; @@ -8439,6 +10103,10 @@ int ws_dissect_OCTVC1_GSM_RSP( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, p case cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID: return dissect_tOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID: return dissect_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID: return dissect_tOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TAP_FILTER_LIST_CID: return dissect_tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID: return dissect_tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID: return dissect_tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID: return dissect_tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP( tvb, pinfo, tree, 0 ); break; default: return 1; } } diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_hw.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_hw.c index c92e6ea..3da6dce 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_hw.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_hw.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -169,6 +169,7 @@ const value_string vals_tOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM[] = { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNLOCKED, "cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNLOCKED" }, { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_ERROR, "cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_ERROR" }, { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_DISABLE, "cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_DISABLE" }, + { cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_LOSS_EXT_CLOCK, "cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_LOSS_EXT_CLOCK" }, { 0, NULL } }; @@ -1357,7 +1358,7 @@ void register_tOCTVC1_HW_MSG_RF_PORT_INFO_CMD(void) }; -int ahf_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP[5]; +int ahf_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP[7]; tWS_ENTITY_HANDLE ws_htOCTVC1_HW_MSG_RF_PORT_INFO_RSP; void register_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP(void) @@ -1392,6 +1393,20 @@ void register_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP(void) "ulPortInterfaceId",HFILL } }, + { + &ahf_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP[4], + { "ulFrequencyMinHz", "octvc1.hw.rf_port.info.ulfrequencyminhz", + FT_UINT32,BASE_DEC, NULL, 0x0, + "ulFrequencyMinHz",HFILL } + + }, + { + &ahf_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP[5], + { "ulFrequencyMaxHz", "octvc1.hw.rf_port.info.ulfrequencymaxhz", + FT_UINT32,BASE_DEC, NULL, 0x0, + "ulFrequencyMaxHz",HFILL } + + }, }; static gint* ett[] = @@ -1680,84 +1695,6 @@ void register_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_RSP(void) }; -int ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[5]; -tWS_ENTITY_HANDLE ws_htOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD; - -void register_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[0], - { "ulPortIndex", "octvc1.hw.rf_port.antenna.rx_config.modify.ulportindex", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulPortIndex",HFILL } - - }, - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[1], - { "ulAntennaIndex", "octvc1.hw.rf_port.antenna.rx_config.modify.ulantennaindex", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulAntennaIndex",HFILL } - - }, - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[2], - { "lRxGaindB", "octvc1.hw.rf_port.antenna.rx_config.modify.lrxgaindb", - FT_INT32,BASE_DEC, NULL, 0x0, - "lRxGaindB",HFILL } - - }, - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[3], - { "ulRxGainMode", "octvc1.hw.rf_port.antenna.rx_config.modify.ulrxgainmode", - FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_RADIO_RX_GAIN_CTRL_MODE_ENUM), 0x0, - "ulRxGainMode",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - -int ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP[3]; -tWS_ENTITY_HANDLE ws_htOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP; - -void register_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP[0], - { "ulPortIndex", "octvc1.hw.rf_port.antenna.rx_config.modify.ulportindex", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulPortIndex",HFILL } - - }, - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP[1], - { "ulAntennaIndex", "octvc1.hw.rf_port.antenna.rx_config.modify.ulantennaindex", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulAntennaIndex",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - int ahf_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD[3]; tWS_ENTITY_HANDLE ws_htOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD; @@ -1836,77 +1773,6 @@ void register_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_RSP(void) }; -int ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD[4]; -tWS_ENTITY_HANDLE ws_htOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD; - -void register_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD[0], - { "ulPortIndex", "octvc1.hw.rf_port.antenna.tx_config.modify.ulportindex", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulPortIndex",HFILL } - - }, - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD[1], - { "ulAntennaIndex", "octvc1.hw.rf_port.antenna.tx_config.modify.ulantennaindex", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulAntennaIndex",HFILL } - - }, - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD[2], - { "lTxGaindB", "octvc1.hw.rf_port.antenna.tx_config.modify.ltxgaindb", - FT_INT32,BASE_DEC, NULL, 0x0, - "lTxGaindB",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - -int ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP[3]; -tWS_ENTITY_HANDLE ws_htOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP; - -void register_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP(void) -{ - static hf_register_info hf[] = - { - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP[0], - { "ulPortIndex", "octvc1.hw.rf_port.antenna.tx_config.modify.ulportindex", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulPortIndex",HFILL } - - }, - { - &ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP[1], - { "ulAntennaIndex", "octvc1.hw.rf_port.antenna.tx_config.modify.ulantennaindex", - FT_UINT32,BASE_HEX, NULL, 0x0, - "ulAntennaIndex",HFILL } - - }, - }; - - static gint* ett[] = - { - &ws_htOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP.ett - }; - - proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); - -}; - int ahf_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP[3]; tWS_ENTITY_HANDLE ws_htOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP; @@ -3959,6 +3825,20 @@ unsigned int dissect_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP(tvbuff_t *tvb, packet_info } offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_INFO_RSP, ulPortInterfaceId); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP[4], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_INFO_RSP, ulFrequencyMinHz); + + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_INFO_RSP[5], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_INFO_RSP, ulFrequencyMaxHz); + } @@ -4332,106 +4212,6 @@ unsigned int dissect_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_RSP(tvbuff_t }; -unsigned int dissect_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)-sizeof(tOCTVC1_MSG_HEADER))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)-sizeof(tOCTVC1_MSG_HEADER)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - ti = proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); - - field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[0], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD, ulPortIndex); - - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD, ulAntennaIndex); - - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[2], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD, lRxGaindB); - - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD[3], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD, ulRxGainMode); - - } - - - return 0; - -}; - - -unsigned int dissect_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP)-sizeof(tOCTVC1_MSG_HEADER))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP)-sizeof(tOCTVC1_MSG_HEADER)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - ti = proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); - - field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP[0], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP, ulPortIndex); - - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP, ulAntennaIndex); - - } - - - return 0; - -}; - - unsigned int dissect_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) { proto_tree *field_tree = tree; @@ -4532,99 +4312,6 @@ unsigned int dissect_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_RSP(tvbuff_t }; -unsigned int dissect_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)-sizeof(tOCTVC1_MSG_HEADER))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)-sizeof(tOCTVC1_MSG_HEADER)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - ti = proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); - - field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD[0], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD, ulPortIndex); - - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD, ulAntennaIndex); - - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_int(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD[2], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD, lTxGaindB); - - } - - - return 0; - -}; - - -unsigned int dissect_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) -{ - proto_tree *field_tree = tree; - unsigned int offset_0 = offset; - gint bytes = tvb_length_remaining(tvb, offset); - if (bytes < (gint)(sizeof(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP)-sizeof(tOCTVC1_MSG_HEADER))) - { - proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP (%d byte%s) - Malformated packet...expected(%ld)", - bytes, plurality(bytes, "", "s"), - sizeof(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP)-sizeof(tOCTVC1_MSG_HEADER)); - return 1; - } - else - { - int temp_data = 0; - proto_item *ti; - ti = proto_tree_add_text(tree, tvb, offset, bytes, - "tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); - - field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP[0], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP, ulPortIndex); - - temp_data = tvb_get_ntohl( tvb, offset ); - { - ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP[1], tvb, offset, - 4, temp_data); - } - offset += mWS_FIELDSIZE(tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP, ulAntennaIndex); - - } - - - return 0; - -}; - - unsigned int dissect_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) { proto_tree *field_tree = tree; @@ -4989,12 +4676,8 @@ void ws_register_OCTVC1_HW(void) register_tOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_RSP(); register_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CMD(); register_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_RSP(); - register_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD(); - register_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP(); register_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD(); register_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_RSP(); - register_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD(); - register_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP(); register_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP(); register_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CMD(); register_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP(); @@ -5032,9 +4715,7 @@ int ws_dissect_OCTVC1_HW_CMD( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, pr case cOCTVC1_HW_MSG_RF_PORT_LIST_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_LIST_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CMD( tvb, pinfo, tree, 0 ); break; - case cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD( tvb, pinfo, tree, 0 ); break; - case cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID: return 0; break; case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID: return dissect_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID: return 0; break; @@ -5066,9 +4747,7 @@ int ws_dissect_OCTVC1_HW_RSP( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, pr case cOCTVC1_HW_MSG_RF_PORT_LIST_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_LIST_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_RSP( tvb, pinfo, tree, 0 ); break; - case cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_RSP( tvb, pinfo, tree, 0 ); break; - case cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CID: return dissect_tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID: return dissect_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID: return dissect_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID: return dissect_tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_RSP( tvb, pinfo, tree, 0 ); break; diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_irsc.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_irsc.c index 94cff27..e6bc494 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_irsc.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_irsc.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -62,6 +62,20 @@ const value_string vals_tOCTVC1_IRSC_IPC_PORT_STATE_ENUM[] = { 0, NULL } }; +const value_string vals_tOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM[] = + { + { cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_DISABLE, "cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_DISABLE" }, + { cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_STOP, "cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_STOP" }, + { cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_START, "cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_START" }, + { 0, NULL } + }; + +const value_string vals_tOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM[] = + { + { cOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_STREAM, "cOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_STREAM" }, + { 0, NULL } + }; + /**************************************************************************** COMMON Registered ****************************************************************************/ @@ -214,6 +228,151 @@ void register_tOCTVC1_IRSC_SESSION_STATS(void) }; +int ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[6]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_APPLICATION_TAP_INFO; + +void register_tOCTVC1_IRSC_APPLICATION_TAP_INFO(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[0], + { "ulModuleId", "octvc1.irsc.application_tap_info.ulmoduleid", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_MODULE_ID_ENUM), 0x0, + "ulModuleId",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[1], + { "hProcess", "octvc1.irsc.application_tap_info.hprocess", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hProcess",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[2], + { "ulDirection", "octvc1.irsc.application_tap_info.uldirection", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_TAP_DIRECTION_ENUM), 0x0, + "ulDirection",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[3], + { "ulDataSubType", "octvc1.irsc.application_tap_info.uldatasubtype", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulDataSubType",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[4], + { "szName", "octvc1.irsc.application_tap_info.szname", + FT_STRING, BASE_NONE, NULL, 0x0, + "szName",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[5], + { "szDescription", "octvc1.irsc.application_tap_info.szdescription", + FT_STRING, BASE_NONE, NULL, 0x0, + "szDescription",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_APPLICATION_TAP_INFO.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_APPLICATION_TAP_STATS; + +void register_tOCTVC1_IRSC_APPLICATION_TAP_STATS(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[0], + { "ulState", "octvc1.irsc.application_tap_stats.ulstate", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM), 0x0, + "ulState",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[1], + { "ulFilterIndex", "octvc1.irsc.application_tap_stats.ulfilterindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFilterIndex",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[2], + { "ulUserId", "octvc1.irsc.application_tap_stats.uluserid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulUserId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_APPLICATION_TAP_STATS.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[4]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_APPLICATION_TAP_START; + +void register_tOCTVC1_IRSC_APPLICATION_TAP_START(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[0], + { "ulMode", "octvc1.irsc.application_tap_start.ulmode", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM), 0x0, + "ulMode",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[1], + { "ulMaxTransportDataSize", "octvc1.irsc.application_tap_start.ulmaxtransportdatasize", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulMaxTransportDataSize",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[2], + { "ulFilterIndex", "octvc1.irsc.application_tap_start.ulfilterindex", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFilterIndex",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[3], + { "ulUserId", "octvc1.irsc.application_tap_start.uluserid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulUserId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_APPLICATION_TAP_START.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + /**************************************************************************** Event Registered ****************************************************************************/ @@ -1593,6 +1752,291 @@ void register_tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP(void) }; +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD[0], + { "ObjectCursor", "octvc1.irsc.application.tap.list.objectcursor", + FT_NONE, BASE_NONE, NULL, 0x0, + "ObjectCursor",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP[0], + { "ObjectCursor", "octvc1.irsc.application.tap.list.objectcursor", + FT_NONE, BASE_NONE, NULL, 0x0, + "ObjectCursor",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP[1], + { "ObjectNameList", "octvc1.irsc.application.tap.list.objectnamelist", + FT_NONE, BASE_NONE, NULL, 0x0, + "ObjectNameList",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD[0], + { "hTapId", "octvc1.irsc.application.tap.info.htapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hTapId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP[0], + { "hTapId", "octvc1.irsc.application.tap.info.htapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hTapId",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP[1], + { "Info", "octvc1.irsc.application.tap.info.info", + FT_NONE, BASE_NONE, NULL, 0x0, + "Info",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD[0], + { "hTapId", "octvc1.irsc.application.tap.stats.htapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hTapId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP[0], + { "hTapId", "octvc1.irsc.application.tap.stats.htapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hTapId",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP[1], + { "Stats", "octvc1.irsc.application.tap.stats.stats", + FT_NONE, BASE_NONE, NULL, 0x0, + "Stats",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD[0], + { "hTapId", "octvc1.irsc.application.tap.start.htapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hTapId",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD[1], + { "Start", "octvc1.irsc.application.tap.start.start", + FT_NONE, BASE_NONE, NULL, 0x0, + "Start",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP[0], + { "hTapId", "octvc1.irsc.application.tap.start.htapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hTapId",HFILL } + + }, + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP[1], + { "hLogicalObj", "octvc1.irsc.application.tap.start.hlogicalobj", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hLogicalObj",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD[0], + { "hTapId", "octvc1.irsc.application.tap.stop.htapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hTapId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP; + +void register_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP[0], + { "hTapId", "octvc1.irsc.application.tap.stop.htapid", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hTapId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + /**************************************************************************** COMMON dissectors ****************************************************************************/ @@ -1841,6 +2285,241 @@ unsigned int dissect_tOCTVC1_IRSC_SESSION_STATS(tvbuff_t *tvb, packet_info *pin }; + +unsigned int dissect_tOCTVC1_IRSC_APPLICATION_TAP_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_APPLICATION_TAP_INFO))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_APPLICATION_TAP_INFO (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_APPLICATION_TAP_INFO)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_IRSC_APPLICATION_TAP_INFO); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, ulModuleId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, ulModuleId); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, hProcess), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[1], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, hProcess); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[2], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, ulDirection), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[2], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, ulDirection); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[3], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, ulDataSubType), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[3], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, ulDataSubType); + + ti = proto_tree_add_item(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[4], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, szName), FALSE); + + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, szName); + + ti = proto_tree_add_item(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_INFO[5], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, szDescription), FALSE); + + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_INFO, szDescription); + + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_APPLICATION_TAP_STATS(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_APPLICATION_TAP_STATS))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_APPLICATION_TAP_STATS (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_APPLICATION_TAP_STATS)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_IRSC_APPLICATION_TAP_STATS); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_STATS, ulState), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_STATS, ulState); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_STATS, ulFilterIndex), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[1], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_STATS, ulFilterIndex); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[2], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_STATS, ulUserId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_STATS[2], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_STATS, ulUserId); + + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_APPLICATION_TAP_START(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_APPLICATION_TAP_START))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_APPLICATION_TAP_START (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_APPLICATION_TAP_START)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_IRSC_APPLICATION_TAP_START); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulMode), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulMode); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( temp_data == cOCTVC1_IRSC_APPLICATION_TRANSPORT_MAX_DATA_SIZE) + { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulMaxTransportDataSize),temp_data, "cOCTVC1_IRSC_APPLICATION_TRANSPORT_MAX_DATA_SIZE (0x%08x)",temp_data); + }else { + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulMaxTransportDataSize), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[1], tvb, offset, + 4, temp_data); + if( (unsigned int)temp_data < 128) + { + proto_item_set_expert_flags(ti, PI_MALFORMED, PI_ERROR); + proto_item_append_text(ti," [Out of range - (128..)]" ); + } + } + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulMaxTransportDataSize); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( temp_data == cOCTVC1_INDEX_INVALID) + { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[2], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulFilterIndex),temp_data, "cOCTVC1_INDEX_INVALID (0x%08x)",temp_data); + }else { + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[2], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulFilterIndex), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[2], tvb, offset, + 4, temp_data); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulFilterIndex); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[3], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulUserId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_APPLICATION_TAP_START[3], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_APPLICATION_TAP_START, ulUserId); + + } + + + return offset; + +}; + /**************************************************************************** Event dissectors ****************************************************************************/ @@ -3681,6 +4360,421 @@ unsigned int dissect_tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP(tvbuff_t } + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD, ObjectCursor), "ObjectCursor:tOCTVC1_CURSOR_HANDLE_OBJECT_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP, ObjectCursor), "ObjectCursor:tOCTVC1_CURSOR_HANDLE_OBJECT_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP, ObjectNameList), "ObjectNameList:tOCTVC1_LIST_NAME_OBJECT32_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_LIST_NAME_OBJECT32_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + if( temp_data == cOCTVC1_HANDLE_INVALID) + { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD, hTapId),temp_data, "cOCTVC1_HANDLE_INVALID (0x%08x)",temp_data); + }else { + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD[0], tvb, offset, + 4, temp_data); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD, hTapId); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP, hTapId); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP, Info), "Info:tOCTVC1_IRSC_APPLICATION_TAP_INFO"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_IRSC_APPLICATION_TAP_INFO( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + if( temp_data == cOCTVC1_HANDLE_INVALID) + { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD, hTapId),temp_data, "cOCTVC1_HANDLE_INVALID (0x%08x)",temp_data); + }else { + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD[0], tvb, offset, + 4, temp_data); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD, hTapId); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP, hTapId); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP, Stats), "Stats:tOCTVC1_IRSC_APPLICATION_TAP_STATS"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_IRSC_APPLICATION_TAP_STATS( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + if( temp_data == cOCTVC1_HANDLE_INVALID) + { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD, hTapId),temp_data, "cOCTVC1_HANDLE_INVALID (0x%08x)",temp_data); + }else { + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD[0], tvb, offset, + 4, temp_data); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD, hTapId); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD, Start), "Start:tOCTVC1_IRSC_APPLICATION_TAP_START"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_IRSC_APPLICATION_TAP_START( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP, hTapId); + + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP[1], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP, hLogicalObj); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + if( temp_data == cOCTVC1_HANDLE_INVALID) + { ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD, hTapId),temp_data, "cOCTVC1_HANDLE_INVALID (0x%08x)",temp_data); + }else { + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD[0], tvb, offset, + 4, temp_data); + } + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD, hTapId); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP, hTapId); + + } + + return 0; }; @@ -3695,6 +4789,9 @@ void ws_register_OCTVC1_IRSC(void) ****************************************************************************/ register_tOCTVC1_IRSC_API_STATS(); register_tOCTVC1_IRSC_SESSION_STATS(); + register_tOCTVC1_IRSC_APPLICATION_TAP_INFO(); + register_tOCTVC1_IRSC_APPLICATION_TAP_STATS(); + register_tOCTVC1_IRSC_APPLICATION_TAP_START(); /**************************************************************************** CMD/RSP Registered @@ -3738,6 +4835,16 @@ void ws_register_OCTVC1_IRSC(void) register_tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_RSP(); register_tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CMD(); register_tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP(); + register_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD(); + register_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP(); + register_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD(); + register_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP(); + register_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD(); + register_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP(); + register_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD(); + register_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP(); + register_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD(); + register_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP(); /**************************************************************************** Event Registered @@ -3775,6 +4882,11 @@ int ws_dissect_OCTVC1_IRSC_CMD( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID: return dissect_tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID: return dissect_tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID: return dissect_tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD( tvb, pinfo, tree, 0 ); break; default: return 1; } } @@ -3807,6 +4919,11 @@ int ws_dissect_OCTVC1_IRSC_RSP( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID: return dissect_tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID: return dissect_tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID: return dissect_tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID: return dissect_tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP( tvb, pinfo, tree, 0 ); break; default: return 1; } } diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_main.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_main.c index e3cdef3..a00866f 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_main.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_main.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ @@ -50,6 +50,24 @@ const value_string vals_tOCTVC1_MAIN_APPLICATION_STATE_ENUM[] = { 0, NULL } }; +const value_string vals_tOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM[] = + { + { cOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_INVALID, "cOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_INVALID" }, + { cOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_STOPPED, "cOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_STOPPED" }, + { cOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_STARTED, "cOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_STARTED" }, + { cOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_ERROR, "cOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_ERROR" }, + { 0, NULL } + }; + +const value_string vals_tOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM[] = + { + { cOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_INVALID, "cOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_INVALID" }, + { cOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_DEFAULT, "cOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_DEFAULT" }, + { cOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_PARSE_OK, "cOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_PARSE_OK" }, + { cOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_PARSE_ERROR, "cOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_PARSE_ERROR" }, + { 0, NULL } + }; + const value_string vals_tOCTVC1_MAIN_HEARTBEAT_STATE_ENUM[] = { { cOCTVC1_MAIN_HEARTBEAT_STATE_ENUM_STOP, "cOCTVC1_MAIN_HEARTBEAT_STATE_ENUM_STOP" }, @@ -82,6 +100,70 @@ const value_string vals_tOCTVC1_MAIN_EVT_PHY_MASK[] = COMMON Registered ****************************************************************************/ +int ahf_tOCTVC1_MAIN_APPLICATION_MODULE_INFO[1]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_APPLICATION_MODULE_INFO; + +void register_tOCTVC1_MAIN_APPLICATION_MODULE_INFO(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_APPLICATION_MODULE_INFO[0], + { "ulModuleId", "octvc1.main.application_module_info.ulmoduleid", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_MODULE_ID_ENUM), 0x0, + "ulModuleId",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_APPLICATION_MODULE_INFO.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_APPLICATION_MODULE_STATS; + +void register_tOCTVC1_MAIN_APPLICATION_MODULE_STATS(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[0], + { "ulState", "octvc1.main.application_module_stats.ulstate", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM), 0x0, + "ulState",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[1], + { "ulConfigState", "octvc1.main.application_module_stats.ulconfigstate", + FT_UINT32,BASE_HEX, VALS(vals_tOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM), 0x0, + "ulConfigState",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[2], + { "ulProcessNum", "octvc1.main.application_module_stats.ulprocessnum", + FT_UINT32,BASE_DEC, NULL, 0x0, + "ulProcessNum",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_APPLICATION_MODULE_STATS.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + int ahf_tOCTVC1_MAIN_API_SESSION_HEARTBEAT_CONFIG[2]; tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_API_SESSION_HEARTBEAT_CONFIG; @@ -833,7 +915,7 @@ void register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD(void) }; -int ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[3]; +int ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[7]; tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP; void register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP(void) @@ -854,6 +936,34 @@ void register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP(void) "ulAccessMode",HFILL } }, + { + &ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[2], + { "ulHostOwnerFlag", "octvc1.main.file_system.file.info.ulhostownerflag", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + "ulHostOwnerFlag",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[3], + { "ulFileSize", "octvc1.main.file_system.file.info.ulfilesize", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulFileSize",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[4], + { "ulMaxFileSize", "octvc1.main.file_system.file.info.ulmaxfilesize", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulMaxFileSize",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[5], + { "ulInstanceNum", "octvc1.main.file_system.file.info.ulinstancenum", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulInstanceNum",HFILL } + + }, }; static gint* ett[] = @@ -865,6 +975,63 @@ void register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP(void) }; +int ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD; + +void register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD[0], + { "szFileName", "octvc1.main.file_system.file.add.szfilename", + FT_STRING, BASE_NONE, NULL, 0x0, + "szFileName",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD[1], + { "ulMaxFilesize", "octvc1.main.file_system.file.add.ulmaxfilesize", + FT_UINT32,BASE_HEX, NULL, 0x0, + "ulMaxFilesize",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP; + +void register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP[0], + { "szFileName", "octvc1.main.file_system.file.add.szfilename", + FT_STRING, BASE_NONE, NULL, 0x0, + "szFileName",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + int ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD[2]; tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD; @@ -2046,11 +2213,296 @@ void register_tOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_RSP(void) }; +int ahf_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD; + +void register_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD[0], + { "ObjectCursor", "octvc1.main.application.module.list.objectcursor", + FT_NONE, BASE_NONE, NULL, 0x0, + "ObjectCursor",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP; + +void register_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP[0], + { "ObjectCursor", "octvc1.main.application.module.list.objectcursor", + FT_NONE, BASE_NONE, NULL, 0x0, + "ObjectCursor",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP[1], + { "ObjectNameList", "octvc1.main.application.module.list.objectnamelist", + FT_NONE, BASE_NONE, NULL, 0x0, + "ObjectNameList",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD[2]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD; + +void register_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD[0], + { "hModule", "octvc1.main.application.module.info.hmodule", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hModule",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP[4]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP; + +void register_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP[0], + { "hModule", "octvc1.main.application.module.info.hmodule", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hModule",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP[1], + { "szName", "octvc1.main.application.module.info.szname", + FT_STRING, BASE_NONE, NULL, 0x0, + "szName",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP[2], + { "Info", "octvc1.main.application.module.info.info", + FT_NONE, BASE_NONE, NULL, 0x0, + "Info",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD; + +void register_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD[0], + { "hModule", "octvc1.main.application.module.stats.hmodule", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hModule",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD[1], + { "ulResetStatsFlag", "octvc1.main.application.module.stats.ulresetstatsflag", + FT_BOOLEAN, BASE_NONE, NULL, 0x0, + "ulResetStatsFlag",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + +int ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP[3]; +tWS_ENTITY_HANDLE ws_htOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP; + +void register_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP(void) +{ + static hf_register_info hf[] = + { + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP[0], + { "hModule", "octvc1.main.application.module.stats.hmodule", + FT_UINT32,BASE_HEX, NULL, 0x0, + "hModule",HFILL } + + }, + { + &ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP[1], + { "Stats", "octvc1.main.application.module.stats.stats", + FT_NONE, BASE_NONE, NULL, 0x0, + "Stats",HFILL } + + }, + }; + + static gint* ett[] = + { + &ws_htOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP.ett + }; + + proto_register_field_array( proto_octvc1_ctrl, hf, array_length(hf) ); + +}; + /**************************************************************************** COMMON dissectors ****************************************************************************/ +unsigned int dissect_tOCTVC1_MAIN_APPLICATION_MODULE_INFO(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_APPLICATION_MODULE_INFO))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_APPLICATION_MODULE_INFO (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_APPLICATION_MODULE_INFO)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_MAIN_APPLICATION_MODULE_INFO); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_MAIN_APPLICATION_MODULE_INFO[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_APPLICATION_MODULE_INFO, ulModuleId), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_APPLICATION_MODULE_INFO[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_APPLICATION_MODULE_INFO, ulModuleId); + + } + + + return offset; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_APPLICATION_MODULE_STATS(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_APPLICATION_MODULE_STATS))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_APPLICATION_MODULE_STATS (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_APPLICATION_MODULE_STATS)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + bytes = sizeof(tOCTVC1_MAIN_APPLICATION_MODULE_STATS); + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_APPLICATION_MODULE_STATS, ulState), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_APPLICATION_MODULE_STATS, ulState); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_APPLICATION_MODULE_STATS, ulConfigState), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[1], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_APPLICATION_MODULE_STATS, ulConfigState); + + temp_data = tvb_get_ntohl( tvb, offset ); + if( pExtValue && (pExtValue->lValue == temp_data ) ) + { + ti = proto_tree_add_uint_format_value(field_tree, ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[2], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_APPLICATION_MODULE_STATS, ulProcessNum), temp_data, "%s (0x%x)",pExtValue->pszValue, temp_data ); + }else + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_APPLICATION_MODULE_STATS[2], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_APPLICATION_MODULE_STATS, ulProcessNum); + + } + + + return offset; + +}; + + unsigned int dissect_tOCTVC1_MAIN_API_SESSION_HEARTBEAT_CONFIG(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset, tWS_EXTRA_VALUE *pExtValue ) { proto_tree *field_tree = tree; @@ -3195,6 +3647,109 @@ unsigned int dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP(tvbuff_t *tvb, } offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP, ulAccessMode); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_boolean(field_tree, ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[2], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP, ulHostOwnerFlag), temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP, ulHostOwnerFlag); + + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[3], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP, ulFileSize); + + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[4], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP, ulMaxFileSize); + + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP[5], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP, ulInstanceNum); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_item(field_tree, ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD, szFileName), FALSE); + + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD, szFileName); + + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD[1], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD, ulMaxFilesize); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_item(field_tree, ahf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP[0], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP, szFileName), FALSE); + + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP, szFileName); + } @@ -4884,6 +5439,255 @@ unsigned int dissect_tOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_RSP(tvbuff_t *tvb } + return 0; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD, ObjectCursor), "ObjectCursor:tOCTVC1_CURSOR_HANDLE_OBJECT_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP, ObjectCursor), "ObjectCursor:tOCTVC1_CURSOR_HANDLE_OBJECT_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_CURSOR_HANDLE_OBJECT_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP, ObjectNameList), "ObjectNameList:tOCTVC1_LIST_NAME_OBJECT32_GET"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_LIST_NAME_OBJECT32_GET( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD, hModule); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP, hModule); + + ti = proto_tree_add_item(field_tree, ahf_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP, szName), FALSE); + + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP, szName); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP, Info), "Info:tOCTVC1_MAIN_APPLICATION_MODULE_INFO"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_MAIN_APPLICATION_MODULE_INFO( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD, hModule); + + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_boolean(field_tree, ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD[1], tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD, ulResetStatsFlag), temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD, ulResetStatsFlag); + + } + + + return 0; + +}; + + +unsigned int dissect_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, unsigned int offset ) +{ + proto_tree *field_tree = tree; + unsigned int offset_0 = offset; + gint bytes = tvb_length_remaining(tvb, offset); + if (bytes < (gint)(sizeof(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)-sizeof(tOCTVC1_MSG_HEADER))) + { + proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP (%d byte%s) - Malformated packet...expected(%ld)", + bytes, plurality(bytes, "", "s"), + sizeof(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)-sizeof(tOCTVC1_MSG_HEADER)); + return 1; + } + else + { + int temp_data = 0; + proto_item *ti; + ti = proto_tree_add_text(tree, tvb, offset, bytes, + "tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP (%d byte%s)", bytes, plurality(bytes, "", "s")); + + field_tree = proto_item_add_subtree(ti, ett_octvc1_msg_type); + temp_data = tvb_get_ntohl( tvb, offset ); + { + ti = proto_tree_add_uint(field_tree, ahf_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP[0], tvb, offset, + 4, temp_data); + } + offset += mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP, hModule); + + ti = proto_tree_add_text(field_tree, tvb, offset, + mWS_FIELDSIZE(tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP, Stats), "Stats:tOCTVC1_MAIN_APPLICATION_MODULE_STATS"); + { + proto_tree* sub_tree2; + sub_tree2 = proto_item_add_subtree(ti, ett_octvc1_msg_type); + offset = dissect_tOCTVC1_MAIN_APPLICATION_MODULE_STATS( tvb, pinfo, sub_tree2, offset, NULL ); + } + } + + return 0; }; @@ -4896,6 +5700,8 @@ void ws_register_OCTVC1_MAIN(void) /**************************************************************************** Register Common struct ****************************************************************************/ + register_tOCTVC1_MAIN_APPLICATION_MODULE_INFO(); + register_tOCTVC1_MAIN_APPLICATION_MODULE_STATS(); register_tOCTVC1_MAIN_API_SESSION_HEARTBEAT_CONFIG(); register_tOCTVC1_MAIN_API_SESSION_HEARTBEAT_STATS(); register_tOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR(); @@ -4920,6 +5726,8 @@ void ws_register_OCTVC1_MAIN(void) register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP(); register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD(); register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP(); + register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD(); + register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP(); register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD(); register_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP(); register_tOCTVC1_MAIN_MSG_LOG_INFO_RSP(); @@ -4958,6 +5766,12 @@ void ws_register_OCTVC1_MAIN(void) register_tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD(); register_tOCTVC1_MAIN_MSG_APPLICATION_INFO_RSP(); register_tOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_RSP(); + register_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD(); + register_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP(); + register_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD(); + register_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP(); + register_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD(); + register_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP(); /**************************************************************************** Event Registered @@ -4987,6 +5801,7 @@ int ws_dissect_OCTVC1_MAIN_CMD( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, case cOCTVC1_MAIN_MSG_FILE_LIST_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_LIST_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID: return 0; break; case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_LOG_ERASE_CID: return 0; break; case cOCTVC1_MAIN_MSG_LOG_INFO_CID: return 0; break; @@ -5014,6 +5829,9 @@ int ws_dissect_OCTVC1_MAIN_CMD( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, case cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID: return 0; break; case cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID: return 0; break; + case cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD( tvb, pinfo, tree, 0 ); break; default: return 1; } } @@ -5035,6 +5853,7 @@ int ws_dissect_OCTVC1_MAIN_RSP( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, case cOCTVC1_MAIN_MSG_FILE_LIST_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_LIST_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID: return dissect_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_LOG_ERASE_CID: return 0; break; case cOCTVC1_MAIN_MSG_LOG_INFO_CID: return dissect_tOCTVC1_MAIN_MSG_LOG_INFO_RSP( tvb, pinfo, tree, 0 ); break; @@ -5062,6 +5881,9 @@ int ws_dissect_OCTVC1_MAIN_RSP( guint32 CID, tvbuff_t *tvb, packet_info *pinfo, case cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID: return 0; break; case cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_INFO_RSP( tvb, pinfo, tree, 0 ); break; case cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP( tvb, pinfo, tree, 0 ); break; + case cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID: return dissect_tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP( tvb, pinfo, tree, 0 ); break; default: return 1; } } diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_test.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_test.c index 419cad4..19190bb 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_test.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_module_test.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_ctrl.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_ctrl.c index b4f342b..baba3cb 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_ctrl.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_ctrl.c @@ -78,14 +78,13 @@ static int hf_octvc1_msg_header_ul_Type_R_CmdId_MsgId = -1; static int hf_octvc1_msg_header_ul_Type_R_CmdId_Flag = -1; -#define mWD_OCTVC1_CID_TYPE_BASE(uint32) ((uint32) & 0x00f00000) -#define mWD_OCTVC1_CID_UID(uint32) ((uint32) & 0x000f0000) +#define mWD_OCTVC1_CID_TYPE_BASE(uint32) ((uint32) & 0x0F000000) +#define mWD_OCTVC1_CID_UID(uint32) ((uint32) & 0x00FF0000) #define mWD_OCTVC1_CID_CODE(uint32) ((uint32) & 0x00000FFF) #define mWD_OCTVC1_CID_FLAG(uint32) ((uint32) & 0x0000F000) #define mWD_OCTVC1_CID_2_FLAG(uint32) (((uint32)& 0x0000F000)>>12) -#define mWD_OCTVC1_CID_2_UID(uint32) (((uint32)& 0x000F0000)>>16) -#define mWD_OCTVC1_CID_2_BASE(uint32) (((uint32)& 0x00F00000)>>20) +#define mWD_OCTVC1_CID_2_UID(uint32) (((uint32)& 0x00FF0000)>>16) const value_string octvc1_message_type_vals[] = @@ -99,9 +98,9 @@ const value_string octvc1_message_type_vals[] = const value_string octvc1_message_type_base_vals[] = { - { cOCTVC1_CID_BASE>>20, "Cmd/Rsp" }, - { cOCTVC1_EID_BASE>>20, "Notification" }, - { cOCTVC1_SID_BASE>>20, "Supervisory" }, + { cOCTVC1_CID_BASE>>24, "Cmd/Rsp" }, + { cOCTVC1_EID_BASE>>24, "Notification" }, + { cOCTVC1_SID_BASE>>24, "Supervisory" }, { 0, NULL }, }; @@ -429,7 +428,7 @@ void dissect_octvc1_ctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) packet_offset, 1, message_resynch<<28 ); proto_tree_add_uint( field_tree, hf_octvc1_msg_header_ul_Type_R_CmdId_Base, tvb, - packet_offset+1, 1, command_id_type_base ); + packet_offset, 1, command_id_type_base ); proto_tree_add_uint( field_tree, hf_octvc1_msg_header_ul_Type_R_CmdId_ModuleId, tvb, packet_offset+1, 1, command_id_uid ); @@ -673,13 +672,13 @@ void proto_register_octvc1_ctrl(void) { &hf_octvc1_msg_header_ul_Type_R_CmdId_Base, { "Message Type Base", "octvc1.msg_header.type_base", - FT_UINT32, BASE_HEX, VALS(octvc1_message_type_base_vals), 0x00f00000, + FT_UINT32, BASE_HEX, VALS(octvc1_message_type_base_vals), 0x0F000000, "Message identifier", HFILL } }, { &hf_octvc1_msg_header_ul_Type_R_CmdId_ModuleId, { "Module ID", "octvc1.msg_header.module_id", - FT_UINT32, BASE_HEX, VALS(vals_OCTVC1_module_UID), 0x000f0000, + FT_UINT32, BASE_HEX, VALS(vals_OCTVC1_module_UID), 0x00FF0000, "Module identifier", HFILL } }, { &hf_octvc1_msg_header_ul_Type_R_CmdId_Flag, diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_event.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_event.c index 2d7bc44..9ca328c 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_event.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvc1_msg_event.c @@ -61,8 +61,9 @@ static int hf_octvc1_event_header_ulEventId_Base = -1; static int hf_octvc1_event_header_ulEventId_Type = -1; static int hf_octvc1_event_header_ulEventId_Code = -1; +#define mWD_OCTVC1_EID_TYPE(uint32) ((uint32) & 0x0F000000) #define mWD_OCTVC1_EID_BASE(uint32) ((uint32) & 0x00ff0000) -#define mWD_OCTVC1_EID_2_UID(uint32) (((uint32)& 0x000f0000)>>16) +#define mWD_OCTVC1_EID_2_UID(uint32) (((uint32)& 0x00FF0000)>>16) #define mWD_OCTVC1_EID_CODE(uint32) ((uint32) & 0x0000ffff) @@ -80,6 +81,7 @@ void dissect_octvc1_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) unsigned int packet_offset = 0; guint32 evt_length; guint32 event_id; + guint32 msg_type_base; guint32 event_id_base; guint32 event_id_code; guint32 user_event_id; @@ -95,6 +97,7 @@ void dissect_octvc1_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) evt_length = tvb_get_ntohl( tvb, packet_offset ); packet_offset += sizeof(evt_length); event_id = tvb_get_ntohl( tvb, packet_offset ); + msg_type_base = mWD_OCTVC1_EID_TYPE(event_id); event_id_base = mWD_OCTVC1_EID_BASE(event_id); event_id_code = mWD_OCTVC1_EID_CODE(event_id); packet_offset += sizeof(event_id_code); @@ -199,7 +202,7 @@ void dissect_octvc1_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) field_tree = proto_item_add_subtree(tf, ett_octvc1_event_id); proto_tree_add_uint( field_tree, hf_octvc1_event_header_ulEventId_Type, tvb, - packet_offset+1, 1, event_id_base ); + packet_offset, 1, msg_type_base ); proto_tree_add_uint( field_tree, hf_octvc1_event_header_ulEventId_Base, tvb, packet_offset+1, 1, event_id_base ); @@ -229,7 +232,7 @@ void dissect_octvc1_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Call the module dissector */ fDoData = aOCTVC1ModuleColInfo[module_index].Dissector_fnc( cOCTVC1_MSG_TYPE_NOTIFICATION, - event_id_base | event_id_code, + msg_type_base | event_id_base | event_id_code, tvbData, pinfo, evt_tree ); } @@ -278,13 +281,13 @@ void proto_register_octvc1_event(void) { &hf_octvc1_event_header_ulEventId_Type, { "Message Type Base", "octvc1.event_header.type_base", - FT_UINT32, BASE_HEX, NULL, 0x00f00000, + FT_UINT32, BASE_HEX, NULL, 0x0F000000, "Message identifier", HFILL } }, { &hf_octvc1_event_header_ulEventId_Base, { "Module ID", "octvc1.event_header.module_id", - FT_UINT32, BASE_HEX, VALS(vals_OCTVC1_module_UID), 0x000f0000, + FT_UINT32, BASE_HEX, VALS(vals_OCTVC1_module_UID), 0x00FF0000, "Module identifier", HFILL } }, { &hf_octvc1_event_header_ulEventId_Code, diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvocnet_common.c b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvocnet_common.c index 6b70755..c8d3bc7 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvocnet_common.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvc1/source/octvocnet_common.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/module.h b/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/module.h index eb8cfab..faed5d8 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/module.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/module.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Octasic_Revision: 4 $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/octvocnet_common.h b/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/octvocnet_common.h index 3f42501..d06fb11 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/octvocnet_common.h +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/include/octvocnet_common.h @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/octvocnet_common.c b/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/octvocnet_common.c index 6b70755..c8d3bc7 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/octvocnet_common.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/octvocnet_common.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) $Octasic_Revision: $ diff --git a/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/packet-vocallonet.c b/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/packet-vocallonet.c index 56c8e38..cbfe589 100644 --- a/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/packet-vocallonet.c +++ b/application/tool/wireshark/plugins/octasic/octsdr/octvocnet_ws/source/packet-vocallonet.c @@ -65,8 +65,7 @@ static int hf_vocallonet_control_socket_id = -1; /* Packet data external fields (formats a-q) */ static int proto_vocallonet_data = -1; static int hf_vocallonet_data_socket_handle = -1; -static int proto_vocallonet_a_data = -1; -static int proto_vocallonet_d_data = -1; +static int proto_vocallonet_d_frag_data = -1; static int proto_vocallonet_ev_data = -1; static int proto_vocallonet_f_data = -1; @@ -75,30 +74,18 @@ static int proto_vocallonet_f_data = -1; /* None other than already defined */ /* Packet data fields (formats b-f) */ -static int hf_vocallonet_data_logical_object_handle_high = -1; -static int hf_vocallonet_data_logical_object_handle_middle = -1; -static int hf_vocallonet_data_logical_object_handle_low = -1; +static int hf_vocallonet_data_logical_object_handle = -1; static int hf_vocallonet_data_packet_port = -1; static int hf_vocallonet_data_dest_fifo_id = -1; /* Packet format D fields (voice) */ -static int hf_vocallonet_d_timestamp = -1; -static int hf_vocallonet_d_marker = -1; -static int hf_vocallonet_d_valid_rtp = -1; -static int hf_vocallonet_d_encoding_type = -1; -static int hf_vocallonet_d_sequence_number = -1; -/* Packet format D fields (voice) when valid_rtp is set to 1 */ -static int hf_vocallonet_d_rtp_pad_size = -1; -static int hf_vocallonet_d_rtp_payload_offset = -1; -static int hf_vocallonet_d_rtp_version = -1; -static int hf_vocallonet_d_rtp_padding = -1; -static int hf_vocallonet_d_rtp_extension = -1; -static int hf_vocallonet_d_rtp_csrc_count = -1; -static int hf_vocallonet_d_rtp_payload_type = -1; -static int hf_vocallonet_d_rtp_sync_source = -1; -static int hf_vocallonet_d_VocFlag_BFI = -1; -static int hf_vocallonet_d_VocFlag_TAF = -1; -static int hf_vocallonet_d_VocFlag_SID = -1; +static int hf_vocallonet_d_frag_SequenceId = -1; +static int hf_vocallonet_d_frag_TransfertTotalSize = -1; +static int hf_vocallonet_d_frag_FragmentTotalNum = -1; +static int hf_vocallonet_d_frag_FragmentId = -1; +static int hf_vocallonet_d_frag_FragmentDataOffset = -1; +static int hf_vocallonet_d_frag_FragmentDataSize = -1; +static int hf_vocallonet_d_frag_UserId = -1; /* Packet format F fields (raw) */ static int hf_vocallonet_f_timestamp = -1; @@ -109,8 +96,7 @@ static gint ett_vocallonet = -1; static gint ett_vocallonet_control = -1; static gint ett_vocallonet_data = -1; -static gint ett_vocallonet_a_data = -1; -static gint ett_vocallonet_d_data = -1; +static gint ett_vocallonet_d_frag_data = -1; static gint ett_vocallonet_f_data = -1; @@ -123,20 +109,8 @@ static gint packet_f_decode = PACKET_F_UNSPECIFIED; static dissector_handle_t data_handle; -static dissector_handle_t rfc4175_yuv_handle; -static dissector_handle_t yuv_extended_handle; -static dissector_handle_t macroblock_handle; -static dissector_handle_t eth_handle; -static dissector_handle_t ip_handle; + static dissector_handle_t lapd_handle; -static dissector_handle_t h263_handle; -static dissector_handle_t h263p_handle; -static dissector_handle_t h264_handle; -static dissector_handle_t hMpeg4_handle; -static dissector_handle_t hT38_handle; - -static dissector_handle_t amr_handle; - static dissector_handle_t octvc1_ctrl_handle; static dissector_handle_t octvc1_event_handle; static dissector_handle_t octpkt_handle; @@ -155,61 +129,15 @@ const value_string vocallonet_api_type_vals[] = const value_string vocallonet_format_vals[] = { { cOCTVOCNET_PKT_FORMAT_CTRL, "Control packet" }, - { cOCTVOCNET_PKT_FORMAT_A, "Format A: Normal Ethernet Packet (to/from Ethernet ports)" }, - { cOCTVOCNET_PKT_FORMAT_D, "Format D: Voice/Video in a Packet" }, { cOCTVOCNET_PKT_FORMAT_F, "Format F: Raw Data Packet" }, + { cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT, "Format DATA_FRAGMENT: Data Packet (allow fragment)" }, { 0, NULL }, }; const value_string vocallonet_d_encoding_type_vals[] = { -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_TONE - { cOCTVOCNET_PKT_D_TYPE_ENUM_TONE, "Tone event" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_GEN_SID, "Generic SID" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_LINEAR_8KSS, "Linear 16-bits sign extended, 8000Hz sampling" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_LINEAR_16KSS, "Linear 16-bit, 16000Hz sampling" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_U_LAW, "G.711 PCM, U-law" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_A_LAW, "G.711 PCM, A-law" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_U_LAW_VBD, "G.711 PCM, U-law, Voiceband data" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_PCM_A_LAW_VBD, "G.711 PCM, A-law, Voiceband data" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G726_16, "G.726 ADPCM, 16kbps (AAL2)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G726_24, "G.726 ADPCM, 24kbps (AAL2)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G726_32, "G.726 ADPCM, 32kbps (AAL2)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G726_40, "G.726 ADPCM, 40kbps (AAL2)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G726_16_RTP, "G.726 ADPCM, 16kbps (RTP)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G726_24_RTP, "G.726 ADPCM, 24kbps (RTP)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G726_32_RTP, "G.726 ADPCM, 32kbps (RTP)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G726_40_RTP, "G.726 ADPCM, 40kbps (RTP)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G722_48, "G.722 , 48kbps" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G722_56, "G.722 , 56kbps" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G722_64, "G.722 , 64kbps" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G723_1, "G.723.1" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G729A, "G.729a" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G729AB_8, "G.729ab, 8kbps" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_AMR, "AMR" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_RTP, "AMR (IETF RFC 3267)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_EFR, "EFR" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_EFR_RTP, "EFR (IETF RFC 3267)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_WB, "Wideband AMR" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_WB_RTP, "Wideband AMR (IETF RFC 3267)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_ILBC, "ILBC (ITEF RFC 3951)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G722_1_24, "G.722.1, 24kbps" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_G722_1_32, "G.722.1, 32kbps" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_T38_UDPTL, "T.38 over UDPTL" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_T38_RTP, "T.38 over RTP" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_VOX, "VOX" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_YUV_RTP_RFC4175, "YUV uncompressed video data (IETF RFC 4175)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV, "YUV uncompressed video data" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV_EXTENDED, "YUV EXTENDED uncompressed video data" }, - - { cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190, "H.263 compressed video data (IETF RFC 2190)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190_BYTE_BOUNDARY, "H.263 compressed video data (IETF RFC 2190). Packetized at Byte boundaries." }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2429, "H.263 compressed video data (IETF RFC 2429 or RFC 4629) )" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_MPEG4_RTP_RFC3016, "MPEG-4 compressed elementary stream video data (IETF RFC 3016)" }, - { cOCTVOCNET_PKT_D_TYPE_ENUM_H264_RTP_RFC3984, "H.264 Video (IETF RFC 3984)" }, -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_TONE */ { 0, NULL }, }; @@ -217,13 +145,7 @@ const value_string vocallonet_f_subtype_vals[] = { { cOCTVOCNET_PKT_SUBTYPE_UNSPECIFIED, "Unspecified" }, { cOCTVOCNET_PKT_SUBTYPE_API_EVENT, "API Event" }, - { cOCTVOCNET_PKT_SUBTYPE_ETH, "Ethernet" }, - { cOCTVOCNET_PKT_SUBTYPE_IP, "IP" }, - { cOCTVOCNET_PKT_SUBTYPE_UDP_PAYLOAD, "UDP Payload" }, - { cOCTVOCNET_PKT_SUBTYPE_TCP_PAYLOAD, "TCP Payload" }, -#ifdef cOCTVOCNET_PKT_SUBTYPE_VIDEO_IMAGE_DESCRIPTOR - { cOCTVOCNET_PKT_SUBTYPE_VIDEO_IMAGE_DESCRIPTOR, "Video Image Descriptor" }, -#endif /* cOCTVOCNET_PKT_SUBTYPE_VIDEO_IMAGE_DESCRIPTOR */ + { cOCTVOCNET_PKT_SUBTYPE_MODULE_DATA, "Module Data" }, { 0, NULL }, }; @@ -232,21 +154,6 @@ const value_string vocallonet_f_subtype_vals[] = #define VOCALLONET_TOTAL_PACKET_SIZE(uint16) ((uint16) & 0x07ff) #define VOCALLONET_API_TYPE(octet) (((octet) & 0x78) >> 3 ) -#define VOCALLONET_B_NUM_CELL(octet) ((octet) & 0x3f) - -#define VOCALLONET_D_VALID_RTP(uint32) ((uint32) & 0x80000000) -#define VOCALLONET_D_ENCODING_TYPE(uint32) ((uint32) & 0x7fc00000) -#define VOCALLONET_D_RTP_PAD_SIZE(uint32) ((uint32) & 0x003fc000) -#define VOCALLONET_D_RTP_PAYLOAD_OFFSET(uint32) ((uint32) & 0x00003fff) - -#define VOCALLONET_D_RTP_VERSION(uint32) ((uint32) & 0xc0000000) >> 16 -#define VOCALLONET_D_RTP_PADDING(uint32) ((uint32) & 0x20000000) >> 16 -#define VOCALLONET_D_RTP_EXTENSION(uint32) ((uint32) & 0x10000000) >> 16 -#define VOCALLONET_D_RTP_CSRC_COUNT(uint32) ((uint32) & 0x0f000000) >> 16 -#define VOCALLONET_D_RTP_MARKER(uint32) ((uint32) & 0x00800000) >> 16 -#define VOCALLONET_D_RTP_PAYLOAD_TYPE(uint32) ((uint32) & 0x007f0000) >> 16 -#define VOCALLONET_D_RTP_SEQ_NUMBER(uint32) ((uint32) & 0x0000ffff) - #define VOCALLONET_F_SUBTYPE(uint32) ((uint32) & 0x0000000f) #define VOCALLONET_F_EVENT_ID_BASE(uint32) ((uint32) & 0x0fff0000) #define VOCALLONET_F_EVENT_ID_CODE(uint32) ((uint32) & 0x0000ffff) @@ -261,28 +168,16 @@ static void dissect_vocallonet_packet_data(tvbuff_t *tvb, proto_item *ti, proto_tree *vocallonet_tree, unsigned int offset) { unsigned int packet_offset = offset; - guint32 logical_object_handle_high; - guint32 logical_object_handle_middle; - guint32 logical_object_handle_low; + guint32 logical_object_handle; guint32 packet_port; guint32 dest_fifo; proto_tree* vocallonet_data_tree = NULL; unsigned int layer_length = 0; /* dissect the common packet data */ -// packet_offset += 2; Sygag : check if the two first bytes are reserved -// logical_object_handle_high = tvb_get_ntohs( tvb, packet_offset ); - logical_object_handle_high = tvb_get_ntohl( tvb, packet_offset ); - packet_offset += sizeof(logical_object_handle_high); - layer_length += sizeof(logical_object_handle_high); - - logical_object_handle_middle = tvb_get_ntohl( tvb, packet_offset ); - packet_offset += sizeof(logical_object_handle_middle); - layer_length += sizeof(logical_object_handle_middle); - - logical_object_handle_low = tvb_get_ntohl( tvb, packet_offset ); - packet_offset += sizeof(logical_object_handle_low); - layer_length += sizeof(logical_object_handle_low); + logical_object_handle = tvb_get_ntohl( tvb, packet_offset ); + packet_offset += sizeof(logical_object_handle); + layer_length += sizeof(logical_object_handle); packet_port = tvb_get_ntohl( tvb, packet_offset ); packet_offset += sizeof(packet_port); @@ -301,18 +196,9 @@ static void dissect_vocallonet_packet_data(tvbuff_t *tvb, proto_item *ti, /* Scroll back to the beginning of the packet */ packet_offset = offset; -// packet_offset += 2; Sygag : check if the two first bytes are reserved - proto_tree_add_uint( vocallonet_data_tree, hf_vocallonet_data_logical_object_handle_high, tvb, - packet_offset, sizeof(logical_object_handle_high), logical_object_handle_high ); - packet_offset += sizeof(logical_object_handle_high); - - proto_tree_add_uint( vocallonet_data_tree, hf_vocallonet_data_logical_object_handle_middle, tvb, - packet_offset, sizeof(logical_object_handle_middle), logical_object_handle_middle ); - packet_offset += sizeof(logical_object_handle_middle); - - proto_tree_add_uint( vocallonet_data_tree, hf_vocallonet_data_logical_object_handle_low, tvb, - packet_offset, sizeof(logical_object_handle_low), logical_object_handle_low ); - packet_offset += sizeof(logical_object_handle_low); + proto_tree_add_uint( vocallonet_data_tree, hf_vocallonet_data_logical_object_handle, tvb, + packet_offset, sizeof(logical_object_handle), logical_object_handle ); + packet_offset += sizeof(logical_object_handle); proto_tree_add_uint( vocallonet_data_tree, hf_vocallonet_data_packet_port, tvb, packet_offset, sizeof(packet_port), packet_port ); @@ -398,482 +284,6 @@ static void dissect_vocallonet_control(tvbuff_t *tvb, packet_info *pinfo, proto_ } - -/************************************************************************* -* -* Code to actually dissect the Vocallo A format data packet header -* -**************************************************************************/ -static void dissect_vocallonet_a_packet(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *vocallonet_tree, unsigned int offset) -{ - unsigned int packet_offset = offset; - tOctWsPrivateData * pPrivData = (tOctWsPrivateData *)pinfo->private_data; - - /* Add summary display for the Vocallonet packet */ - if ( check_col( pinfo->cinfo, COL_INFO) ) - { - col_add_fstr( pinfo->cinfo, COL_INFO, - "OCTVOCNET A-packet format(%d), Size=%u bytes%s", - pPrivData->format, - pPrivData->total_packet_size, - pPrivData->trace_flag ? ", Trace" : ""); - } - - /* Remaining bytes are an ethernet packet */ - if (tvb_reported_length_remaining(tvb, packet_offset) > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, -1, -1); - call_dissector(eth_handle, tvb, pinfo, vocallonet_tree); - } -} - - - -/************************************************************************* -* -* Code to actually dissect the Vocallo D format data packet header -* -**************************************************************************/ -static void dissect_vocallonet_d_packet(tvbuff_t *tvb, proto_item *ti, packet_info *pinfo, - proto_tree *vocallonet_tree, unsigned int offset, proto_tree *vocallonet_tree2) -{ - proto_tree* vocallonet_data_tree = NULL; - unsigned int packet_offset = offset; - unsigned int ulReserved_LocalTimestamp; - unsigned int ul_Rtp_PktType_Pad_Offset; - unsigned int ulRtpHeader; - proto_tree* vocallonet_d_tree = NULL; - unsigned int layer_offset = 0; - tOctWsPrivateData * pPrivData = (tOctWsPrivateData *)pinfo->private_data; - - - /* Fields refering to the tOCTVOCNET_PKT_DATA_D_HEADER */ - - /* ul_Rtp_PktType_Pad_Offset */ - guint32 valid_rtp; - guint32 encoding_type; - guint32 rtp_pad_size; /* valid_rtp == 1 */ - guint32 rtp_payload_offset; /* valid_rtp == 1 */ - - /* aulRtp[0] */ - guint16 rtp_version; /* valid_rtp == 1 */ - guint16 rtp_padding; /* valid_rtp == 1 */ - guint16 rtp_extension; /* valid_rtp == 1 */ - guint16 rtp_csrc_count; /* valid_rtp == 1 */ - guint16 rtp_marker; - guint16 rtp_payload_type; /* valid_rtp == 1 */ - guint16 rtp_sequence_number; - - /* aulRtp[1] */ - guint32 timestamp; - - /* aulRtp[2] */ - guint32 rtp_sync_source; /* valid_rtp == 1 */ - - - /* Add summary display for the Vocallonet packet */ - if ( check_col( pinfo->cinfo, COL_INFO) ) - { - col_add_fstr( pinfo->cinfo, COL_INFO, - "OCTVOCNET D-packet format(%d), Size=%u bytes%s", - pPrivData->format, - pPrivData->total_packet_size, - pPrivData->trace_flag ? ", Trace" : ""); - } - - /* !+! LUTAG TEMP BEFORE TO MAKE CHANGES !!!! */ - vocallonet_data_tree = vocallonet_tree; - - /* First, dissect the packet data fields */ - dissect_vocallonet_packet_data(tvb, ti, vocallonet_tree2, packet_offset); - - /* dissect reserved */ - packet_offset += 20; - ulReserved_LocalTimestamp = tvb_get_ntohl( tvb, packet_offset ); - - packet_offset += sizeof(ulReserved_LocalTimestamp); - layer_offset = packet_offset; - - /* dissect packet data */ - ul_Rtp_PktType_Pad_Offset = tvb_get_ntohl( tvb, packet_offset ); - - valid_rtp = VOCALLONET_D_VALID_RTP(ul_Rtp_PktType_Pad_Offset); - encoding_type = VOCALLONET_D_ENCODING_TYPE(ul_Rtp_PktType_Pad_Offset); - rtp_pad_size = VOCALLONET_D_RTP_PAD_SIZE(ul_Rtp_PktType_Pad_Offset); - rtp_payload_offset = VOCALLONET_D_RTP_PAYLOAD_OFFSET(ul_Rtp_PktType_Pad_Offset); - - packet_offset += sizeof(ul_Rtp_PktType_Pad_Offset); - - ulRtpHeader = tvb_get_ntohl( tvb, packet_offset ); - - rtp_version = VOCALLONET_D_RTP_VERSION(ulRtpHeader); - rtp_padding = VOCALLONET_D_RTP_PADDING(ulRtpHeader); - rtp_extension = VOCALLONET_D_RTP_EXTENSION(ulRtpHeader); - rtp_csrc_count = VOCALLONET_D_RTP_CSRC_COUNT(ulRtpHeader); - rtp_marker = VOCALLONET_D_RTP_MARKER(ulRtpHeader); - rtp_payload_type = VOCALLONET_D_RTP_PAYLOAD_TYPE(ulRtpHeader); - rtp_sequence_number = VOCALLONET_D_RTP_SEQ_NUMBER(ulRtpHeader); - - if (rtp_marker) - { - if ( check_col( pinfo->cinfo, COL_INFO) ) - { - col_append_str( pinfo->cinfo, COL_INFO, ", Mark "); - } - } - - packet_offset += sizeof(ulRtpHeader); - - timestamp = tvb_get_ntohl( tvb, packet_offset ); - - packet_offset += sizeof(timestamp); - - rtp_sync_source = tvb_get_ntohl( tvb, packet_offset ); - - packet_offset += sizeof(rtp_sync_source); - - if ( vocallonet_data_tree ) - { - proto_tree* sub_tree2; - - /* Add the subtree for struct tOCTVOCNET_PKT_DATA_D_HEADER */ - ti = proto_tree_add_item( vocallonet_data_tree, proto_vocallonet_d_data, tvb, layer_offset, packet_offset -layer_offset, FALSE ); - vocallonet_d_tree = proto_item_add_subtree( ti, ett_vocallonet_d_data ); - - /* Scroll back to the beginning of the packet */ - packet_offset = offset + 24; - - ti = proto_tree_add_text(vocallonet_d_tree, tvb, packet_offset, - 4, "Encoding Type:%s", val_to_str( (encoding_type>>22), vocallonet_d_encoding_type_vals, - "Unknown (%u)" ) ); - - sub_tree2 = proto_item_add_subtree(ti, ett_vocallonet_d_data); - - proto_tree_add_boolean( sub_tree2, hf_vocallonet_d_valid_rtp, tvb, - packet_offset, 1, valid_rtp ); - - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_encoding_type, tvb, - packet_offset, 2, encoding_type ); - - - if ( valid_rtp ) - { - /* Add the rtp padding length and rtp payload offset */ - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_rtp_pad_size, tvb, - packet_offset+2, 1, rtp_pad_size ); - - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_rtp_payload_offset, tvb, - packet_offset+2, 2, rtp_payload_offset ); - } - - packet_offset += sizeof(encoding_type); - - - - - if ( valid_rtp ) - { - ti = proto_tree_add_text(vocallonet_d_tree, tvb, packet_offset, - 4, "RTP Payload Type:%d", rtp_payload_type ); - - sub_tree2 = proto_item_add_subtree(ti, ett_vocallonet_d_data); - - /* Add the rtp fields */ - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_rtp_version, tvb, - packet_offset, 1, ulRtpHeader ); - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_rtp_padding, tvb, - packet_offset, 1, ulRtpHeader ); - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_rtp_extension, tvb, - packet_offset, 1, ulRtpHeader ); - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_rtp_csrc_count, tvb, - packet_offset, 1, ulRtpHeader ); - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_marker, tvb, - packet_offset+1, 1, ulRtpHeader ); - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_rtp_payload_type, tvb, - packet_offset+1, 1, ulRtpHeader ); - } - else - { - ti = proto_tree_add_text(vocallonet_d_tree, tvb, packet_offset, - 4, "Sequence number:0x%x", rtp_sequence_number & 0x0000FFFF ); - - sub_tree2 = proto_item_add_subtree(ti, ett_vocallonet_d_data); - - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_marker, tvb, - packet_offset+1, 1, ulRtpHeader ); - - } - - packet_offset += sizeof(rtp_payload_type); - - - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_sequence_number, tvb, - packet_offset, sizeof(rtp_sequence_number), rtp_sequence_number ); - - packet_offset += sizeof(rtp_sequence_number); - - proto_tree_add_uint( vocallonet_d_tree, hf_vocallonet_d_timestamp, tvb, - packet_offset, sizeof(timestamp), timestamp ); - - packet_offset += sizeof(timestamp); - - if ( valid_rtp ) - { - proto_tree_add_uint( vocallonet_d_tree, hf_vocallonet_d_rtp_sync_source, tvb, - packet_offset, sizeof(rtp_sync_source), rtp_sync_source ); - - } - else - { - ti = proto_tree_add_text(vocallonet_d_tree, tvb, packet_offset, - 4, "Vocoder Flags:0x%x", rtp_sync_source ); - - sub_tree2 = proto_item_add_subtree(ti, ett_vocallonet_d_data); - - - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_VocFlag_BFI, tvb, - packet_offset+3, 1, rtp_sync_source ); - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_VocFlag_TAF, tvb, - packet_offset+3, 1, rtp_sync_source ); - proto_tree_add_uint( sub_tree2, hf_vocallonet_d_VocFlag_SID, tvb, - packet_offset+3, 1, rtp_sync_source ); - } - - packet_offset += sizeof(rtp_sync_source); - - } - - - /* Dissect the relevant packet format */ - switch( encoding_type >> 22) - { -#ifdef cOCTVOCNET_PKT_SUBTYPE_VIDEO_IMAGE_DESCRIPTOR - case cOCTVOCNET_PKT_D_TYPE_ENUM_YUV_RTP_RFC4175: - { - /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "YUV RFC4175" ); - - /* If any bytes remain, send it to the generic data dissector */ - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( rfc4175_yuv_handle ) - call_dissector(rfc4175_yuv_handle, tvb, pinfo, vocallonet_tree); - else - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_SUBTYPE_VIDEO_IMAGE_DESCRIPTOR */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV - case cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV: - { - /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "YUV RAW" ); - - /* If any bytes remain, send it to the generic data dissector */ - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( macroblock_handle ) - call_dissector(macroblock_handle, tvb, pinfo, vocallonet_tree); - else - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV_EXTENDED - case cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV_EXTENDED: - { - /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "YUV_EXTENDED" ); - - /* If any bytes remain, send it to the generic data dissector */ - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( yuv_extended_handle ) - call_dissector(yuv_extended_handle, tvb, pinfo, vocallonet_tree); - else - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_RAW_YUV_EXTENDED */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_T38_UDPTL - case cOCTVOCNET_PKT_D_TYPE_ENUM_T38_UDPTL: - { - /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "T38_UDPTL" ); - - /* If any bytes remain, send it to the generic data dissector */ - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( hT38_handle ) - { - pinfo->ipproto = IP_PROTO_UDP; - call_dissector(hT38_handle, tvb, pinfo, vocallonet_tree); - } - else - { - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_T38_UDPTL */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_T38_RTP - case cOCTVOCNET_PKT_D_TYPE_ENUM_T38_RTP: - { - /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "T38_RTP" ); - - /* If any bytes remain, send it to the generic data dissector */ - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( hT38_handle ) - { - pinfo->ipproto = IP_PROTO_TCP; - call_dissector(hT38_handle, tvb, pinfo, vocallonet_tree); - } - else - { - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_T38_RTP */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_MPEG4_RTP_RFC3016 - case cOCTVOCNET_PKT_D_TYPE_ENUM_MPEG4_RTP_RFC3016: - { - /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG-4" ); - - /* If any bytes remain, send it to the generic data dissector */ - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( hMpeg4_handle ) - call_dissector(hMpeg4_handle, tvb, pinfo, vocallonet_tree); - else - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_MPEG4_RTP_RFC3016 */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2429 - case cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2429: - { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H263P" ); - - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( h263_handle ) - call_dissector(h263p_handle, tvb, pinfo, vocallonet_tree); - else - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2429 */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190 - case cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190: - { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H263" ); - - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( h263_handle ) - call_dissector(h263_handle, tvb, pinfo, vocallonet_tree); - else - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_H263_RTP_RFC2190 */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_H264_RTP_RFC3984 - case cOCTVOCNET_PKT_D_TYPE_ENUM_H264_RTP_RFC3984: - { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H264" ); - - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( h264_handle ) - call_dissector(h264_handle, tvb, pinfo, vocallonet_tree); - else - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_H264_RTP_RFC3984 */ -#ifdef cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_RTP - case cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_RTP: - case cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_WB_RTP: - { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMR" ); - - if (pPrivData->total_packet_size - packet_offset > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset, - pPrivData->total_packet_size - pPrivData->pktHdt_size - packet_offset); - if( amr_handle ) - call_dissector(amr_handle, tvb, pinfo, vocallonet_tree); - else - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_D_TYPE_ENUM_AMR_RTP */ - default: - { - /* Remaining bytes are the packet's data */ - if (tvb_reported_length_remaining(tvb, packet_offset) > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, -1, -1); - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; - } -} - /************************************************************************* * * Code to actually dissect the Vocallo F format data packet header @@ -902,7 +312,7 @@ static void dissect_vocallonet_f_packet(tvbuff_t *tvb, proto_item *ti, packet_in /* First, dissect the packet data fields */ dissect_vocallonet_packet_data(tvb, ti, vocallonet_tree2, packet_offset); - packet_offset += 20; + packet_offset += sizeof(tOCTVOCNET_PKT_DATA_HEADER); // layer_offset = packet_offset; timestamp = tvb_get_ntohl( tvb, packet_offset ); @@ -921,7 +331,7 @@ static void dissect_vocallonet_f_packet(tvbuff_t *tvb, proto_item *ti, packet_in /* Scroll back to the beginning of the packet */ - packet_offset = offset + 20; + packet_offset = offset + sizeof(tOCTVOCNET_PKT_DATA_HEADER); proto_tree_add_uint( vocallonet_control_tree, hf_vocallonet_f_timestamp, tvb, packet_offset, sizeof(timestamp), timestamp ); @@ -959,25 +369,6 @@ static void dissect_vocallonet_f_packet(tvbuff_t *tvb, proto_item *ti, packet_in } break; - case cOCTVOCNET_PKT_SUBTYPE_ETH: - { - if (tvb_reported_length_remaining(tvb, packet_offset) > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, -1, -1); - call_dissector(eth_handle, tvb, pinfo, vocallonet_tree); - } - } - break; - - case cOCTVOCNET_PKT_SUBTYPE_IP: - { - if (tvb_reported_length_remaining(tvb, packet_offset) > 0) - { - tvb = tvb_new_subset(tvb, packet_offset, -1, -1); - call_dissector(ip_handle, tvb, pinfo, vocallonet_tree); - } - } - break; case cOCTVOCNET_PKT_SUBTYPE_UNSPECIFIED: if( packet_f_decode == PACKET_F_LAPD ) @@ -991,21 +382,9 @@ static void dissect_vocallonet_f_packet(tvbuff_t *tvb, proto_item *ti, packet_in } break; -#ifdef cOCTVOCNET_PKT_SUBTYPE_VIDEO_IMAGE_DESCRIPTOR - case cOCTVOCNET_PKT_SUBTYPE_VIDEO_IMAGE_DESCRIPTOR: - { - guint32 length_remaining = tvb_reported_length_remaining(tvb, packet_offset); - if ( length_remaining > 0 ) - { - tvb = tvb_new_subset(tvb, packet_offset, -1, -1); - call_dissector(data_handle, tvb, pinfo, vocallonet_tree); - } - } - break; -#endif /* cOCTVOCNET_PKT_SUBTYPE_VIDEO_IMAGE_DESCRIPTOR */ - case cOCTVOCNET_PKT_SUBTYPE_UDP_PAYLOAD: - case cOCTVOCNET_PKT_SUBTYPE_TCP_PAYLOAD: + + case cOCTVOCNET_PKT_SUBTYPE_MODULE_DATA: default: { /* If any bytes remain, send it to the generic data dissector */ @@ -1019,6 +398,88 @@ static void dissect_vocallonet_f_packet(tvbuff_t *tvb, proto_item *ti, packet_in } } + +/************************************************************************* +* +* Code to actually dissect the Vocallo Data_Fragment format data packet header +* +**************************************************************************/ +static void dissect_vocallonet_data_fragment_packet(tvbuff_t *tvb, proto_item *ti, packet_info *pinfo, + proto_tree *vocallonet_tree, unsigned int offset, + proto_tree *vocallonet_tree2 ,guint16 f_padding ) +{ + unsigned int packet_offset = offset; + guint32 ulSequenceId; + guint32 ulTransfertTotalSize; + guint32 ulFragmentTotalNum; + guint32 ulFragmentId; + guint32 ulFragmentDataOffset; + guint32 ulFragmentDataSize; + guint32 ulUserId; + + proto_tree* vocallonet_control_tree = NULL; + unsigned int layer_offset = 0; + tOctWsPrivateData * pPrivData = (tOctWsPrivateData *)pinfo->private_data; + + /* Add summary display for the Vocallonet packet */ + if ( check_col( pinfo->cinfo, COL_INFO) ) + { + col_add_fstr( pinfo->cinfo, COL_INFO, + "OCTVOCNET DATA_FRAG-packet format(%d), Size=%u bytes%s", + pPrivData->format, + pPrivData->total_packet_size, + pPrivData->trace_flag ? ", Trace" : ""); + } + + /* First, dissect the packet f fields */ + dissect_vocallonet_f_packet(tvb, ti, pinfo, vocallonet_tree, offset, vocallonet_tree2, f_padding); + + packet_offset += sizeof(tOCTVOCNET_PKT_DATA_F_HEADER); // + layer_offset = packet_offset; + + ulSequenceId = tvb_get_ntohl( tvb, packet_offset ); + packet_offset += sizeof(ulSequenceId); + ulTransfertTotalSize = tvb_get_ntohl( tvb, packet_offset ); + packet_offset += sizeof(ulTransfertTotalSize); + ulFragmentTotalNum = tvb_get_ntohl( tvb, packet_offset ); + packet_offset += sizeof(ulFragmentTotalNum); + ulFragmentId = tvb_get_ntohl( tvb, packet_offset ); + packet_offset += sizeof(ulFragmentId); + ulFragmentDataOffset = tvb_get_ntohl( tvb, packet_offset ); + packet_offset += sizeof(ulFragmentDataOffset); + ulFragmentDataSize = tvb_get_ntohl( tvb, packet_offset ); + packet_offset += sizeof(ulFragmentDataSize); + ulUserId = tvb_get_ntohl( tvb, packet_offset ); + packet_offset += sizeof(ulUserId); + + if (vocallonet_tree) + { + + /* Add the subtree for struct tOCTVOCNET_PKT_DATA_F_HEADER */ + ti = proto_tree_add_item( vocallonet_tree, proto_vocallonet_f_data, tvb, layer_offset, pPrivData->total_packet_size - layer_offset, FALSE ); + vocallonet_control_tree = proto_item_add_subtree( ti, ett_vocallonet_control ); + + + /* Scroll back to the beginning of the packet */ + packet_offset = offset + sizeof(tOCTVOCNET_PKT_DATA_F_HEADER); + + proto_tree_add_uint( vocallonet_control_tree, hf_vocallonet_d_frag_SequenceId, tvb, packet_offset, sizeof(ulSequenceId), ulSequenceId ); + packet_offset += sizeof(ulSequenceId); + proto_tree_add_uint( vocallonet_control_tree, hf_vocallonet_d_frag_TransfertTotalSize, tvb, packet_offset, sizeof(ulTransfertTotalSize), ulTransfertTotalSize ); + packet_offset += sizeof(ulTransfertTotalSize); + proto_tree_add_uint( vocallonet_control_tree, hf_vocallonet_d_frag_FragmentTotalNum, tvb, packet_offset, sizeof(ulFragmentTotalNum), ulFragmentTotalNum ); + packet_offset += sizeof(ulFragmentTotalNum); + proto_tree_add_uint( vocallonet_control_tree, hf_vocallonet_d_frag_FragmentId, tvb, packet_offset, sizeof(ulFragmentId), ulFragmentId ); + packet_offset += sizeof(ulFragmentId); + proto_tree_add_uint( vocallonet_control_tree, hf_vocallonet_d_frag_FragmentDataOffset, tvb, packet_offset, sizeof(ulFragmentDataOffset), ulFragmentDataOffset ); + packet_offset += sizeof(ulFragmentDataOffset); + proto_tree_add_uint( vocallonet_control_tree, hf_vocallonet_d_frag_FragmentDataSize, tvb, packet_offset, sizeof(ulFragmentDataSize), ulFragmentDataSize ); + packet_offset += sizeof(ulFragmentDataSize); + proto_tree_add_uint( vocallonet_control_tree, hf_vocallonet_d_frag_UserId, tvb, packet_offset, sizeof(ulUserId), ulUserId ); + packet_offset += sizeof(ulUserId); + + } +} /************************************************************************* * * Code to actually dissect the Vocallo common packet header @@ -1064,15 +525,10 @@ static void dissect_vocallonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } } break; - case cOCTVOCNET_PKT_FORMAT_A: - { - dissect_vocallonet_a_packet(tvb, pinfo, tree, offset); - } - break; - case cOCTVOCNET_PKT_FORMAT_D: + case cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT: { - dissect_vocallonet_d_packet(tvb, ti, pinfo, tree, offset, vocallonet_tree); + dissect_vocallonet_data_fragment_packet(tvb, ti, pinfo, tree, offset, vocallonet_tree, pPrivData->padding); } break; @@ -1133,28 +589,11 @@ void proto_register_vocallonet(void) static hf_register_info hf_vocallonet_data[] = { - /* Common packet data external fields (formats a-q) */ - { &hf_vocallonet_data_socket_handle, - { "Socket Handle", "vocallonet.data.socket_handle", - FT_UINT16, BASE_HEX, NULL, 0x0, - "Socket Handle", HFILL } - }, - /* Common packet data fields (formats b-f) */ - { &hf_vocallonet_data_logical_object_handle_high, - { "Object Handle (high)", "vocallonet.data.logical_object_handle.high", -// FT_UINT16, BASE_HEX, NULL, 0x0, Sygag : check if the two first bytes are reserved + /* Common packet data fields */ + { &hf_vocallonet_data_logical_object_handle, + { "Object Handle ", "vocallonet.data.logical_object_handle", FT_UINT32, BASE_HEX, NULL, 0x0, - "Logical object handle (high nibble)", HFILL } - }, - { &hf_vocallonet_data_logical_object_handle_middle, - { "Object Handle (middle)", "vocallonet.data.logical_object_handle.middle", - FT_UINT32, BASE_HEX, NULL, 0x0, - "Logical object handle (middle nibble)", HFILL } - }, - { &hf_vocallonet_data_logical_object_handle_low, - { "Object Handle (low)", "vocallonet.data.logical_object_handle.low", - FT_UINT32, BASE_HEX, NULL, 0x0, - "Logical object handle (low nibble)", HFILL } + "Logical object handle ", HFILL } }, { &hf_vocallonet_data_packet_port, { "Logical Object Packet Port Packet", "vocallonet.data.packet_port", @@ -1169,92 +608,6 @@ void proto_register_vocallonet(void) }; - static hf_register_info hf_vocallonet_d_data[] = - { - /* Packet format D fields (voice) */ - { &hf_vocallonet_d_timestamp, - { "Timestamp", "vocallonet.d.timestamp", - FT_UINT32, BASE_HEX, NULL, 0x0, - "Packet timestamp", HFILL } - }, - { &hf_vocallonet_d_marker, - { "Marker", "vocallonet.d.marker", - FT_UINT32, BASE_HEX, NULL, 0x00800000, - "Marker bit", HFILL } - }, - { &hf_vocallonet_d_valid_rtp, - { "Valid RTP", "vocallonet.d.valid_rtp", - FT_BOOLEAN, 32, NULL, 0x80000000, - "Valid RTP", HFILL } - }, - { &hf_vocallonet_d_encoding_type, - { "Encoding type", "vocallonet.d.encoding_type", - FT_UINT32, BASE_HEX, VALS(vocallonet_d_encoding_type_vals), 0x7fc00000, - "Encoding type", HFILL } - }, - { &hf_vocallonet_d_sequence_number, - { "Sequence number", "vocallonet.d.sequence_number", - FT_UINT32, BASE_HEX, NULL, 0x0000ffff, - "Sequence number", HFILL } - }, - { &hf_vocallonet_d_rtp_pad_size, - { "Rtp padding size", "vocallonet.d.rtp_pad_size", - FT_UINT32, BASE_HEX, NULL, 0x003fc000, - "Rtp padding size", HFILL } - }, - { &hf_vocallonet_d_rtp_payload_offset , - { "Rtp payload offset", "vocallonet.d.rtp_payload_offset", - FT_UINT32, BASE_HEX, NULL, 0x00003fff, - "Rtp payload offset", HFILL } - }, - { &hf_vocallonet_d_rtp_version, - { "Rtp version", "vocallonet.d.rtp_version", - FT_UINT32, BASE_HEX, NULL, 0xc0000000, - "Rtp version", HFILL } - }, - { &hf_vocallonet_d_rtp_padding, - { "Rtp padding", "vocallonet.d.rtp_padding", - FT_UINT32, BASE_HEX, NULL, 0x20000000, - "Rtp padding bit", HFILL } - }, - { &hf_vocallonet_d_rtp_extension, - { "Rtp extension", "vocallonet.d.rtp_extension", - FT_UINT32, BASE_HEX, NULL, 0x10000000, - "Rtp extension bit", HFILL } - }, - { &hf_vocallonet_d_rtp_csrc_count, - { "Rtp CSRC count", "vocallonet.d.rtp_csrc_count", - FT_UINT32, BASE_HEX, NULL, 0x0f000000, - "Rtp CSRC count", HFILL } - }, - { &hf_vocallonet_d_rtp_payload_type, - { "Rtp payload type", "vocallonet.d.rtp_payload_type", - FT_UINT32, BASE_HEX, NULL, 0x007f0000, - "Rtp payload type", HFILL } - }, - { &hf_vocallonet_d_rtp_sync_source, - { "Rtp synchronisation source identifier", "vocallonet.d.rtp_sync_source", - FT_UINT32, BASE_HEX, NULL, 0x0, - "Rtp synchronisation source identifier", HFILL } - }, - - { &hf_vocallonet_d_VocFlag_BFI, - { "BFI", "vocallonet.d.BFI", - FT_UINT32, BASE_HEX, NULL, 0x00000008, - "BFI bit", HFILL } - }, - { &hf_vocallonet_d_VocFlag_TAF, - { "TAF", "vocallonet.d.TAF", - FT_UINT32, BASE_HEX, NULL, 0x00000004, - "TAF bit", HFILL } - }, - { &hf_vocallonet_d_VocFlag_SID, - { "SID", "vocallonet.d.SID", - FT_UINT32, BASE_HEX, NULL, 0x00000003, - "SID bit", HFILL } - } - - }; static hf_register_info hf_vocallonet_f_data[] = @@ -1272,6 +625,47 @@ void proto_register_vocallonet(void) }, }; + static hf_register_info hf_vocallonet_d_frag_data[] = + { + /* Packet format F fields (raw) */ + { &hf_vocallonet_d_frag_SequenceId, + { "SequenceId", "vocallonet.d_frag.SequenceId", + FT_UINT32, BASE_HEX, NULL, 0, + "Packet SequenceId", HFILL } + }, + { &hf_vocallonet_d_frag_TransfertTotalSize, + { "TransfertTotalSize", "vocallonet.d_frag.TransfertTotalSize", + FT_UINT32, BASE_HEX, NULL, 0, + "Packet TransfertTotalSize", HFILL } + }, + { &hf_vocallonet_d_frag_FragmentTotalNum, + { "FragmentTotalNum", "vocallonet.d_frag.FragmentTotalNum", + FT_UINT32, BASE_HEX, NULL, 0, + "Packet FragmentTotalNum", HFILL } + }, + { &hf_vocallonet_d_frag_FragmentId, + { "FragmentId", "vocallonet.d_frag.FragmentId", + FT_UINT32, BASE_HEX, NULL, 0, + "Packet FragmentId", HFILL } + }, + { &hf_vocallonet_d_frag_FragmentDataOffset, + { "FragmentDataOffset", "vocallonet.d_frag.FragmentDataOffset", + FT_UINT32, BASE_HEX, NULL, 0, + "Packet FragmentDataOffset", HFILL } + }, + { &hf_vocallonet_d_frag_FragmentDataSize, + { "FragmentDataSize", "vocallonet.d_frag.FragmentDataSize", + FT_UINT32, BASE_HEX, NULL, 0, + "Packet FragmentDataSize", HFILL } + }, + { &hf_vocallonet_d_frag_UserId, + { "UserId", "vocallonet.d_frag.UserId", + FT_UINT32, BASE_HEX, NULL, 0, + "Packet UserId", HFILL } + }, + }; + + static hf_register_info hf_vocallonet_control[] = { { &hf_vocallonet_control_destination_fifo_id, @@ -1302,10 +696,9 @@ void proto_register_vocallonet(void) &ett_vocallonet, &ett_vocallonet_control, &ett_vocallonet_data, - &ett_vocallonet_d_data, + &ett_vocallonet_d_frag_data, &ett_vocallonet_f_data, - &ett_vocallonet_a_data, }; @@ -1328,11 +721,9 @@ void proto_register_vocallonet(void) proto_vocallonet_data = proto_register_protocol( "Vocallo data packet", "Octasic Vocallonet Data", "vocallonet_data"); - proto_vocallonet_a_data = proto_register_protocol( "Vocallo A format data packet", - "Octasic Vocallonet A-Data", "vocallonet_a_data"); - proto_vocallonet_d_data = proto_register_protocol( "Vocallo D format data packet", - "Octasic Vocallonet D-Data", "vocallonet_d_data"); + proto_vocallonet_d_frag_data = proto_register_protocol( "Vocallo Data_Frag format data packet", + "Octasic Vocallonet Data_Frag", "vocallonet_frag_data"); proto_vocallonet_f_data = proto_register_protocol( "Vocallo F format data packet", "Octasic Vocallonet F-Data", "vocallonet_f_data"); @@ -1349,7 +740,7 @@ void proto_register_vocallonet(void) proto_register_field_array( proto_vocallonet_control, hf_vocallonet_control, array_length(hf_vocallonet_control) ); proto_register_field_array( proto_vocallonet_data, hf_vocallonet_data, array_length(hf_vocallonet_data) ); - proto_register_field_array( proto_vocallonet_d_data, hf_vocallonet_d_data, array_length(hf_vocallonet_d_data) ); + proto_register_field_array( proto_vocallonet_d_frag_data, hf_vocallonet_d_frag_data, array_length(hf_vocallonet_d_frag_data) ); proto_register_field_array( proto_vocallonet_f_data, hf_vocallonet_f_data, array_length(hf_vocallonet_f_data) ); proto_register_subtree_array(ett, array_length(ett)); @@ -1370,21 +761,8 @@ void proto_reg_handoff_vocallonet(void) data_handle = find_dissector("data"); octvc1_ctrl_handle = find_dissector("Octvc1_Ctrl"); - rfc4175_yuv_handle = find_dissector("rfc4175_yuv"); - yuv_extended_handle = find_dissector("yuv_extended"); octvc1_event_handle = find_dissector("Octvc1_Event"); octpkt_handle = find_dissector("OctPkt"); - macroblock_handle = find_dissector("macro_blocks"); - - eth_handle = find_dissector("eth_withoutfcs"); - ip_handle = find_dissector("ip"); - lapd_handle = find_dissector("lapd"); - h263_handle = find_dissector("h263"); - h263p_handle = find_dissector("h263P"); - h264_handle = find_dissector("h264"); - hMpeg4_handle = find_dissector("mp4ves"); - hT38_handle = find_dissector("t38"); - amr_handle = find_dissector("amr"); } diff --git a/software/include/octdev_devices.h b/software/include/octdev_devices.h index a5ffea1..b99f48e 100644 --- a/software/include/octdev_devices.h +++ b/software/include/octdev_devices.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTDEV_DEVICES.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTDEV_DEVICES.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,59 +18,59 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTDEV_DEVICES_H__ -#define __OCTDEV_DEVICES_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octdev_types.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - tOCTDEV_DEVICES_TYPE_ENUM : Octasic Device type. --------------------------------------------------------------------------------------*/ -#define tOCTDEV_DEVICES_TYPE_ENUM tOCT_UINT32 - -#define cOCTDEV_DEVICES_TYPE_ENUM_INVALID 0x0 -#define cOCTDEV_DEVICES_TYPE_ENUM_OCT1010 0x1 -#define cOCTDEV_DEVICES_TYPE_ENUM_OCT2200 0x2 -#define cOCTDEV_DEVICES_TYPE_ENUM_CPU 0xF - -/*------------------------------------------------------------------------------------- - tOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM : Octasic DSP Core type. --------------------------------------------------------------------------------------*/ -#define tOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM tOCT_UINT32 - -#define cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_INVALID 0x0 -#define cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_OPUS1 0x1 -#define cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_OPUS2 0x2 - -/*------------------------------------------------------------------------------------- - OCT1010 specific definitions. --------------------------------------------------------------------------------------*/ -#define cOCTDEV_DEVICES_OCT1010_MAX_CORE_NUMBER 15 /* Maximum number of core in the OCT1010. */ -#define cOCTDEV_DEVICES_OCT1010_MAX_VSPMGR_THREADS 12 /* Maximum number of VSP Mgr threads that can be started on the OCT1010. */ -#define cOCTDEV_DEVICES_OCT1010_CORE_TYPE cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_OPUS1 /* Type of DSP Core in the OCT1010. */ -#define cOCTDEV_DEVICES_OCT1010_MAX_ETH_PORT_NUMBER 2 /* Maximum number of Ethernet port in the OCT1010. */ - -/*------------------------------------------------------------------------------------- - OCT2200 specific definitions. --------------------------------------------------------------------------------------*/ -#define cOCTDEV_DEVICES_OCT2200_MAX_CORE_NUMBER 24 /* Maximum number of core in the OCT2200. */ -#define cOCTDEV_DEVICES_OCT2200_MAX_VSPMGR_THREADS 21 /* Maximum number of VSP Mgr threads that can be started on the OCT2200. */ -#define cOCTDEV_DEVICES_OCT2200_CORE_TYPE cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_OPUS2 /* Type of DSP Core in the OCT2200. */ -#define cOCTDEV_DEVICES_OCT2200_MAX_ETH_PORT_NUMBER 4 /* Maximum number of Ethernet port in the OCT2200. */ - - -#endif /* __OCTDEV_DEVICES_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTDEV_DEVICES_H__ +#define __OCTDEV_DEVICES_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + tOCTDEV_DEVICES_TYPE_ENUM : Octasic Device type. +-------------------------------------------------------------------------------------*/ +#define tOCTDEV_DEVICES_TYPE_ENUM tOCT_UINT32 + +#define cOCTDEV_DEVICES_TYPE_ENUM_INVALID 0x0 +#define cOCTDEV_DEVICES_TYPE_ENUM_OCT1010 0x1 +#define cOCTDEV_DEVICES_TYPE_ENUM_OCT2200 0x2 +#define cOCTDEV_DEVICES_TYPE_ENUM_CPU 0xF + +/*------------------------------------------------------------------------------------- + tOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM : Octasic DSP Core type. +-------------------------------------------------------------------------------------*/ +#define tOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM tOCT_UINT32 + +#define cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_INVALID 0x0 +#define cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_OPUS1 0x1 +#define cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_OPUS2 0x2 + +/*------------------------------------------------------------------------------------- + OCT1010 specific definitions. +-------------------------------------------------------------------------------------*/ +#define cOCTDEV_DEVICES_OCT1010_MAX_CORE_NUMBER 15 /* Maximum number of core in the OCT1010. */ +#define cOCTDEV_DEVICES_OCT1010_MAX_VSPMGR_THREADS 12 /* Maximum number of VSP Mgr threads that can be started on the OCT1010. */ +#define cOCTDEV_DEVICES_OCT1010_CORE_TYPE cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_OPUS1 /* Type of DSP Core in the OCT1010. */ +#define cOCTDEV_DEVICES_OCT1010_MAX_ETH_PORT_NUMBER 2 /* Maximum number of Ethernet port in the OCT1010. */ + +/*------------------------------------------------------------------------------------- + OCT2200 specific definitions. +-------------------------------------------------------------------------------------*/ +#define cOCTDEV_DEVICES_OCT2200_MAX_CORE_NUMBER 24 /* Maximum number of core in the OCT2200. */ +#define cOCTDEV_DEVICES_OCT2200_MAX_VSPMGR_THREADS 21 /* Maximum number of VSP Mgr threads that can be started on the OCT2200. */ +#define cOCTDEV_DEVICES_OCT2200_CORE_TYPE cOCTDEV_DEVICES_DSP_CORE_TYPE_ENUM_OPUS2 /* Type of DSP Core in the OCT2200. */ +#define cOCTDEV_DEVICES_OCT2200_MAX_ETH_PORT_NUMBER 4 /* Maximum number of Ethernet port in the OCT2200. */ + + +#endif /* __OCTDEV_DEVICES_H__ */ + diff --git a/software/include/octdev_devices_swap.h b/software/include/octdev_devices_swap.h index 5bdb25c..fa07d7b 100644 --- a/software/include/octdev_devices_swap.h +++ b/software/include/octdev_devices_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTDEV_DEVICES_SWAP_H__ diff --git a/software/include/octdev_macro.h b/software/include/octdev_macro.h index a96b9bd..0597578 100644 --- a/software/include/octdev_macro.h +++ b/software/include/octdev_macro.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTDEV_MACRO.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTDEV_MACRO.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,86 +18,121 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTDEV_MACRO_H__ -#define __OCTDEV_MACRO_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octdev_types.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Generic swap macros --------------------------------------------------------------------------------------*/ - - -/*-------------------------------------------------------------------------- - 32-bit Endian Swapping when target is Little Endian -----------------------------------------------------------------------------*/ -#if !defined( mOCT_SWAP32_IF_LE ) -#if defined( __linux__ ) -/* Linux (and probably other unices') htonl implementation is far more - * efficient than our own; Win32 implementation, howerever is similar to - * our own BUT with the added cost of a function call */ - -#include -#define mOCT_SWAP32_IF_LE htonl - -#else /* __linux__ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) - -#define mOCT_SWAP32_IF_LE( f_ulValue ) \ - ( (((f_ulValue) & 0xff000000 ) >> 24) | \ - (((f_ulValue) & 0x00ff0000 ) >> 8) | \ - (((f_ulValue) & 0x0000ff00 ) << 8) | \ - (((f_ulValue) & 0x000000ff ) << 24) ) -#else - -#define mOCT_SWAP32_IF_LE( f_ulValue ) (f_ulValue) - -#endif /* _OCT_ENDIAN_TYPE_LE_ */ -#endif /* __linux__ */ -#endif /* mOCT_SWAP32_IF_LE */ - -/*-------------------------------------------------------------------------- - 16-bit Endian Swapping when target is Little Endian -----------------------------------------------------------------------------*/ -#if !defined( mOCT_SWAP16_IF_LE ) -#if defined( __linux__ ) -/* Linux (and probably other unices') htons implementation is far more - * efficient than our own; Win32 implementation, howerever is similar to - * our own BUT with the added cost of a function call */ - -#include -#define mOCT_SWAP16_IF_LE htons - -#else /* __linux__ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) - -#define mOCT_SWAP16_IF_LE( f_usValue ) \ - ( (((f_usValue) & 0x00ff ) << 8) | \ - (((f_usValue) & 0xff00 ) >> 8) ) -#else - -#define mOCT_SWAP16_IF_LE( f_usValue ) (f_usValue) - -#endif /* _OCT_ENDIAN_TYPE_LE_ */ -#endif /* __linux__ */ -#endif /* mOCT_SWAP16_IF_LE */ - - - -#endif /* __OCTDEV_MACRO_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTDEV_MACRO_H__ +#define __OCTDEV_MACRO_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Generic swap macros +-------------------------------------------------------------------------------------*/ + + +/*-------------------------------------------------------------------------- + 64-bit Endian Swapping when target is Little Endian +----------------------------------------------------------------------------*/ +#if !defined( mOCT_SWAP64_IF_LE ) + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) + +#if defined( __linux__ ) +/* Linux (and probably other unices') htonl implementation is far more + * efficient than our own; Win32 implementation, howerever is similar to + * our own BUT with the added cost of a function call */ + +#include +#define mOCT_SWAP64_IF_LE( f_ullValue ) (((uint64_t)ntohl(f_ullValue)) << 32 | ntohl(f_ullValue>>32)) + +#else /* __linux__ */ + +#define mOCT_SWAP64_IF_LE( f_ullValue ) \ + (((tOCT_UINT64)(f_ullValue) << 56) | \ + (((tOCT_UINT64)(f_ullValue) << 40) & 0xff000000000000ULL) | \ + (((tOCT_UINT64)(f_ullValue) << 24) & 0xff0000000000ULL) | \ + (((tOCT_UINT64)(f_ullValue) << 8) & 0xff00000000ULL) | \ + (((tOCT_UINT64)(f_ullValue) >> 8) & 0xff000000ULL) | \ + (((tOCT_UINT64)(f_ullValue) >> 24) & 0xff0000ULL) | \ + (((tOCT_UINT64)(f_ullValue) >> 40) & 0xff00ULL) | \ + ((tOCT_UINT64)(f_ullValue) >> 56)) +#endif /* __linux__ */ +#else + +#define mOCT_SWAP64_IF_LE( f_ullValue ) (f_ullValue) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#endif /* mOCT_SWAP64_IF_LE */ + +/*-------------------------------------------------------------------------- + 32-bit Endian Swapping when target is Little Endian +----------------------------------------------------------------------------*/ +#if !defined( mOCT_SWAP32_IF_LE ) +#if defined( __linux__ ) +/* Linux (and probably other unices') htonl implementation is far more + * efficient than our own; Win32 implementation, howerever is similar to + * our own BUT with the added cost of a function call */ + +#include +#define mOCT_SWAP32_IF_LE htonl + +#else /* __linux__ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) + +#define mOCT_SWAP32_IF_LE( f_ulValue ) \ + ( (((f_ulValue) & 0xff000000 ) >> 24) | \ + (((f_ulValue) & 0x00ff0000 ) >> 8) | \ + (((f_ulValue) & 0x0000ff00 ) << 8) | \ + (((f_ulValue) & 0x000000ff ) << 24) ) +#else + +#define mOCT_SWAP32_IF_LE( f_ulValue ) (f_ulValue) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ +#endif /* __linux__ */ +#endif /* mOCT_SWAP32_IF_LE */ + +/*-------------------------------------------------------------------------- + 16-bit Endian Swapping when target is Little Endian +----------------------------------------------------------------------------*/ +#if !defined( mOCT_SWAP16_IF_LE ) +#if defined( __linux__ ) +/* Linux (and probably other unices') htons implementation is far more + * efficient than our own; Win32 implementation, howerever is similar to + * our own BUT with the added cost of a function call */ + +#include +#define mOCT_SWAP16_IF_LE htons + +#else /* __linux__ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) + +#define mOCT_SWAP16_IF_LE( f_usValue ) \ + ( (((f_usValue) & 0x00ff ) << 8) | \ + (((f_usValue) & 0xff00 ) >> 8) ) +#else + +#define mOCT_SWAP16_IF_LE( f_usValue ) (f_usValue) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ +#endif /* __linux__ */ +#endif /* mOCT_SWAP16_IF_LE */ + + + +#endif /* __OCTDEV_MACRO_H__ */ + diff --git a/software/include/octdev_opus_rev.h b/software/include/octdev_opus_rev.h index 30ad61d..6850e05 100644 --- a/software/include/octdev_opus_rev.h +++ b/software/include/octdev_opus_rev.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTDEV_OPUS_REV.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTDEV_OPUS_REV.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,100 +18,100 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTDEV_OPUS_REV_H__ -#define __OCTDEV_OPUS_REV_H__ - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Revision history --------------------------------------------------------------------------------------*/ - - -#ifdef _M_OPUS1 -#define OCT1010_REV_B -#endif /* _M_OPUS1 */ - -#ifdef OCT1010_REV_A - #define d1jnsrc d1jnsrp - #define d2jnsrc d2jnsrp - #define d4jnsrc d4jnsrp - #define d8jnsrc d8jnsrp - #define d16jnsrc d16jnsrp - #define d32jnsrc d32jnsrp - #define d64jnsrc d64jnsrp - #define d128jnsrc d128jnsrp - #define d1jnsc d1jnsrp - #define d2jnsc d2jnsrp - #define d4jnsc d4jnsrp - #define d8jnsc d8jnsrp - #define d16jnsc d16jnsrp - #define d32jnsc d32jnsrp - #define d64jnsc d64jnsrp - #define d128jnsc d128jnsrp - - /* need for the migration from Rev A to Rev B - */ - #define mOCTDEV_OPUS_RDTSC_CORRECTION( f_ulTimestamp ) \ - _asm and f_ulTimestamp, 0x7FFFFFFF - - #define mOCTDEV_OPUS_RDTSC_CORRECTION_C( f_ulTimestamp ) \ - f_ulTimestamp &= 0x7FFFFFFF; - - #define mOCTDEV_OPUS_UNSEIZABLE_FIX( f_ulRegister ) \ - _asm { halt ( ( f_ulRegister & 0 ) != 0 ) } - - #define mOCTDEV_OPUS_UNSEIZABLE_FIX_C( f_ulRegister ) \ - {_chalt(( f_ulRegister & 0 ) != 0 );} - -#endif /* OCT1010_REV_A */ - -#ifdef OCT1010_REV_B - #define mOCTDEV_OPUS_RDTSC_CORRECTION( f_ulTimestamp ) \ - _asm and f_ulTimestamp, 0x7FFFFFFF - - #define mOCTDEV_OPUS_RDTSC_CORRECTION_C( f_ulTimestamp ) \ - f_ulTimestamp &= 0x7FFFFFFF; - - #define mOCTDEV_OPUS_UNSEIZABLE_FIX( f_ulRegister ) \ - _asm { halt ( ( f_ulRegister & 0 ) != 0 ) } - - #define mOCTDEV_OPUS_UNSEIZABLE_FIX_C( f_ulRegister ) \ - {_chalt(( f_ulRegister & 0 ) != 0 );} - -#endif /* OCT1010_REV_B */ - -#ifdef _M_OPUS2 - #define OCT2200_REV_B -#endif /* _M_OPUS2 */ - -#ifdef OCT2200_REV_A - #define mOCTDEV_OPUS_RDTSC_CORRECTION( f_ulTimestamp ) - #define mOCTDEV_OPUS_RDTSC_CORRECTION_C( f_ulTimestamp ) - - #define mOCTDEV_OPUS_UNSEIZABLE_FIX( f_ulRegister ) - #define mOCTDEV_OPUS_UNSEIZABLE_FIX_C( f_ulRegister ) - -#endif /* OCT2200_REV_A */ - -#ifdef OCT2200_REV_B - #define mOCTDEV_OPUS_RDTSC_CORRECTION( f_ulTimestamp ) - #define mOCTDEV_OPUS_RDTSC_CORRECTION_C( f_ulTimestamp ) - - #define mOCTDEV_OPUS_UNSEIZABLE_FIX( f_ulRegister ) - #define mOCTDEV_OPUS_UNSEIZABLE_FIX_C( f_ulRegister ) - -#endif /* OCT2200_REV_B */ - - -#endif /* __OCTDEV_OPUS_REV_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTDEV_OPUS_REV_H__ +#define __OCTDEV_OPUS_REV_H__ + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Revision history +-------------------------------------------------------------------------------------*/ + + +#ifdef _M_OPUS1 +#define OCT1010_REV_B +#endif /* _M_OPUS1 */ + +#ifdef OCT1010_REV_A + #define d1jnsrc d1jnsrp + #define d2jnsrc d2jnsrp + #define d4jnsrc d4jnsrp + #define d8jnsrc d8jnsrp + #define d16jnsrc d16jnsrp + #define d32jnsrc d32jnsrp + #define d64jnsrc d64jnsrp + #define d128jnsrc d128jnsrp + #define d1jnsc d1jnsrp + #define d2jnsc d2jnsrp + #define d4jnsc d4jnsrp + #define d8jnsc d8jnsrp + #define d16jnsc d16jnsrp + #define d32jnsc d32jnsrp + #define d64jnsc d64jnsrp + #define d128jnsc d128jnsrp + + /* need for the migration from Rev A to Rev B + */ + #define mOCTDEV_OPUS_RDTSC_CORRECTION( f_ulTimestamp ) \ + _asm and f_ulTimestamp, 0x7FFFFFFF + + #define mOCTDEV_OPUS_RDTSC_CORRECTION_C( f_ulTimestamp ) \ + f_ulTimestamp &= 0x7FFFFFFF; + + #define mOCTDEV_OPUS_UNSEIZABLE_FIX( f_ulRegister ) \ + _asm { halt ( ( f_ulRegister & 0 ) != 0 ) } + + #define mOCTDEV_OPUS_UNSEIZABLE_FIX_C( f_ulRegister ) \ + {_chalt(( f_ulRegister & 0 ) != 0 );} + +#endif /* OCT1010_REV_A */ + +#ifdef OCT1010_REV_B + #define mOCTDEV_OPUS_RDTSC_CORRECTION( f_ulTimestamp ) \ + _asm and f_ulTimestamp, 0x7FFFFFFF + + #define mOCTDEV_OPUS_RDTSC_CORRECTION_C( f_ulTimestamp ) \ + f_ulTimestamp &= 0x7FFFFFFF; + + #define mOCTDEV_OPUS_UNSEIZABLE_FIX( f_ulRegister ) \ + _asm { halt ( ( f_ulRegister & 0 ) != 0 ) } + + #define mOCTDEV_OPUS_UNSEIZABLE_FIX_C( f_ulRegister ) \ + {_chalt(( f_ulRegister & 0 ) != 0 );} + +#endif /* OCT1010_REV_B */ + +#ifdef _M_OPUS2 + #define OCT2200_REV_B +#endif /* _M_OPUS2 */ + +#ifdef OCT2200_REV_A + #define mOCTDEV_OPUS_RDTSC_CORRECTION( f_ulTimestamp ) + #define mOCTDEV_OPUS_RDTSC_CORRECTION_C( f_ulTimestamp ) + + #define mOCTDEV_OPUS_UNSEIZABLE_FIX( f_ulRegister ) + #define mOCTDEV_OPUS_UNSEIZABLE_FIX_C( f_ulRegister ) + +#endif /* OCT2200_REV_A */ + +#ifdef OCT2200_REV_B + #define mOCTDEV_OPUS_RDTSC_CORRECTION( f_ulTimestamp ) + #define mOCTDEV_OPUS_RDTSC_CORRECTION_C( f_ulTimestamp ) + + #define mOCTDEV_OPUS_UNSEIZABLE_FIX( f_ulRegister ) + #define mOCTDEV_OPUS_UNSEIZABLE_FIX_C( f_ulRegister ) + +#endif /* OCT2200_REV_B */ + + +#endif /* __OCTDEV_OPUS_REV_H__ */ + diff --git a/software/include/octdev_rc_base.h b/software/include/octdev_rc_base.h index 2244c17..08b040f 100644 --- a/software/include/octdev_rc_base.h +++ b/software/include/octdev_rc_base.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTDEV_RC_BASE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTDEV_RC_BASE.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,34 +18,34 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTDEV_RC_BASE_H__ -#define __OCTDEV_RC_BASE_H__ - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Gemeric Return Code bases --------------------------------------------------------------------------------------*/ - -#define cOCTADF_TARGET_RC_BASE 0x01000000 -#define cOCTVC1_API_RC_BASE 0x0A000000 -#define cOCTCOMMON_API_RC_BASE 0x0E000000 -#define cOCTDEVICE_API_RC_BASE 0x0F000000 - -/*------------------------------------------------------------------------------------- - Return Code fatal flag --------------------------------------------------------------------------------------*/ - -#define cOCTDEV_RC_FATAL_FLAG 0x80000000 - -#endif /* __OCTDEV_RC_BASE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTDEV_RC_BASE_H__ +#define __OCTDEV_RC_BASE_H__ + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Gemeric Return Code bases +-------------------------------------------------------------------------------------*/ + +#define cOCTADF_TARGET_RC_BASE 0x01000000 +#define cOCTVC1_API_RC_BASE 0x0A000000 +#define cOCTCOMMON_API_RC_BASE 0x0E000000 +#define cOCTDEVICE_API_RC_BASE 0x0F000000 + +/*------------------------------------------------------------------------------------- + Return Code fatal flag +-------------------------------------------------------------------------------------*/ + +#define cOCTDEV_RC_FATAL_FLAG 0x80000000 + +#endif /* __OCTDEV_RC_BASE_H__ */ + diff --git a/software/include/octdev_types.h b/software/include/octdev_types.h index 055d85e..2e867b6 100644 --- a/software/include/octdev_types.h +++ b/software/include/octdev_types.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTDEV_TYPES.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTDEV_TYPES.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,315 +18,315 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTDEV_TYPES_H__ -#define __OCTDEV_TYPES_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - API Data Types --------------------------------------------------------------------------------------*/ - - -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - -#if SHRT_MAX == 32767 - /* short is 16-bit */ - typedef unsigned short tOCT_UINT16; - typedef short tOCT_INT16; -#elif INT_MAX == 32767 - /* integer is 16-bit */ - typedef unsigned int tOCT_UINT16; - typedef int tOCT_INT16; -#else - /* unexpected 16-bit type */ - #error Cannot determine 16-bit type -#endif - -#if INT_MAX == 2147483647L - /* integer is 32-bit */ - typedef int tOCT_INT32; - typedef unsigned int tOCT_UINT32; -#elif LONG_MAX == 2147483647L - /* long is 32-bit */ - typedef long tOCT_INT32; - typedef unsigned long tOCT_UINT32; -#else - /* unexpected 32-bit type */ - #error Cannot determine 32-bit type -#endif - -typedef long long tOCT_INT64; -typedef unsigned long long tOCT_UINT64; - -typedef char tOCT_INT8; -typedef unsigned char tOCT_UINT8; - - -/*------------------------------------------------------------------------------------- - TRUE/FALSE --------------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------------- - tOCT_BOOL32 : --------------------------------------------------------------------------------------*/ -#define tOCT_BOOL32 tOCT_UINT32 - -#define cOCT_TRUE 1 -#define cOCT_FALSE 0 - -/*------------------------------------------------------------------------------------- - Generic Timeout value --------------------------------------------------------------------------------------*/ -#define cOCTDEV_TIMEOUT_FOREVER 0xFFFFFFFF - - -/*-------------------------------------------------------------------------- - ENDIAN Determination - - _OCT_ENDIAN_TYPE_BE_: Defined when target is Big Endian - _OCT_ENDIAN_TYPE_LE_: Defined when target is Little Endian - - These must be set by the user. If not set the system will try to - automatically determine them based on some common compiler #define - values. - -----------------------------------------------------------------------------*/ - -#if !defined( _OCT_ENDIAN_TYPE_BE_ ) && !defined( _OCT_ENDIAN_TYPE_LE_ ) - /* Not Set - try to determine automatically */ - - /* Look for Intel target */ - #if defined( __OCT_ENV_OPUS__ ) || defined( _M_OPUS1 ) || defined( _M_OPUS2 ) || defined( _M_OPUS3 ) - #define _OCT_ENDIAN_TYPE_BE_ - #define _OCT_PLATFORM_OPUS_ - #elif defined( _M_IX86 ) || defined(__x86_64__) - #define _OCT_ENDIAN_TYPE_LE_ - #define _OCT_PLATFORM_X86_ - #elif defined( __i386 ) - #define _OCT_ENDIAN_TYPE_LE_ - #define _OCT_PLATFORM_X86_ - #elif defined( i386 ) - #define _OCT_ENDIAN_TYPE_LE_ - #define _OCT_PLATFORM_X86_ - /* Look for Motorola PPC target */ - #elif defined( _M_MPPC ) || defined( _M_PPC ) || defined( __ppc__ ) || defined( __PPC ) - #define _OCT_ENDIAN_TYPE_BE_ - #define _OCT_PLATFORM_PPC_ - /* Look for Sparc target */ - #elif defined( __sparc ) - #define _OCT_ENDIAN_TYPE_BE_ - #define _OCT_PLATFORM_SPARC_ - #elif defined( __sun__ ) - #define _OCT_ENDIAN_TYPE_BE_ - #define _OCT_PLATFORM_SPARC_ - /* Look for ARM target */ - #elif defined( __ARMEL__ ) - #define _OCT_ENDIAN_TYPE_LE_ - #define _OCT_PLATFORM_ARM_ - /* Look for MIPS target */ - #elif defined( __mips__ ) || defined( __MIPSEB ) - #define _OCT_ENDIAN_TYPE_BE_ - #define _OCT_PLATFORM_MIPS_ - /* others */ - #elif defined( CPU ) - #if CPU==PPC860 - #define _OCT_ENDIAN_TYPE_BE_ - #define _OCT_PLATFORM_PPC_ - #endif - #endif -#endif - -/* Now insure the endian format is set properly */ -#if !defined( _OCT_ENDIAN_TYPE_BE_ ) && !defined( _OCT_ENDIAN_TYPE_LE_ ) - #error Processor Endian not determined -#endif -#if defined( _OCT_ENDIAN_TYPE_BE_ ) && defined( _OCT_ENDIAN_TYPE_LE_ ) - #error Processor Endian Set to both Values -#endif - -/*-------------------------------------------------------------------------- - PLATFORM Determination - - OCT_WINDOWS_ENV : Defined when target running under windows - OCT_LINUX_ENV : Defined when target running under linux - OCT_OPUS_ENV : OPUS env - OCT_UNKNOWN_ENV : Unknown env - -----------------------------------------------------------------------------*/ -#define __OCTDEV_TYPE_STR2__(x) #x -#define __OCTDEV_TYPE_STR1__(x) __OCTDEV_TYPE_STR2__(x) -#define __OCTDEV_TYPE_WARNLOC__ __FILE__ "("__OCTDEV_TYPE_STR1__(__LINE__)") : Warning Msg: " - -#if defined( __OCT_ENV_OPUS__ ) || defined( _M_OPUS1 ) || defined( _M_OPUS2 ) || defined( _M_OPUS3 ) - #define OCT_ENV_TYPE_OPUS - #define OCT_ENV_TYPE_OCTSYS -#ifdef _DEBUG - #define OCT_ENV_MODE_DEBUG -#endif -#elif defined( _LINUX_ ) || defined( __linux__ ) - #define OCT_ENV_TYPE_LINUX - #define OCT_ENV_TYPE_OCTOS -#ifndef NDEBUG - #define OCT_ENV_MODE_DEBUG -#endif -#elif defined( _WIN32 ) || defined( WIN32 ) || defined( __WIN32__ ) || defined( _WIN32_ ) || defined( WIN32S ) || defined( _WIN64 ) || defined( WIN64 ) - #define OCT_ENV_TYPE_WINDOWS - #define OCT_ENV_TYPE_OCTOS -#ifdef _DEBUG - #define OCT_ENV_MODE_DEBUG -#endif -#else - #define OCT_ENV_TYPE_UNKNOWN - #pragma message(__OCTDEV_TYPE_WARNLOC__"Environment platform not determined") -#endif - -/*-------------------------------------------------------------------------- - POINTER type definition -----------------------------------------------------------------------------*/ -#if defined( OCT_ENV_TYPE_WINDOWS ) -#include - -#define tOCT_UINT_PTR UINT_PTR -#define tOCT_INT_PTR INT_PTR - -#elif defined( OCT_ENV_TYPE_LINUX ) -#include - -#define tOCT_UINT_PTR uintptr_t -#define tOCT_INT_PTR intptr_t - -#elif defined( OCT_ENV_TYPE_OCTSYS ) -#include - -#define tOCT_UINT_PTR uintptr_t -#define tOCT_INT_PTR intptr_t - -#else - #pragma message(__OCTDEV_TYPE_WARNLOC__"Environment pointer determined") - - -#endif /* OCT_ENV_TYPE_WINDOWS */ - - -/*------------------------------------------------------------------------------------- - Generic IP Address --------------------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------------------- - tOCTDEV_IP_VERSION_ENUM : --------------------------------------------------------------------------------------*/ -#define tOCTDEV_IP_VERSION_ENUM tOCT_UINT32 - -#define cOCTDEV_IP_VERSION_ENUM_4 0 /* IP address version 4 */ -#define cOCTDEV_IP_VERSION_ENUM_6 1 /* IP address version 6 */ -#define cOCTDEV_IP_VERSION_ENUM_INVALID 0xFFFFFFFF - -/*------------------------------------------------------------------------------------- - tOCTDEV_IP_ADDRESS - IP address structure - - Members: - ulIpVersion - Default: cOCTDEV_IP_VERSION_ENUM_4 - Version of the IP address - aulIpAddress - Ip address, Version 4 -> aulIpAddress[0] only. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTDEV_IP_VERSION_ENUM ulIpVersion; - tOCT_UINT32 aulIpAddress[4]; - -} tOCTDEV_IP_ADDRESS; - -/*------------------------------------------------------------------------------------- - Generic UDP Address --------------------------------------------------------------------------------------*/ -#define cOCTDEV_UDP_PORT_INVALID 0xFFFFFFFF /* Invalid UDP port specification. */ - -/*------------------------------------------------------------------------------------- - tOCTDEV_UDP_ADDRESS - UDP address structure - - Members: - IpAddress - IP version and address. - ulUdpPort - Default: cOCTDEV_UDP_PORT_INVALID - UDP port used with IP address --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTDEV_IP_ADDRESS IpAddress; - tOCT_UINT32 ulUdpPort; - -} tOCTDEV_UDP_ADDRESS; - -/*------------------------------------------------------------------------------------- - Generic TCP Address --------------------------------------------------------------------------------------*/ -#define cOCTDEV_TCP_PORT_INVALID 0xFFFFFFFF /* Invalid TCP port specification. */ - -/*------------------------------------------------------------------------------------- - tOCTDEV_TCP_ADDRESS - TCP address structure - - Members: - IpAddress - IP version and address. - ulTcpPort - Default: cOCTDEV_TCP_PORT_INVALID - TCP port used with IP address --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTDEV_IP_ADDRESS IpAddress; - tOCT_UINT32 ulTcpPort; - -} tOCTDEV_TCP_ADDRESS; - -/*------------------------------------------------------------------------------------- - Generic MAC Address --------------------------------------------------------------------------------------*/ -#define cOCTDEV_MAC_ADDRESS_BYTE_COUNT 6 - -/*------------------------------------------------------------------------------------- - tOCTDEV_MAC_ADDRESS - MAC address structure - - Members: - abyReserved - Reserved fields inserted to ensure that the structure is an integer multiple of - DWORDS. - abyMacAddress - MAC address; abyMacAddress[0] = msb, abyMacAddress[5] = lsb. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT8 abyReserved[2]; - tOCT_UINT8 abyMacAddress[cOCTDEV_MAC_ADDRESS_BYTE_COUNT]; - -} tOCTDEV_MAC_ADDRESS; - - -#endif /* __OCTDEV_TYPES_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTDEV_TYPES_H__ +#define __OCTDEV_TYPES_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + API Data Types +-------------------------------------------------------------------------------------*/ + + +#ifndef NULL +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((void *)0) +#endif +#endif + +#if SHRT_MAX == 32767 + /* short is 16-bit */ + typedef unsigned short tOCT_UINT16; + typedef short tOCT_INT16; +#elif INT_MAX == 32767 + /* integer is 16-bit */ + typedef unsigned int tOCT_UINT16; + typedef int tOCT_INT16; +#else + /* unexpected 16-bit type */ + #error Cannot determine 16-bit type +#endif + +#if INT_MAX == 2147483647L + /* integer is 32-bit */ + typedef int tOCT_INT32; + typedef unsigned int tOCT_UINT32; +#elif LONG_MAX == 2147483647L + /* long is 32-bit */ + typedef long tOCT_INT32; + typedef unsigned long tOCT_UINT32; +#else + /* unexpected 32-bit type */ + #error Cannot determine 32-bit type +#endif + +typedef long long tOCT_INT64; +typedef unsigned long long tOCT_UINT64; + +typedef char tOCT_INT8; +typedef unsigned char tOCT_UINT8; + + +/*------------------------------------------------------------------------------------- + TRUE/FALSE +-------------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------------- + tOCT_BOOL32 : +-------------------------------------------------------------------------------------*/ +#define tOCT_BOOL32 tOCT_UINT32 + +#define cOCT_TRUE 1 +#define cOCT_FALSE 0 + +/*------------------------------------------------------------------------------------- + Generic Timeout value +-------------------------------------------------------------------------------------*/ +#define cOCTDEV_TIMEOUT_FOREVER 0xFFFFFFFF + + +/*-------------------------------------------------------------------------- + ENDIAN Determination + + _OCT_ENDIAN_TYPE_BE_: Defined when target is Big Endian + _OCT_ENDIAN_TYPE_LE_: Defined when target is Little Endian + + These must be set by the user. If not set the system will try to + automatically determine them based on some common compiler #define + values. + +----------------------------------------------------------------------------*/ + +#if !defined( _OCT_ENDIAN_TYPE_BE_ ) && !defined( _OCT_ENDIAN_TYPE_LE_ ) + /* Not Set - try to determine automatically */ + + /* Look for Intel target */ + #if defined( __OCT_ENV_OPUS__ ) || defined( _M_OPUS1 ) || defined( _M_OPUS2 ) || defined( _M_OPUS3 ) + #define _OCT_ENDIAN_TYPE_BE_ + #define _OCT_PLATFORM_OPUS_ + #elif defined( _M_IX86 ) || defined(__x86_64__) + #define _OCT_ENDIAN_TYPE_LE_ + #define _OCT_PLATFORM_X86_ + #elif defined( __i386 ) + #define _OCT_ENDIAN_TYPE_LE_ + #define _OCT_PLATFORM_X86_ + #elif defined( i386 ) + #define _OCT_ENDIAN_TYPE_LE_ + #define _OCT_PLATFORM_X86_ + /* Look for Motorola PPC target */ + #elif defined( _M_MPPC ) || defined( _M_PPC ) || defined( __ppc__ ) || defined( __PPC ) + #define _OCT_ENDIAN_TYPE_BE_ + #define _OCT_PLATFORM_PPC_ + /* Look for Sparc target */ + #elif defined( __sparc ) + #define _OCT_ENDIAN_TYPE_BE_ + #define _OCT_PLATFORM_SPARC_ + #elif defined( __sun__ ) + #define _OCT_ENDIAN_TYPE_BE_ + #define _OCT_PLATFORM_SPARC_ + /* Look for ARM target */ + #elif defined( __ARMEL__ ) + #define _OCT_ENDIAN_TYPE_LE_ + #define _OCT_PLATFORM_ARM_ + /* Look for MIPS target */ + #elif defined( __mips__ ) || defined( __MIPSEB ) + #define _OCT_ENDIAN_TYPE_BE_ + #define _OCT_PLATFORM_MIPS_ + /* others */ + #elif defined( CPU ) + #if CPU==PPC860 + #define _OCT_ENDIAN_TYPE_BE_ + #define _OCT_PLATFORM_PPC_ + #endif + #endif +#endif + +/* Now insure the endian format is set properly */ +#if !defined( _OCT_ENDIAN_TYPE_BE_ ) && !defined( _OCT_ENDIAN_TYPE_LE_ ) + #error Processor Endian not determined +#endif +#if defined( _OCT_ENDIAN_TYPE_BE_ ) && defined( _OCT_ENDIAN_TYPE_LE_ ) + #error Processor Endian Set to both Values +#endif + +/*-------------------------------------------------------------------------- + PLATFORM Determination + + OCT_WINDOWS_ENV : Defined when target running under windows + OCT_LINUX_ENV : Defined when target running under linux + OCT_OPUS_ENV : OPUS env + OCT_UNKNOWN_ENV : Unknown env + +----------------------------------------------------------------------------*/ +#define __OCTDEV_TYPE_STR2__(x) #x +#define __OCTDEV_TYPE_STR1__(x) __OCTDEV_TYPE_STR2__(x) +#define __OCTDEV_TYPE_WARNLOC__ __FILE__ "("__OCTDEV_TYPE_STR1__(__LINE__)") : Warning Msg: " + +#if defined( __OCT_ENV_OPUS__ ) || defined( _M_OPUS1 ) || defined( _M_OPUS2 ) || defined( _M_OPUS3 ) + #define OCT_ENV_TYPE_OPUS + #define OCT_ENV_TYPE_OCTSYS +#ifndef NDEBUG + #define OCT_ENV_MODE_DEBUG +#endif +#elif defined( _LINUX_ ) || defined( __linux__ ) + #define OCT_ENV_TYPE_LINUX + #define OCT_ENV_TYPE_OCTOS +#ifndef NDEBUG + #define OCT_ENV_MODE_DEBUG +#endif +#elif defined( _WIN32 ) || defined( WIN32 ) || defined( __WIN32__ ) || defined( _WIN32_ ) || defined( WIN32S ) || defined( _WIN64 ) || defined( WIN64 ) + #define OCT_ENV_TYPE_WINDOWS + #define OCT_ENV_TYPE_OCTOS +#ifdef _DEBUG + #define OCT_ENV_MODE_DEBUG +#endif +#else + #define OCT_ENV_TYPE_UNKNOWN + #pragma message(__OCTDEV_TYPE_WARNLOC__"Environment platform not determined") +#endif + +/*-------------------------------------------------------------------------- + POINTER type definition +----------------------------------------------------------------------------*/ +#if defined( OCT_ENV_TYPE_WINDOWS ) +#include + +#define tOCT_UINT_PTR UINT_PTR +#define tOCT_INT_PTR INT_PTR + +#elif defined( OCT_ENV_TYPE_LINUX ) +#include + +#define tOCT_UINT_PTR uintptr_t +#define tOCT_INT_PTR intptr_t + +#elif defined( OCT_ENV_TYPE_OCTSYS ) +#include + +#define tOCT_UINT_PTR uintptr_t +#define tOCT_INT_PTR intptr_t + +#else + #pragma message(__OCTDEV_TYPE_WARNLOC__"Environment pointer determined") + + +#endif /* OCT_ENV_TYPE_WINDOWS */ + + +/*------------------------------------------------------------------------------------- + Generic IP Address +-------------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------------- + tOCTDEV_IP_VERSION_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTDEV_IP_VERSION_ENUM tOCT_UINT32 + +#define cOCTDEV_IP_VERSION_ENUM_4 0 /* IP address version 4 */ +#define cOCTDEV_IP_VERSION_ENUM_6 1 /* IP address version 6 */ +#define cOCTDEV_IP_VERSION_ENUM_INVALID 0xFFFFFFFF + +/*------------------------------------------------------------------------------------- + tOCTDEV_IP_ADDRESS + IP address structure + + Members: + ulIpVersion + Default: cOCTDEV_IP_VERSION_ENUM_4 + Version of the IP address + aulIpAddress + Ip address, Version 4 -> aulIpAddress[0] only. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTDEV_IP_VERSION_ENUM ulIpVersion; + tOCT_UINT32 aulIpAddress[4]; + +} tOCTDEV_IP_ADDRESS; + +/*------------------------------------------------------------------------------------- + Generic UDP Address +-------------------------------------------------------------------------------------*/ +#define cOCTDEV_UDP_PORT_INVALID 0xFFFFFFFF /* Invalid UDP port specification. */ + +/*------------------------------------------------------------------------------------- + tOCTDEV_UDP_ADDRESS + UDP address structure + + Members: + IpAddress + IP version and address. + ulUdpPort + Default: cOCTDEV_UDP_PORT_INVALID + UDP port used with IP address +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTDEV_IP_ADDRESS IpAddress; + tOCT_UINT32 ulUdpPort; + +} tOCTDEV_UDP_ADDRESS; + +/*------------------------------------------------------------------------------------- + Generic TCP Address +-------------------------------------------------------------------------------------*/ +#define cOCTDEV_TCP_PORT_INVALID 0xFFFFFFFF /* Invalid TCP port specification. */ + +/*------------------------------------------------------------------------------------- + tOCTDEV_TCP_ADDRESS + TCP address structure + + Members: + IpAddress + IP version and address. + ulTcpPort + Default: cOCTDEV_TCP_PORT_INVALID + TCP port used with IP address +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTDEV_IP_ADDRESS IpAddress; + tOCT_UINT32 ulTcpPort; + +} tOCTDEV_TCP_ADDRESS; + +/*------------------------------------------------------------------------------------- + Generic MAC Address +-------------------------------------------------------------------------------------*/ +#define cOCTDEV_MAC_ADDRESS_BYTE_COUNT 6 + +/*------------------------------------------------------------------------------------- + tOCTDEV_MAC_ADDRESS + MAC address structure + + Members: + abyReserved + Reserved fields inserted to ensure that the structure is an integer multiple of + DWORDS. + abyMacAddress + MAC address; abyMacAddress[0] = msb, abyMacAddress[5] = lsb. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT8 abyReserved[2]; + tOCT_UINT8 abyMacAddress[cOCTDEV_MAC_ADDRESS_BYTE_COUNT]; + +} tOCTDEV_MAC_ADDRESS; + + +#endif /* __OCTDEV_TYPES_H__ */ + diff --git a/software/include/octdev_types_swap.h b/software/include/octdev_types_swap.h index ef0e491..b14af59 100644 --- a/software/include/octdev_types_swap.h +++ b/software/include/octdev_types_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTDEV_TYPES_SWAP_H__ diff --git a/software/include/octpkt/octpkt_hdr.h b/software/include/octpkt/octpkt_hdr.h index a907908..867c17e 100644 --- a/software/include/octpkt/octpkt_hdr.h +++ b/software/include/octpkt/octpkt_hdr.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTPKT_HDR.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTPKT_HDR.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,83 +18,93 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTPKT_HDR_H__ -#define __OCTPKT_HDR_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -#define cOCTPKT_HDR_ETHERTYPE 0x5200 - -/*------------------------------------------------------------------------------------- - OctPkt-Packet Format Values --------------------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------------------- - tOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK : --------------------------------------------------------------------------------------*/ -#define tOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK tOCT_UINT32 - -#define cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_FORMAT_BIT_MASK 0x000000FF -#define cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_FORMAT_BIT_OFFSET 24 -#define cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_FORMAT ((tOCT_UINT32)(cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_FORMAT_BIT_MASK<sSNR = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sSNR); \ - ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sRSSI = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sRSSI); \ + ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sSNRDb = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sSNRDb); \ + ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sRSSIDbm = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sRSSIDbm); \ ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sBurstTiming = \ mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sBurstTiming); \ - ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usBERCount = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usBERCount); \ - ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usBERTOtalBitCOunt = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usBERTOtalBitCOunt); \ + ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sBurstTiming4x = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->sBurstTiming4x); \ + ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usBERCnt = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usBERCnt); \ + ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usBERTotalBitCnt = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usBERTotalBitCnt); \ + ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usRxQualFullUp = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usRxQualFullUp); \ + ((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usRxLevelFullUp = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_MEASUREMENT_INFO *)pOCTVC1_GSM_MEASUREMENT_INFO)->usRxLevelFullUp); \ } #else #define mOCTVC1_GSM_MEASUREMENT_INFO_SWAP( pOCTVC1_GSM_MEASUREMENT_INFO ) @@ -340,22 +346,24 @@ extern "C" { #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_GSM_RAW_MEASUREMENT_INFO_SWAP( _f_pParms ){ tOCTVC1_GSM_RAW_MEASUREMENT_INFO * pOCTVC1_GSM_RAW_MEASUREMENT_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_RAW_MEASUREMENT_INFO)\ - ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sSNR = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sSNR); \ - ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sRSSI = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sRSSI); \ + ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sSNRDb = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sSNRDb); \ + ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sRSSIDbm = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sRSSIDbm); \ ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sBurstTiming = \ mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sBurstTiming); \ - ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usBERCount = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usBERCount); \ - ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usBERTOtalBitCOunt = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usBERTOtalBitCOunt); \ - ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usTrnSqErrorCount = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usTrnSqErrorCount); \ - ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usTrnSqTotalBitCount = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usTrnSqTotalBitCount); \ - ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sfrquencyError = \ - mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sfrquencyError); \ + ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sBurstTiming4x = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sBurstTiming4x); \ + ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usBERCnt = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usBERCnt); \ + ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usBERTotalBitCnt = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usBERTotalBitCnt); \ + ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usTrSqErrCnt = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usTrSqErrCnt); \ + ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usTrSqTotalBitCnt = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->usTrSqTotalBitCnt); \ + ((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sFreqErrHz = \ + mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_RAW_MEASUREMENT_INFO *)pOCTVC1_GSM_RAW_MEASUREMENT_INFO)->sFreqErrHz); \ } #else #define mOCTVC1_GSM_RAW_MEASUREMENT_INFO_SWAP( pOCTVC1_GSM_RAW_MEASUREMENT_INFO ) @@ -432,6 +440,122 @@ extern "C" { #define mOCTVC1_GSM_SCHED_STATUS_SWAP( pOCTVC1_GSM_SCHED_STATUS ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY_SWAP( _f_pParms ){ tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY * pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY)\ + { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY *)pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY)->TrxId ); } \ + { mOCTVC1_GSM_PHYSICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY *)pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY)->PchId ); } \ +} +#else +#define mOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY_SWAP( pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY_SWAP( _f_pParms ){ tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY * pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY)\ + { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY *)pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY)->TrxId ); } \ + { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY *)pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY)->LchId ); } \ +} +#else +#define mOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY_SWAP( pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_MASK_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_GSM_TAP_FILTER_MASK_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_TRX_SWAP( _f_pParms ){ tOCTVC1_GSM_TAP_FILTER_TRX * pOCTVC1_GSM_TAP_FILTER_TRX = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_TAP_FILTER_TRX)\ + ((tOCTVC1_GSM_TAP_FILTER_TRX *)pOCTVC1_GSM_TAP_FILTER_TRX)->ulAllTrxFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_TAP_FILTER_TRX *)pOCTVC1_GSM_TAP_FILTER_TRX)->ulAllTrxFlag); \ + { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_TAP_FILTER_TRX *)pOCTVC1_GSM_TAP_FILTER_TRX)->TrxId ); } \ +} +#else +#define mOCTVC1_GSM_TAP_FILTER_TRX_SWAP( pOCTVC1_GSM_TAP_FILTER_TRX ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_SWAP( _f_pParms ){ tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL * pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL)\ + ((tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL *)pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL)->ulEntryCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL *)pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL)->ulEntryCnt); \ + { tOCT_UINT32 jOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL; \ + for( jOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL=0; \ + jOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL<(cOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY_COUNT_MAX);jOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL++ ) \ + { mOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_ENTRY_SWAP( &((tOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL *)pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL)->aEntry[jOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL] ); }} \ +} +#else +#define mOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_SWAP( pOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_SWAP( _f_pParms ){ tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL * pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL)\ + ((tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL *)pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL)->ulEntryCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL *)pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL)->ulEntryCnt); \ + { tOCT_UINT32 jOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL; \ + for( jOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL=0; \ + jOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL<(cOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY_COUNT_MAX);jOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL++ ) \ + { mOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_ENTRY_SWAP( &((tOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL *)pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL)->aEntry[jOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL] ); }} \ +} +#else +#define mOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_SWAP( pOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_SWAP( _f_pParms ){ tOCTVC1_GSM_TAP_FILTER * pOCTVC1_GSM_TAP_FILTER = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_TAP_FILTER)\ + { mOCTVC1_GSM_TAP_FILTER_TYPE_ENUM_SWAP( &((tOCTVC1_GSM_TAP_FILTER *)pOCTVC1_GSM_TAP_FILTER)->ulType ); } \ + { mOCTVC1_GSM_TAP_FILTER_MASK_SWAP( &((tOCTVC1_GSM_TAP_FILTER *)pOCTVC1_GSM_TAP_FILTER)->ulMask ); } \ + { mOCTVC1_GSM_TAP_FILTER_TRX_SWAP( &((tOCTVC1_GSM_TAP_FILTER *)pOCTVC1_GSM_TAP_FILTER)->Trx ); } \ + { mOCTVC1_GSM_TAP_FILTER_PHYSICAL_CHANNEL_SWAP( &((tOCTVC1_GSM_TAP_FILTER *)pOCTVC1_GSM_TAP_FILTER)->PhysicalChannel ); } \ + { mOCTVC1_GSM_TAP_FILTER_LOGICAL_CHANNEL_SWAP( &((tOCTVC1_GSM_TAP_FILTER *)pOCTVC1_GSM_TAP_FILTER)->LogicalChannel ); } \ +} +#else +#define mOCTVC1_GSM_TAP_FILTER_SWAP( pOCTVC1_GSM_TAP_FILTER ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_TAP_FILTER_STATS_SWAP( _f_pParms ){ tOCTVC1_GSM_TAP_FILTER_STATS * pOCTVC1_GSM_TAP_FILTER_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_TAP_FILTER_STATS)\ + ((tOCTVC1_GSM_TAP_FILTER_STATS *)pOCTVC1_GSM_TAP_FILTER_STATS)->ulTapIdCnt = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_TAP_FILTER_STATS *)pOCTVC1_GSM_TAP_FILTER_STATS)->ulTapIdCnt); \ + { tOCT_UINT32 iOCTVC1_GSM_TAP_FILTER_STATS; \ + for( iOCTVC1_GSM_TAP_FILTER_STATS=0; \ + iOCTVC1_GSM_TAP_FILTER_STATS<(cOCTVC1_GSM_TAP_FILTER_TAP_COUNT_MAX);iOCTVC1_GSM_TAP_FILTER_STATS++ ) \ + ((tOCTVC1_GSM_TAP_FILTER_STATS *)pOCTVC1_GSM_TAP_FILTER_STATS)->ahTapId[iOCTVC1_GSM_TAP_FILTER_STATS] = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_TAP_FILTER_STATS *)pOCTVC1_GSM_TAP_FILTER_STATS)->ahTapId[iOCTVC1_GSM_TAP_FILTER_STATS]);}\ +} +#else +#define mOCTVC1_GSM_TAP_FILTER_STATS_SWAP( pOCTVC1_GSM_TAP_FILTER_STATS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER_SWAP( _f_pParms ){ tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER * pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)\ + { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ModuleData ); } \ + { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->TrxId ); } \ + { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->LchId ); } \ + ((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ulAntennaIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ulAntennaIndex); \ + ((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ulFrameNumber = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ulFrameNumber); \ + ((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ulPower = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ulPower); \ + ((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ulDataSizeInBytes = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER *)pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER)->ulDataSizeInBytes); \ +} +#else +#define mOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER_SWAP( pOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_GSM_MSG_TRX_OPEN_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_OPEN_CMD * pOCTVC1_GSM_MSG_TRX_OPEN_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_OPEN_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_OPEN_CMD *)pOCTVC1_GSM_MSG_TRX_OPEN_CMD)->Header ); } \ @@ -1029,6 +1153,88 @@ extern "C" { #define mOCTVC1_GSM_MSG_TRX_MODIFY_RF_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_MODIFY_RF_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD * pOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD)->Header ); } \ + { mOCTVC1_CURSOR_INDEX_GET_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD)->IndexGet ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_LIST_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP * pOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP)->Header ); } \ + { mOCTVC1_CURSOR_INDEX_GET_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP)->IndexGet ); } \ + { mOCTVC1_LIST_INDEX_GET_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP)->IndexList ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_LIST_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD * pOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD)->Header ); } \ + ((tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD)->ulFilterIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD)->ulFilterIndex); \ +} +#else +#define mOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_INFO_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP * pOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP)->Header ); } \ + ((tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP)->ulFilterIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP)->ulFilterIndex); \ + { mOCTVC1_GSM_TAP_FILTER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP)->Filter ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_INFO_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD * pOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD)->Header ); } \ + ((tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD)->ulFilterIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD)->ulFilterIndex); \ +} +#else +#define mOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_STATS_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP * pOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP)->Header ); } \ + ((tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP)->ulFilterIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP)->ulFilterIndex); \ + { mOCTVC1_GSM_TAP_FILTER_STATS_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP)->Stats ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_STATS_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD * pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD)->Header ); } \ + ((tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD)->ulFilterIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD)->ulFilterIndex); \ + { mOCTVC1_GSM_TAP_FILTER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD *)pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD)->Filter ); } \ +} +#else +#define mOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP * pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP)->Header ); } \ + ((tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP)->ulFilterIndex = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP *)pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP)->ulFilterIndex); \ +} +#else +#define mOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP_SWAP( pOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD * pOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD *)pOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CMD)->Header ); } \ @@ -1069,6 +1275,28 @@ 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_ */ + #ifdef __cplusplus } diff --git a/software/include/octvc1/gsm/octvc1_gsm_base.h b/software/include/octvc1/gsm/octvc1_gsm_base.h index 321cc23..b190e9e 100644 --- a/software/include/octvc1/gsm/octvc1_gsm_base.h +++ b/software/include/octvc1/gsm/octvc1_gsm_base.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_GSM_BASE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the definition of the OCTVC1 API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_GSM_BASE.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the definition of the OCTVC1 API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,34 +18,34 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_GSM_BASE_H__ -#define __OCTVC1_GSM_BASE_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octvc1_base.h" - -/**************************************************************************** - Module unique identifiers - ****************************************************************************/ -#define cOCTVC1_GSM_UID ( 0x0B ) - -/**************************************************************************** - Module identifier bases - ****************************************************************************/ - -/* 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_RC_BASE ( (cOCTVC1_GSM_UID << 16) + cOCTVC1_RC_BASE ) - -#endif /* __OCTVC1_GSM_BASE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_GSM_BASE_H__ +#define __OCTVC1_GSM_BASE_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octvc1_base.h" + +/**************************************************************************** + Module unique identifiers + ****************************************************************************/ +#define cOCTVC1_GSM_UID ( 0x0B ) + +/**************************************************************************** + Module identifier bases + ****************************************************************************/ + +/* 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_RC_BASE ( (cOCTVC1_GSM_UID << 16) + cOCTVC1_RC_BASE ) + +#endif /* __OCTVC1_GSM_BASE_H__ */ + diff --git a/software/include/octvc1/gsm/octvc1_gsm_default.h b/software/include/octvc1/gsm/octvc1_gsm_default.h index db0ef32..5f3bc5d 100644 --- a/software/include/octvc1/gsm/octvc1_gsm_default.h +++ b/software/include/octvc1/gsm/octvc1_gsm_default.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_GSM_DEFAULT.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the event definition of the GSM API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_GSM_DEFAULT.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the event definition of the GSM API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,1964 +18,2433 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_GSM_DEFAULT_H__ -#define __OCTVC1_GSM_DEFAULT_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_gsm_api.h" - -/***************************** COMMAND DEFAULT *****************************/ - -/*-------------------------------------------------------------------------- - tOCTVC1_GSM_MSG_TRX_OPEN_CMD -----------------------------------------------------------------------------*/ -#ifdef OCTVC1_OPT_DECLARE_DEFAULTS - -const tOCTVC1_GSM_MSG_TRX_OPEN_CMD buf_tOCTVC1_GSM_MSG_TRX_OPEN_CMD = -{ - { /* Header */ - ((sizeof(tOCTVC1_GSM_MSG_TRX_OPEN_CMD)<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); \ } #else #define mOCTVC1_HW_MSG_RF_PORT_INFO_RSP_SWAP( pOCTVC1_HW_MSG_RF_PORT_INFO_RSP ) @@ -588,33 +592,6 @@ extern "C" { #define mOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_RSP_SWAP( pOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD * pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)\ - { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->Header ); } \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->ulPortIndex = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->ulPortIndex); \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->ulAntennaIndex = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->ulAntennaIndex); \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->lRxGaindB = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->lRxGaindB); \ - { mOCTVC1_RADIO_RX_GAIN_CTRL_MODE_ENUM_SWAP( &((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD)->ulRxGainMode ); } \ -} -#else -#define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD_SWAP( pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CMD ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP * pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP)\ - { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP)->Header ); } \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP)->ulPortIndex = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP)->ulPortIndex); \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP)->ulAntennaIndex = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP)->ulAntennaIndex); \ -} -#else -#define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP_SWAP( pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_RSP ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD * pOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CMD)->Header ); } \ @@ -643,32 +620,6 @@ extern "C" { #define mOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_RSP_SWAP( pOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD * pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)\ - { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)->Header ); } \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)->ulPortIndex = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)->ulPortIndex); \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)->ulAntennaIndex = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)->ulAntennaIndex); \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)->lTxGaindB = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD)->lTxGaindB); \ -} -#else -#define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD_SWAP( pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CMD ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP * pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP)\ - { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP)->Header ); } \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP)->ulPortIndex = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP)->ulPortIndex); \ - ((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP)->ulAntennaIndex = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP *)pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP)->ulAntennaIndex); \ -} -#else -#define mOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP_SWAP( pOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_RSP ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CMD_SWAP( _f_pParms ){ tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CMD * pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CMD)\ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CMD *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CMD)->Header ); } \ diff --git a/software/include/octvc1/hw/octvc1_hw_base.h b/software/include/octvc1/hw/octvc1_hw_base.h index df7694c..264ed9e 100644 --- a/software/include/octvc1/hw/octvc1_hw_base.h +++ b/software/include/octvc1/hw/octvc1_hw_base.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_HW_BASE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the definition of the OCTVC1 API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_HW_BASE.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the definition of the OCTVC1 API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,34 +18,34 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_HW_BASE_H__ -#define __OCTVC1_HW_BASE_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octvc1_base.h" - -/**************************************************************************** - Module unique identifiers - ****************************************************************************/ -#define cOCTVC1_HW_UID ( 0x06 ) - -/**************************************************************************** - Module identifier bases - ****************************************************************************/ - -/* Module: HW */ -#define cOCTVC1_HW_CID_BASE ( (cOCTVC1_HW_UID << 16) + cOCTVC1_CID_BASE ) -#define cOCTVC1_HW_EID_BASE ( (cOCTVC1_HW_UID << 16) + cOCTVC1_EID_BASE ) -#define cOCTVC1_HW_RC_BASE ( (cOCTVC1_HW_UID << 16) + cOCTVC1_RC_BASE ) - -#endif /* __OCTVC1_HW_BASE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_HW_BASE_H__ +#define __OCTVC1_HW_BASE_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octvc1_base.h" + +/**************************************************************************** + Module unique identifiers + ****************************************************************************/ +#define cOCTVC1_HW_UID ( 0x06 ) + +/**************************************************************************** + Module identifier bases + ****************************************************************************/ + +/* Module: HW */ +#define cOCTVC1_HW_CID_BASE ( (cOCTVC1_HW_UID << 16) + cOCTVC1_CID_BASE ) +#define cOCTVC1_HW_EID_BASE ( (cOCTVC1_HW_UID << 16) + cOCTVC1_EID_BASE ) +#define cOCTVC1_HW_RC_BASE ( (cOCTVC1_HW_UID << 16) + cOCTVC1_RC_BASE ) + +#endif /* __OCTVC1_HW_BASE_H__ */ + diff --git a/software/include/octvc1/hw/octvc1_hw_default.h b/software/include/octvc1/hw/octvc1_hw_default.h index cb125ea..d5a8ece 100644 --- a/software/include/octvc1/hw/octvc1_hw_default.h +++ b/software/include/octvc1/hw/octvc1_hw_default.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_HW_DEFAULT.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the event definition of the HW API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_HW_DEFAULT.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the event definition of the HW API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,684 +18,617 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_HW_DEFAULT_H__ -#define __OCTVC1_HW_DEFAULT_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_hw_api.h" - -/***************************** COMMAND DEFAULT *****************************/ - -/*-------------------------------------------------------------------------- - tOCTVC1_HW_MSG_PCB_INFO_CMD -----------------------------------------------------------------------------*/ -#ifdef OCTVC1_OPT_DECLARE_DEFAULTS - -const tOCTVC1_HW_MSG_PCB_INFO_CMD buf_tOCTVC1_HW_MSG_PCB_INFO_CMD = -{ - { /* Header */ - ((sizeof(tOCTVC1_HW_MSG_PCB_INFO_CMD)<Object32 named list. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; - tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; - -} tOCTVC1_IRSC_MSG_OBJMGR_LIST_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CMD - Start the Api command timing - - Members: - Header - OCTVC1 Message Header - ulResetStatsFlag - Default: cOCT_TRUE - If set to cOCT_TRUE, all statistics counters will be reset to zero. - If set to cOCT_FALSE, counters will not be reset. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCT_BOOL32 ulResetStatsFlag; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_RSP - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CMD - Stop the Api command timing - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_RSP - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CMD - List the command since the monitoring is enabled. - - Members: - Header - OCTVC1 Message Header - ObjectCursor - Object cursor --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_RSP - - Members: - Header - OCTVC1 Message Header - ObjectCursor - Object cursor - ObjectList - Object List structure. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; - tOCTVC1_LIST_HANDLE_OBJECT_GET ObjectList; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CMD - - Members: - Header - OCTVC1 Message Header - hCmdId - 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 hCmdId; - tOCT_BOOL32 ulResetStatsFlag; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_RSP - - Members: - Header - OCTVC1 Message Header - hCmdId - CommandStats - Monitoring entry asked --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hCmdId; - tOCTVC1_IRSC_API_STATS CommandStats; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CMD - List the cmd that are monitored - - Members: - Header - OCTVC1 Message Header - IndexGet - Object cursor --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_INDEX_GET IndexGet; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_RSP - - Members: - Header - OCTVC1 Message Header - IndexGet - Object cursor - IndexList - Object name list. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_INDEX_GET IndexGet; - tOCTVC1_LIST_INDEX_GET IndexList; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CMD - - Members: - Header - OCTVC1 Message Header - ulSessionIndex - Default: cOCTVC1_API_SESSION_INDEX_CURRENT_TRANSPORT - Session index --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_INDEX ulSessionIndex; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_RSP - - Members: - Header - OCTVC1 Message Header - ulSessionIndex - Session index - SessionInfo - Session Info --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_INDEX ulSessionIndex; - tOCTVC1_API_SESSION_INFO SessionInfo; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CMD - - Members: - Header - OCTVC1 Message Header - ulSessionIndex - Default: cOCTVC1_API_SESSION_INDEX_CURRENT_TRANSPORT - Session index - ulResetStatsFlag - Default: cOCT_FALSE - Statistics counters will be reset to zero after the current values are returned. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_INDEX ulSessionIndex; - tOCT_BOOL32 ulResetStatsFlag; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_RSP - - Members: - Header - OCTVC1 Message Header - ulSessionIndex - Session index - SessionStats - Sessiont statistic asked --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_INDEX ulSessionIndex; - tOCTVC1_IRSC_SESSION_STATS SessionStats; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CMD - - Members: - Header - OCTVC1 Message Header - ulSessionIndex - Default: cOCTVC1_API_SESSION_INDEX_CURRENT_TRANSPORT - Session index --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_INDEX ulSessionIndex; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_RSP - - Members: - Header - OCTVC1 Message Header - ulSessionIndex - Session index - EvtInfo - Session event Info --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_INDEX ulSessionIndex; - tOCTVC1_API_SESSION_EVT_INFO EvtInfo; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CMD - - Members: - Header - OCTVC1 Message Header - ulSessionIndex - Default: cOCTVC1_API_SESSION_INDEX_CURRENT_TRANSPORT - Session index --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_INDEX ulSessionIndex; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP - - Members: - Header - OCTVC1 Message Header - ulSessionIndex - Session index - Stats - Session event stats --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_INDEX ulSessionIndex; - tOCTVC1_IRSC_API_STATS Stats; - -} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP; - - -/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ -#include "octvc1_irsc_evt.h" - -#endif /* __OCTVC1_IRSC_API_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_IRSC_API_H__ +#define __OCTVC1_IRSC_API_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../../octdev_types.h" +#include "../../octdev_devices.h" +#include "../octvc1_msg.h" +#include "../octvc1_handle.h" +#include "../octvc1_fifo.h" +#include "../octvc1_buffer.h" +#include "../octvc1_eth.h" +#include "../octvc1_mac.h" +#include "../octvc1_cursor.h" +#include "../octvc1_list.h" +#include "../octvc1_log.h" +#include "../octvc1_process.h" +#include "../octvc1_radio.h" +#include "../octvc1_api.h" +#include "../octvc1_module.h" +#include "../octvc1_tap.h" + +#include "octvc1_irsc_id.h" +#include "octvc1_irsc_rc.h" + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + IPC related definitions. +-------------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------------- + IPC port type. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_IRSC_IPC_PORT_TYPE_ENUM tOCT_UINT32 + +#define cOCTVC1_IRSC_IPC_PORT_TYPE_ENUM_INVALID 0 +#define cOCTVC1_IRSC_IPC_PORT_TYPE_ENUM_UNIDIR_RECV 1 +#define cOCTVC1_IRSC_IPC_PORT_TYPE_ENUM_UNIDIR_SEND 2 +#define cOCTVC1_IRSC_IPC_PORT_TYPE_ENUM_BIDIR 3 +#define cOCTVC1_IRSC_IPC_PORT_TYPE_ENUM_LOCAL 4 + +/*------------------------------------------------------------------------------------- + IPC port type. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_IRSC_IPC_PORT_STATE_ENUM tOCT_UINT32 + +#define cOCTVC1_IRSC_IPC_PORT_STATE_ENUM_INVALID 0 +#define cOCTVC1_IRSC_IPC_PORT_STATE_ENUM_ERROR 1 +#define cOCTVC1_IRSC_IPC_PORT_STATE_ENUM_CONFIG 2 +#define cOCTVC1_IRSC_IPC_PORT_STATE_ENUM_WAIT_REMOTE 3 +#define cOCTVC1_IRSC_IPC_PORT_STATE_ENUM_READY 4 + +/*------------------------------------------------------------------------------------- + API related definitions +-------------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_API_STATS + API stats + + Members: + ulMaxProcessingTimeUs + Max time spent processing the command in micro second. + ulMinProcessingTimeUs + Min time spent processing the command in micro second. + ulTotalProcessingTimeUs + Total time spent processing the command in micro second. + ulCmdCnt + How many time the command is called + ulL1CacheMissCnt + Number of cache miss in L1 memory + ulTlbCacheMissCnt + Number of cache miss in TLB memory +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulMaxProcessingTimeUs; + tOCT_UINT32 ulMinProcessingTimeUs; + tOCT_UINT32 ulTotalProcessingTimeUs; + tOCT_UINT32 ulCmdCnt; + tOCT_UINT32 ulL1CacheMissCnt; + tOCT_UINT32 ulTlbCacheMissCnt; + +} tOCTVC1_IRSC_API_STATS; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_SESSION_STATS + API SESSION stats + + Members: + ulLastCmdTimestamp + Timestamp of the last command received + ulExpTransactionId + Next Expected transaction id + ulAcceptedCmdCnt + Total of accepted commands + ulRejectedCmdCnt + Total of rejected commands + ulRetryCmdCnt + Total of retry commands + ulResyncCnt + Total of transaction id resynchronization + ulSessionCnt + Total of time this session index have been used with a different client session + ulEvtSentCnt + Next Expected transaction id + ulEvtSentErrCnt + Next Expected transaction id + ulLastEvtTimestamp + Timestamp of the last event sent +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulLastCmdTimestamp; + tOCT_UINT32 ulExpTransactionId; + tOCT_UINT32 ulAcceptedCmdCnt; + tOCT_UINT32 ulRejectedCmdCnt; + tOCT_UINT32 ulRetryCmdCnt; + tOCT_UINT32 ulResyncCnt; + tOCT_UINT32 ulSessionCnt; + tOCT_UINT32 ulEvtSentCnt; + tOCT_UINT32 ulEvtSentErrCnt; + tOCT_UINT32 ulLastEvtTimestamp; + +} tOCTVC1_IRSC_SESSION_STATS; + +/*------------------------------------------------------------------------------------- + Application related definitions. +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_IRSC_APPLICATION_TAP_MAX_DESCRIPTION_BYTE_SIZE 255 /* Tap description buffer size, in bytes. */ +#define cOCTVC1_IRSC_APPLICATION_TRANSPORT_MAX_DATA_SIZE 0xFFFFFFFF /* Max transport size. Allow adapt tap packet size base the transport. */ + +/*------------------------------------------------------------------------------------- + Tap state. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM tOCT_UINT32 + +#define cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_DISABLE 0 +#define cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_STOP 1 +#define cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_START 2 + +/*------------------------------------------------------------------------------------- + Tap state. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM tOCT_UINT32 + +#define cOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_STREAM 0 + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_APPLICATION_TAP_INFO + Application Module information + + Members: + ulModuleId + Current number of process active in this for this module. + hProcess + Process handle where Tap is instantiate + ulDirection + ulDataSubType + Data sub type cOCTVOCNET_PKT_SUBTYPE_UNSPECIFIED, + cOCTVOCNET_PKT_SUBTYPE_MODULE_DATA + szName + Tap Name. + szDescription + Process file name. +-------------------------------------------------------------------------------------*/ +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 */ + +} tOCTVC1_IRSC_APPLICATION_TAP_INFO; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_APPLICATION_TAP_STATS + API Command stats + + Members: + ulState + Default: cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_DISABLE + ulFilterIndex + ulUserId +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM ulState; + tOCTVC1_INDEX ulFilterIndex; + tOCT_UINT32 ulUserId; + +} tOCTVC1_IRSC_APPLICATION_TAP_STATS; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_APPLICATION_TAP_START + API Command stats + + Members: + ulMode + Default: cOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_STREAM + Tap handle identifier. + ulMaxTransportDataSize + Range: [128..] + Default: cOCTVC1_IRSC_APPLICATION_TRANSPORT_MAX_DATA_SIZE + Maximum data byte size supported by transport. + ulFilterIndex + Default: cOCTVC1_INDEX_INVALID + ulUserId + Default: 0 +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM ulMode; + tOCT_UINT32 ulMaxTransportDataSize; + tOCTVC1_INDEX ulFilterIndex; + tOCT_UINT32 ulUserId; + +} tOCTVC1_IRSC_APPLICATION_TAP_START; + +/***************************** METHODS *************************************/ +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD + + Members: + Header + OCTVC1 Message Header + hProcess + Default: cOCTVC1_HANDLE_INVALID + Process handle identifier. Typically retrieved using the + cOCTVC1_MAIN_MSG_DEVICE_INFO_CID command. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hProcess; + +} tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + szName + Process Name. + szProcessImageName + Process file name. + ulType + Process Type. +-------------------------------------------------------------------------------------*/ +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_IRSC_MSG_PROCESS_INFO_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_CMD + + Members: + Header + OCTVC1 Message Header + hProcess + Default: cOCTVC1_HANDLE_INVALID + Process handle identifier. + ulResetProcessStatsFlag + Statistics counters will be reset to zero after the current values are returned. + ulResetIpcStatsFlag + Statistics counters for all IPC ports will be reset to zero after the current + values are returned. + ulResetTaskStatsFlag + Statistics counters for all tasks will be reset to zero after the current + values are returned. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hProcess; + tOCT_BOOL32 ulResetProcessStatsFlag; + tOCT_BOOL32 ulResetIpcStatsFlag; + tOCT_BOOL32 ulResetTaskStatsFlag; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + State + Current process state. + Error + Process Error +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hProcess; + tOCTVC1_PROCESS_STATE_ENUM State; + tOCTVC1_PROCESS_ERROR Error; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_CMD + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_RSP + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor + ObjectNameList + Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CMD + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulPortId + IPC port identifier +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulPortId; + +} tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulPortId + IPC port identifier + ulUserId + IPC port user identifier + hRemoteProcess + Remote Process identifier + ulRemotePortId + Remote IPC port identifier + ulRemoteUserId + Remote IPC port user id + szName + IPC Port Name. + ulPortIdx + Process Local Port Idx + ulType + Process Local Port Idx + ulSystemFlag + System Flag + ulGhostFlag + Ghost Flag. Use for internal test. + ulRecvMsgNum + Reception array message number. + ulRecvMsgSize + Reception message size in bytes. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulPortId; + tOCT_UINT32 ulUserId; + tOCTVC1_HANDLE_OBJECT hRemoteProcess; + tOCTVC1_SUB_OBJECT_ID ulRemotePortId; + tOCT_UINT32 ulRemoteUserId; + tOCT_UINT8 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; + tOCT_UINT32 ulRecvMsgNum; + tOCT_UINT32 ulRecvMsgSize; + +} tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CMD + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulPortId + IPC port identifier + ulResetStatsFlag + Statistics counters will be reset to zero after the current values are returned. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulPortId; + tOCT_BOOL32 ulResetStatsFlag; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulPortId + IPC port identifier + ulState + IPC port state + ulSendMsgCnt + Count of message send + ulRecvMsgCnt + Count of message received. + ulRecvMsgMissCnt + Number of missing message +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulPortId; + tOCTVC1_IRSC_IPC_PORT_STATE_ENUM ulState; + tOCT_UINT32 ulSendMsgCnt; + tOCT_UINT32 ulRecvMsgCnt; + tOCT_UINT32 ulRecvMsgMissCnt; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CMD + + Members: + Header + OCTVC1 Message Header + SubObjectIdGet + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_RSP + + Members: + Header + OCTVC1 Message Header + SubObjectIdGet + Object cursor + ObjectNameList + Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet; + tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME ObjectNameList; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CMD + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulTaskIndex + Task identifier +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulTaskIndex; + +} tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulTaskIndex + Task identifier + szName + Name given to the task +-------------------------------------------------------------------------------------*/ +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)]; + +} tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CMD + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulTaskIndex + Task identifier + ulResetStatsFlag + Statistics counters will be reset to zero after the current values are returned. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulTaskIndex; + tOCT_BOOL32 ulResetStatsFlag; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_RSP + + Members: + Header + OCTVC1 Message Header + hProcess + Process identifier + ulTaskIndex + Task identifier + Stats +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hProcess; + tOCTVC1_SUB_OBJECT_ID ulTaskIndex; + tOCTVC1_PROCESS_TASK_STATS Stats; + +} tOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CMD + + Members: + Header + OCTVC1 Message Header + SubObjectIdGet + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_RSP + + Members: + Header + OCTVC1 Message Header + SubObjectIdGet + Object cursor + ObjectNameList + Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET_SUB_OBJECT_ID SubObjectIdGet; + tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME ObjectNameList; + +} tOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_OBJMGR_INFO_CMD + + Members: + Header + OCTVC1 Message Header + ulObjType + Default: cOCTVC1_HANDLE_INVALID + Process handle identifier. Typically retrieved using the + cOCTVC1_MAIN_MSG_DEVICE_INFO_CID command. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 ulObjType; + +} tOCTVC1_IRSC_MSG_OBJMGR_INFO_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_OBJMGR_INFO_RSP + + Members: + Header + OCTVC1 Message Header + ulObjType + Type of object contained by the manager, represented as a number + ulMaxNumObj + Max number of objects the manager can hold + ulObjByteSize + Size in bytes of each object + szName + Name given to the object manager +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 ulObjType; + tOCT_UINT32 ulMaxNumObj; + tOCT_UINT32 ulObjByteSize; + tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)]; + +} tOCTVC1_IRSC_MSG_OBJMGR_INFO_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_OBJMGR_STATS_CMD + + Members: + Header + OCTVC1 Message Header + ulObjType + Type of object contained by the manager, represented as a number +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 ulObjType; + +} tOCTVC1_IRSC_MSG_OBJMGR_STATS_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_OBJMGR_STATS_RSP + + Members: + Header + OCTVC1 Message Header + ulObjType + Type of object contained by the manager, represented as a number + ulMaxNumObj + Max number of objects the manager can hold + ulNumObj + Current number of objects in the manager +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 ulObjType; + tOCT_UINT32 ulMaxNumObj; + tOCT_UINT32 ulNumObj; + +} tOCTVC1_IRSC_MSG_OBJMGR_STATS_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_OBJMGR_LIST_CMD + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + +} tOCTVC1_IRSC_MSG_OBJMGR_LIST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_OBJMGR_LIST_RSP + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor + ObjectNameList + >Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; + +} tOCTVC1_IRSC_MSG_OBJMGR_LIST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CMD + Start the Api command timing + + Members: + Header + OCTVC1 Message Header + ulResetStatsFlag + Default: cOCT_TRUE + If set to cOCT_TRUE, all statistics counters will be reset to zero. + If set to cOCT_FALSE, counters will not be reset. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_BOOL32 ulResetStatsFlag; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CMD + Stop the Api command timing + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CMD + List the command since the monitoring is enabled. + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_RSP + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor + ObjectList + Object List structure. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + tOCTVC1_LIST_HANDLE_OBJECT_GET ObjectList; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CMD + + Members: + Header + OCTVC1 Message Header + hCmdId + 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 hCmdId; + tOCT_BOOL32 ulResetStatsFlag; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_RSP + + Members: + Header + OCTVC1 Message Header + hCmdId + CommandStats + Monitoring entry asked +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hCmdId; + tOCTVC1_IRSC_API_STATS CommandStats; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CMD + List the cmd that are monitored + + Members: + Header + OCTVC1 Message Header + IndexGet + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_INDEX_GET IndexGet; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_RSP + + Members: + Header + OCTVC1 Message Header + IndexGet + Object cursor + IndexList + Object name list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_INDEX_GET IndexGet; + tOCTVC1_LIST_INDEX_GET IndexList; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CMD + + Members: + Header + OCTVC1 Message Header + ulSessionIndex + Default: cOCTVC1_API_SESSION_INDEX_CURRENT_TRANSPORT + Session index +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_INDEX ulSessionIndex; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_RSP + + Members: + Header + OCTVC1 Message Header + ulSessionIndex + Session index + SessionInfo + Session Info +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_INDEX ulSessionIndex; + tOCTVC1_API_SESSION_INFO SessionInfo; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CMD + + Members: + Header + OCTVC1 Message Header + ulSessionIndex + Default: cOCTVC1_API_SESSION_INDEX_CURRENT_TRANSPORT + Session index + ulResetStatsFlag + Default: cOCT_FALSE + Statistics counters will be reset to zero after the current values are returned. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_INDEX ulSessionIndex; + tOCT_BOOL32 ulResetStatsFlag; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_RSP + + Members: + Header + OCTVC1 Message Header + ulSessionIndex + Session index + SessionStats + Sessiont statistic asked +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_INDEX ulSessionIndex; + tOCTVC1_IRSC_SESSION_STATS SessionStats; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CMD + + Members: + Header + OCTVC1 Message Header + ulSessionIndex + Default: cOCTVC1_API_SESSION_INDEX_CURRENT_TRANSPORT + Session index +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_INDEX ulSessionIndex; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_RSP + + Members: + Header + OCTVC1 Message Header + ulSessionIndex + Session index + EvtInfo + Session event Info +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_INDEX ulSessionIndex; + tOCTVC1_API_SESSION_EVT_INFO EvtInfo; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CMD + + Members: + Header + OCTVC1 Message Header + ulSessionIndex + Default: cOCTVC1_API_SESSION_INDEX_CURRENT_TRANSPORT + Session index +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_INDEX ulSessionIndex; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP + + Members: + Header + OCTVC1 Message Header + ulSessionIndex + Session index + Stats + Session event stats +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_INDEX ulSessionIndex; + tOCTVC1_IRSC_API_STATS Stats; + +} tOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + +} tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor + ObjectNameList + Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; + +} tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD + + Members: + Header + OCTVC1 Message Header + hTapId + Default: cOCTVC1_HANDLE_INVALID + Tap identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + +} tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP + + Members: + Header + OCTVC1 Message Header + hTapId + Info +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + tOCTVC1_IRSC_APPLICATION_TAP_INFO Info; + +} tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD + + Members: + Header + OCTVC1 Message Header + hTapId + Default: cOCTVC1_HANDLE_INVALID + Tap handle identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + +} tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP + + Members: + Header + OCTVC1 Message Header + hTapId + Stats +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + tOCTVC1_IRSC_APPLICATION_TAP_STATS Stats; + +} tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD + + Members: + Header + OCTVC1 Message Header + hTapId + Default: cOCTVC1_HANDLE_INVALID + Tap handle identifier. + Start +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + tOCTVC1_IRSC_APPLICATION_TAP_START Start; + +} tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP + + Members: + Header + OCTVC1 Message Header + hTapId + 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. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + tOCTVC1_HANDLE_OBJECT hLogicalObj; + +} tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD + + Members: + Header + OCTVC1 Message Header + hTapId + Default: cOCTVC1_HANDLE_INVALID + Tap handle identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + +} tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP + + Members: + Header + OCTVC1 Message Header + hTapId +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT32 hTapId; + +} tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP; + + +/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ +#include "octvc1_irsc_evt.h" + +#endif /* __OCTVC1_IRSC_API_H__ */ + diff --git a/software/include/octvc1/irsc/octvc1_irsc_api_priv.h b/software/include/octvc1/irsc/octvc1_irsc_api_priv.h index 8e1c606..0f3778f 100644 --- a/software/include/octvc1/irsc/octvc1_irsc_api_priv.h +++ b/software/include/octvc1/irsc/octvc1_irsc_api_priv.h @@ -1,12 +1,12 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_IRSC_API_PRIV.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the definition of the IRSC API. - OCTVC1 Internal Resources - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_IRSC_API_PRIV.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the definition of the IRSC API. + OCTVC1 Internal Resources + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -19,31 +19,32 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_IRSC_API_PRIV_H__ -#define __OCTVC1_IRSC_API_PRIV_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_irsc_api.h" -#include "octvc1_irsc_id_priv.h" -#include "octvc1_irsc_rc_priv.h" - -/************************ COMMON DEFINITIONS *******************************/ - - - -/***************************** METHODS *************************************/ - -/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ -#include "octvc1_irsc_evt_priv.h" - -#endif /* __OCTVC1_IRSC_API_PRIV_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_IRSC_API_PRIV_H__ +#define __OCTVC1_IRSC_API_PRIV_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "octvc1_irsc_api.h" +#include "octvc1_irsc_id_priv.h" +#include "octvc1_irsc_rc_priv.h" + +/************************ COMMON DEFINITIONS *******************************/ + + + + +/***************************** METHODS *************************************/ + +/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ +#include "octvc1_irsc_evt_priv.h" + +#endif /* __OCTVC1_IRSC_API_PRIV_H__ */ + diff --git a/software/include/octvc1/irsc/octvc1_irsc_api_priv_swap.h b/software/include/octvc1/irsc/octvc1_irsc_api_priv_swap.h index 6b6277e..6121f86 100644 --- a/software/include/octvc1/irsc/octvc1_irsc_api_priv_swap.h +++ b/software/include/octvc1/irsc/octvc1_irsc_api_priv_swap.h @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/software/include/octvc1/irsc/octvc1_irsc_api_swap.h b/software/include/octvc1/irsc/octvc1_irsc_api_swap.h index 40a755d..3db6e3e 100644 --- a/software/include/octvc1/irsc/octvc1_irsc_api_swap.h +++ b/software/include/octvc1/irsc/octvc1_irsc_api_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_IRSC_API_SWAP_H__ @@ -101,6 +101,63 @@ extern "C" { #define mOCTVC1_IRSC_SESSION_STATS_SWAP( pOCTVC1_IRSC_SESSION_STATS ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else + +#define mOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_SWAP( pType ) + +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#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)->hProcess = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->hProcess); \ + { 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); \ +} +#else +#define mOCTVC1_IRSC_APPLICATION_TAP_INFO_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_INFO ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_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); \ +} +#else +#define mOCTVC1_IRSC_APPLICATION_TAP_STATS_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_STATS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_APPLICATION_TAP_START_SWAP( _f_pParms ){ tOCTVC1_IRSC_APPLICATION_TAP_START * pOCTVC1_IRSC_APPLICATION_TAP_START = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_APPLICATION_TAP_START)\ + { mOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulMode ); } \ + ((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulMaxTransportDataSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulMaxTransportDataSize); \ + ((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulFilterIndex = \ + 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); \ +} +#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_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 ); } \ @@ -582,6 +639,110 @@ extern "C" { #define mOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP_SWAP( pOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD * pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD)->ObjectCursor ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP * pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP)->ObjectCursor ); } \ + { mOCTVC1_LIST_NAME_OBJECT32_GET_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP)->ObjectNameList ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD * pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD)->hTapId); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP * pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP)->hTapId); \ + { mOCTVC1_IRSC_APPLICATION_TAP_INFO_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP)->Info ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD * pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD)->hTapId); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP * pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP)->hTapId); \ + { mOCTVC1_IRSC_APPLICATION_TAP_STATS_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP)->Stats ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD * pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD)->hTapId); \ + { mOCTVC1_IRSC_APPLICATION_TAP_START_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD)->Start ); } \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP * pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP)->hTapId); \ + ((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP)->hLogicalObj = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP)->hLogicalObj); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_START_TAP_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD * pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD *)pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD)->hTapId); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP * pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP)->Header ); } \ + ((tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP)->hTapId = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP *)pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP)->hTapId); \ +} +#else +#define mOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/software/include/octvc1/irsc/octvc1_irsc_base.h b/software/include/octvc1/irsc/octvc1_irsc_base.h index 6f02514..0e7edbb 100644 --- a/software/include/octvc1/irsc/octvc1_irsc_base.h +++ b/software/include/octvc1/irsc/octvc1_irsc_base.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_IRSC_BASE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the definition of the OCTVC1 API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_IRSC_BASE.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the definition of the OCTVC1 API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,34 +18,34 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_IRSC_BASE_H__ -#define __OCTVC1_IRSC_BASE_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octvc1_base.h" - -/**************************************************************************** - Module unique identifiers - ****************************************************************************/ -#define cOCTVC1_IRSC_UID ( 0x07 ) - -/**************************************************************************** - Module identifier bases - ****************************************************************************/ - -/* Module: IRSC */ -#define cOCTVC1_IRSC_CID_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_CID_BASE ) -#define cOCTVC1_IRSC_EID_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_EID_BASE ) -#define cOCTVC1_IRSC_RC_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_RC_BASE ) - -#endif /* __OCTVC1_IRSC_BASE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_IRSC_BASE_H__ +#define __OCTVC1_IRSC_BASE_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octvc1_base.h" + +/**************************************************************************** + Module unique identifiers + ****************************************************************************/ +#define cOCTVC1_IRSC_UID ( 0x07 ) + +/**************************************************************************** + Module identifier bases + ****************************************************************************/ + +/* Module: IRSC */ +#define cOCTVC1_IRSC_CID_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_CID_BASE ) +#define cOCTVC1_IRSC_EID_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_EID_BASE ) +#define cOCTVC1_IRSC_RC_BASE ( (cOCTVC1_IRSC_UID << 16) + cOCTVC1_RC_BASE ) + +#endif /* __OCTVC1_IRSC_BASE_H__ */ + diff --git a/software/include/octvc1/irsc/octvc1_irsc_default.h b/software/include/octvc1/irsc/octvc1_irsc_default.h index 30b44a7..f96a28a 100644 --- a/software/include/octvc1/irsc/octvc1_irsc_default.h +++ b/software/include/octvc1/irsc/octvc1_irsc_default.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_IRSC_DEFAULT.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the event definition of the IRSC API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_IRSC_DEFAULT.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the event definition of the IRSC API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,703 +18,867 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_IRSC_DEFAULT_H__ -#define __OCTVC1_IRSC_DEFAULT_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_irsc_api.h" - -/***************************** COMMAND DEFAULT *****************************/ - -/*-------------------------------------------------------------------------- - tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD -----------------------------------------------------------------------------*/ -#ifdef OCTVC1_OPT_DECLARE_DEFAULTS - -const tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD buf_tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD = -{ - { /* Header */ - ((sizeof(tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD)<ulModuleId ); } \ +} +#else +#define mOCTVC1_MAIN_APPLICATION_MODULE_INFO_SWAP( pOCTVC1_MAIN_APPLICATION_MODULE_INFO ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#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); \ +} +#else +#define mOCTVC1_MAIN_APPLICATION_MODULE_STATS_SWAP( pOCTVC1_MAIN_APPLICATION_MODULE_STATS ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_MAIN_HEARTBEAT_STATE_ENUM_SWAP( pType ){ \ *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } @@ -504,6 +541,14 @@ extern "C" { { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->Header ); } \ { mOCTVC1_MAIN_FILE_SYSTEM_FILE_CURSOR_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ObjectGet ); } \ { mOCTVC1_MAIN_FILE_OPEN_MODE_MASK_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulAccessMode ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulHostOwnerFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulHostOwnerFlag); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulFileSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulFileSize); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulMaxFileSize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulMaxFileSize); \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulInstanceNum = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP)->ulInstanceNum); \ } #else #define mOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_RSP ) @@ -854,6 +899,87 @@ extern "C" { #define mOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_RSP ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD)->ObjectCursor ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP)->Header ); } \ + { mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP)->ObjectCursor ); } \ + { mOCTVC1_LIST_NAME_OBJECT32_GET_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP)->ObjectNameList ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#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); \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#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); \ + { mOCTVC1_MAIN_APPLICATION_MODULE_INFO_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->Info ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#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)->ulResetStatsFlag = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->ulResetStatsFlag); \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#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); \ + { mOCTVC1_MAIN_APPLICATION_MODULE_STATS_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->Stats ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)->Header ); } \ + ((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)->ulMaxFilesize = \ + mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD)->ulMaxFilesize); \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)\ + { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP)->Header ); } \ +} +#else +#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/software/include/octvc1/main/octvc1_main_base.h b/software/include/octvc1/main/octvc1_main_base.h index 2b3ac75..3358172 100644 --- a/software/include/octvc1/main/octvc1_main_base.h +++ b/software/include/octvc1/main/octvc1_main_base.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_MAIN_BASE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the definition of the OCTVC1 API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_MAIN_BASE.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the definition of the OCTVC1 API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,34 +18,34 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_MAIN_BASE_H__ -#define __OCTVC1_MAIN_BASE_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octvc1_base.h" - -/**************************************************************************** - Module unique identifiers - ****************************************************************************/ -#define cOCTVC1_MAIN_UID ( 0x01 ) - -/**************************************************************************** - Module identifier bases - ****************************************************************************/ - -/* 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_RC_BASE ( (cOCTVC1_MAIN_UID << 16) + cOCTVC1_RC_BASE ) - -#endif /* __OCTVC1_MAIN_BASE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_MAIN_BASE_H__ +#define __OCTVC1_MAIN_BASE_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octvc1_base.h" + +/**************************************************************************** + Module unique identifiers + ****************************************************************************/ +#define cOCTVC1_MAIN_UID ( 0x01 ) + +/**************************************************************************** + Module identifier bases + ****************************************************************************/ + +/* 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_RC_BASE ( (cOCTVC1_MAIN_UID << 16) + cOCTVC1_RC_BASE ) + +#endif /* __OCTVC1_MAIN_BASE_H__ */ + diff --git a/software/include/octvc1/main/octvc1_main_default.h b/software/include/octvc1/main/octvc1_main_default.h index 8f5eb17..aa6ac9a 100644 --- a/software/include/octvc1/main/octvc1_main_default.h +++ b/software/include/octvc1/main/octvc1_main_default.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_MAIN_DEFAULT.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the event definition of the MAIN API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_MAIN_DEFAULT.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the event definition of the MAIN API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,1195 +18,1326 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_MAIN_DEFAULT_H__ -#define __OCTVC1_MAIN_DEFAULT_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_main_api.h" - -/***************************** COMMAND DEFAULT *****************************/ - -/*-------------------------------------------------------------------------- - tOCTVC1_MAIN_MSG_TARGET_RESET_CMD -----------------------------------------------------------------------------*/ -#ifdef OCTVC1_OPT_DECLARE_DEFAULTS - -const tOCTVC1_MAIN_MSG_TARGET_RESET_CMD buf_tOCTVC1_MAIN_MSG_TARGET_RESET_CMD = -{ - { /* Header */ - ((sizeof(tOCTVC1_MAIN_MSG_TARGET_RESET_CMD)<hObject ); } \ - { mOCTVC1_OBJECT_CURSOR_ENUM_SWAP( &((tOCTVC1_CURSOR_HANDLE_GET *)pOCTVC1_CURSOR_HANDLE_GET)->ulGetMode ); } \ -} -#else -#define mOCTVC1_CURSOR_HANDLE_GET_SWAP( pOCTVC1_CURSOR_HANDLE_GET ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#define mOCTVC1_OBJECT_CURSOR_SWAP mOCTVC1_CURSOR_HANDLE_GET_SWAP - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_CURSOR_HANDLE_GET_HANDLE_SWAP( _f_pParms ){ tOCTVC1_CURSOR_HANDLE_GET_HANDLE * pOCTVC1_CURSOR_HANDLE_GET_HANDLE = (_f_pParms); SWAP_UNUSED(pOCTVC1_CURSOR_HANDLE_GET_HANDLE)\ - { mOCTVC1_HANDLE_SWAP( &((tOCTVC1_CURSOR_HANDLE_GET_HANDLE *)pOCTVC1_CURSOR_HANDLE_GET_HANDLE)->hObject ); } \ - { mOCTVC1_OBJECT_CURSOR_ENUM_SWAP( &((tOCTVC1_CURSOR_HANDLE_GET_HANDLE *)pOCTVC1_CURSOR_HANDLE_GET_HANDLE)->ulGetMode ); } \ - { mOCTVC1_HANDLE_SWAP( &((tOCTVC1_CURSOR_HANDLE_GET_HANDLE *)pOCTVC1_CURSOR_HANDLE_GET_HANDLE)->hSubObject ); } \ -} -#else -#define mOCTVC1_CURSOR_HANDLE_GET_HANDLE_SWAP( pOCTVC1_CURSOR_HANDLE_GET_HANDLE ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#define mOCTVC1_SUB_OBJECT_CURSOR_SWAP mOCTVC1_CURSOR_HANDLE_GET_HANDLE_SWAP - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT_SWAP( _f_pParms ){ tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT * pOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT = (_f_pParms); SWAP_UNUSED(pOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT)\ - { mOCTVC1_HANDLE_SWAP( &((tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT *)pOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT)->hObject ); } \ - { mOCTVC1_OBJECT_CURSOR_ENUM_SWAP( &((tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT *)pOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT)->ulGetMode ); } \ - ((tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT *)pOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT)->hHandleObject = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT *)pOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT)->hHandleObject); \ -} -#else -#define mOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT_SWAP( pOCTVC1_CURSOR_HANDLE_GET_HANDLE_OBJECT ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID_SWAP( _f_pParms ){ tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID * pOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID = (_f_pParms); SWAP_UNUSED(pOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID)\ - { mOCTVC1_HANDLE_SWAP( &((tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID)->hObject ); } \ - { mOCTVC1_OBJECT_CURSOR_ENUM_SWAP( &((tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID)->ulGetMode ); } \ - ((tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID)->ulSubObjectId = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID)->ulSubObjectId); \ -} -#else -#define mOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID_SWAP( pOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#define mOCTVC1_SUB_OBJECT_ID_CURSOR_SWAP mOCTVC1_CURSOR_HANDLE_GET_SUB_OBJECT_ID_SWAP - #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_CURSOR_HANDLE_OBJECT_GET_SWAP( _f_pParms ){ tOCTVC1_CURSOR_HANDLE_OBJECT_GET * pOCTVC1_CURSOR_HANDLE_OBJECT_GET = (_f_pParms); SWAP_UNUSED(pOCTVC1_CURSOR_HANDLE_OBJECT_GET)\ ((tOCTVC1_CURSOR_HANDLE_OBJECT_GET *)pOCTVC1_CURSOR_HANDLE_OBJECT_GET)->hObject = \ diff --git a/software/include/octvc1/octvc1_eth.h b/software/include/octvc1/octvc1_eth.h index d1dc514..7bcb326 100644 --- a/software/include/octvc1/octvc1_eth.h +++ b/software/include/octvc1/octvc1_eth.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_ETH.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_ETH.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,41 +18,41 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_ETH_H__ -#define __OCTVC1_ETH_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" -#include "octvc1_base.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Ethernet port identifiers --------------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------------- - tOCTVC1_ETH_PORT_ID_ENUM : --------------------------------------------------------------------------------------*/ -#define tOCTVC1_ETH_PORT_ID_ENUM tOCT_UINT32 - -#define cOCTVC1_ETH_PORT_ID_ENUM_0 0 -#define cOCTVC1_ETH_PORT_ID_ENUM_1 1 -#define cOCTVC1_ETH_PORT_ID_ENUM_2 2 -#define cOCTVC1_ETH_PORT_ID_ENUM_3 3 -#define cOCTVC1_ETH_PORT_ID_ENUM_INVALID 0xFFFFFFFF - -#define cOCTVC1_ETH_802_1_PQ_TCI_INVALID 0xFFFFFFFF /* Ethernet 802.1 pq definition */ - - -#endif /* __OCTVC1_ETH_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_ETH_H__ +#define __OCTVC1_ETH_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" +#include "octvc1_base.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Ethernet port identifiers +-------------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------------- + tOCTVC1_ETH_PORT_ID_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_ETH_PORT_ID_ENUM tOCT_UINT32 + +#define cOCTVC1_ETH_PORT_ID_ENUM_0 0 +#define cOCTVC1_ETH_PORT_ID_ENUM_1 1 +#define cOCTVC1_ETH_PORT_ID_ENUM_2 2 +#define cOCTVC1_ETH_PORT_ID_ENUM_3 3 +#define cOCTVC1_ETH_PORT_ID_ENUM_INVALID 0xFFFFFFFF + +#define cOCTVC1_ETH_802_1_PQ_TCI_INVALID 0xFFFFFFFF /* Ethernet 802.1 pq definition */ + + +#endif /* __OCTVC1_ETH_H__ */ + diff --git a/software/include/octvc1/octvc1_eth_swap.h b/software/include/octvc1/octvc1_eth_swap.h index fff128f..bedef7d 100644 --- a/software/include/octvc1/octvc1_eth_swap.h +++ b/software/include/octvc1/octvc1_eth_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_ETH_SWAP_H__ diff --git a/software/include/octvc1/octvc1_fifo.h b/software/include/octvc1/octvc1_fifo.h index a6779b1..2721381 100644 --- a/software/include/octvc1/octvc1_fifo.h +++ b/software/include/octvc1/octvc1_fifo.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_FIFO.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_FIFO.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,31 +18,31 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_FIFO_H__ -#define __OCTVC1_FIFO_H__ - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Control process _FIFO-ID definition --------------------------------------------------------------------------------------*/ - -#define cOCTVC1_FIFO_ID_MGW_CONTROL 0x00000000 - -/*------------------------------------------------------------------------------------- - Invalid _FIFO-ID --------------------------------------------------------------------------------------*/ - -#define cOCTVC1_FIFO_ID_INVALID 0xFFFFFFFF - -#endif /* __OCTVC1_FIFO_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_FIFO_H__ +#define __OCTVC1_FIFO_H__ + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Control process _FIFO-ID definition +-------------------------------------------------------------------------------------*/ + +#define cOCTVC1_FIFO_ID_MGW_CONTROL 0x00000000 + +/*------------------------------------------------------------------------------------- + Invalid _FIFO-ID +-------------------------------------------------------------------------------------*/ + +#define cOCTVC1_FIFO_ID_INVALID 0xFFFFFFFF + +#endif /* __OCTVC1_FIFO_H__ */ + diff --git a/software/include/octvc1/octvc1_file.h b/software/include/octvc1/octvc1_file.h index 7e159d7..bf1a36e 100644 --- a/software/include/octvc1/octvc1_file.h +++ b/software/include/octvc1/octvc1_file.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_FILE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_FILE.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,119 +18,119 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_FILE_H__ -#define __OCTVC1_FILE_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - File Header magic - indicates if file should be swapped because - different endianness. - "\x7F""OCT". - 0x7F4F4354 the magic word - 0x54434F7F the magic word backwards ( file needs to be swapped) --------------------------------------------------------------------------------------*/ -#define cOCTVC1_FILE_ENDIAN_MAGIC_WORD 0x7F4F4354 -#define cOCTVC1_FILE_ENDIAN_MAGIC_WORD_SWAPPED 0x54434F7F - -/*------------------------------------------------------------------------------------- - File name string length restriction. --------------------------------------------------------------------------------------*/ -#define cOCTVC1_FILE_NAME_MAX_LENGTH 127 -/*------------------------------------------------------------------------------------- - tOCTVC1_FILE_TYPE_ENUM : File Type description --------------------------------------------------------------------------------------*/ -#define tOCTVC1_FILE_TYPE_ENUM tOCT_UINT32 - -#define cOCTVC1_FILE_TYPE_ENUM_NONE 0 -#define cOCTVC1_FILE_TYPE_ENUM_TEXT 1 -#define cOCTVC1_FILE_TYPE_ENUM_BIN 2 - -/*------------------------------------------------------------------------------------- - tOCTVC1_FILE_FORMAT_ENUM : File Type description --------------------------------------------------------------------------------------*/ -#define tOCTVC1_FILE_FORMAT_ENUM tOCT_UINT32 - -#define cOCTVC1_FILE_FORMAT_ENUM_NONE 0 -#define cOCTVC1_FILE_FORMAT_ENUM_LOG 1 - -/*------------------------------------------------------------------------------------- - File Header Type --------------------------------------------------------------------------------------*/ -#define cOCTVC1_FILE_TYPE_BIT_OFFSET 24 -#define cOCTVC1_FILE_TYPE_BIT_MASK 0xFF000000 - -/*------------------------------------------------------------------------------------- - File Header Format Version --------------------------------------------------------------------------------------*/ -#define cOCTVC1_FILE_FORMAT_VERSION_BIT_OFFSET 16 -#define cOCTVC1_FILE_FORMAT_VERSION_BIT_MASK 0x00FF0000 - -/*------------------------------------------------------------------------------------- - File Header Format --------------------------------------------------------------------------------------*/ -#define cOCTVC1_FILE_FORMAT_BIT_OFFSET 0 -#define cOCTVC1_FILE_FORMAT_BIT_MASK 0x0000FFFF - -/*------------------------------------------------------------------------------------- - File Header Size --------------------------------------------------------------------------------------*/ -#define cOCTVC1_FILE_HEADER_SIZE_BIT_OFFSET 0 -#define cOCTVC1_FILE_HEADER_SIZE_BIT_MASK 0x0000FFFF - -/*------------------------------------------------------------------------------------- - Minimum alignment in bytes. --------------------------------------------------------------------------------------*/ -#define cOCTVC1_FILE_MIN_ALIGN_BIT_OFFSET 16 -#define cOCTVC1_FILE_MIN_ALIGN_BIT_MASK 0x00FF0000 -/*------------------------------------------------------------------------------------- - tOCTVC1_FILE_HEADER - Generic file header - - Members: - ulMagic - Default: cOCTVC1_FILE_ENDIAN_MAGIC_WORD - Magic file number. - "\x7F""OCT". - 0x54434F7F on little endian machine. - 0x7F4F4354 on big endian machine - ul_Type_Ver - bits[31:24] = File Type. - bits[23:16] = File Format Version. - bits[15:0] = File Format. - ulTimeStamp - Time Stamp of when file was first written. - ul_Align_HdrSize - Minimum alignment in bytes. This indicates the minumum size of a payload in the - file, - that was used to ensure proper alignment (depends on architecture). - Header size with padding. This indicate where the file payload start (in byte). - bits[31:24] = Reserved. - bits[23:16] = Minimum alignment in bytes. - bits[15:0] = Header Size with padding. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT32 ulMagic; - tOCT_UINT32 ul_Type_Ver; - tOCT_UINT32 ulTimeStamp; - tOCT_UINT32 ul_Align_HdrSize; - -} tOCTVC1_FILE_HEADER; - - -#endif /* __OCTVC1_FILE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_FILE_H__ +#define __OCTVC1_FILE_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + File Header magic - indicates if file should be swapped because + different endianness. + "\x7F""OCT". + 0x7F4F4354 the magic word + 0x54434F7F the magic word backwards ( file needs to be swapped) +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_FILE_ENDIAN_MAGIC_WORD 0x7F4F4354 +#define cOCTVC1_FILE_ENDIAN_MAGIC_WORD_SWAPPED 0x54434F7F + +/*------------------------------------------------------------------------------------- + File name string length restriction. +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_FILE_NAME_MAX_LENGTH 127 +/*------------------------------------------------------------------------------------- + tOCTVC1_FILE_TYPE_ENUM : File Type description +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_FILE_TYPE_ENUM tOCT_UINT32 + +#define cOCTVC1_FILE_TYPE_ENUM_NONE 0 +#define cOCTVC1_FILE_TYPE_ENUM_TEXT 1 +#define cOCTVC1_FILE_TYPE_ENUM_BIN 2 + +/*------------------------------------------------------------------------------------- + tOCTVC1_FILE_FORMAT_ENUM : File Type description +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_FILE_FORMAT_ENUM tOCT_UINT32 + +#define cOCTVC1_FILE_FORMAT_ENUM_NONE 0 +#define cOCTVC1_FILE_FORMAT_ENUM_LOG 1 + +/*------------------------------------------------------------------------------------- + File Header Type +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_FILE_TYPE_BIT_OFFSET 24 +#define cOCTVC1_FILE_TYPE_BIT_MASK 0xFF000000 + +/*------------------------------------------------------------------------------------- + File Header Format Version +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_FILE_FORMAT_VERSION_BIT_OFFSET 16 +#define cOCTVC1_FILE_FORMAT_VERSION_BIT_MASK 0x00FF0000 + +/*------------------------------------------------------------------------------------- + File Header Format +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_FILE_FORMAT_BIT_OFFSET 0 +#define cOCTVC1_FILE_FORMAT_BIT_MASK 0x0000FFFF + +/*------------------------------------------------------------------------------------- + File Header Size +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_FILE_HEADER_SIZE_BIT_OFFSET 0 +#define cOCTVC1_FILE_HEADER_SIZE_BIT_MASK 0x0000FFFF + +/*------------------------------------------------------------------------------------- + Minimum alignment in bytes. +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_FILE_MIN_ALIGN_BIT_OFFSET 16 +#define cOCTVC1_FILE_MIN_ALIGN_BIT_MASK 0x00FF0000 +/*------------------------------------------------------------------------------------- + tOCTVC1_FILE_HEADER + Generic file header + + Members: + ulMagic + Default: cOCTVC1_FILE_ENDIAN_MAGIC_WORD + Magic file number. + "\x7F""OCT". + 0x54434F7F on little endian machine. + 0x7F4F4354 on big endian machine + ul_Type_Ver + bits[31:24] = File Type. + bits[23:16] = File Format Version. + bits[15:0] = File Format. + ulTimeStamp + Time Stamp of when file was first written. + ul_Align_HdrSize + Minimum alignment in bytes. This indicates the minumum size of a payload in the + file, + that was used to ensure proper alignment (depends on architecture). + Header size with padding. This indicate where the file payload start (in byte). + bits[31:24] = Reserved. + bits[23:16] = Minimum alignment in bytes. + bits[15:0] = Header Size with padding. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulMagic; + tOCT_UINT32 ul_Type_Ver; + tOCT_UINT32 ulTimeStamp; + tOCT_UINT32 ul_Align_HdrSize; + +} tOCTVC1_FILE_HEADER; + + +#endif /* __OCTVC1_FILE_H__ */ + diff --git a/software/include/octvc1/octvc1_file_swap.h b/software/include/octvc1/octvc1_file_swap.h index 413dbad..3921095 100644 --- a/software/include/octvc1/octvc1_file_swap.h +++ b/software/include/octvc1/octvc1_file_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_FILE_SWAP_H__ diff --git a/software/include/octvc1/octvc1_generic_rc.h b/software/include/octvc1/octvc1_generic_rc.h index 56796f3..745b259 100644 --- a/software/include/octvc1/octvc1_generic_rc.h +++ b/software/include/octvc1/octvc1_generic_rc.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_GENERIC_RC.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the return codes for the GENERIC API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_GENERIC_RC.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the return codes for the GENERIC API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,78 +18,81 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef OCTVC1_GENERIC_RC_H__ -#define OCTVC1_GENERIC_RC_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_base.h" - -/**************************************************************************** - GENERIC return codes - ****************************************************************************/ -#define cOCTVC1_RC_OK ( 0x0000 ) -#define cOCTVC1_GENERIC_RC_BAD_PARAM ( 0x0001 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_NOT_FOUND ( 0x0002 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_ALREADY_USED ( 0x0003 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_READ_OBJECT ( 0x0004 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_WRITE_OBJECT ( 0x0005 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_INVALID_TRANSACTION_ID ( 0x0006 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_ID_INVALID ( 0x0007 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_SUB_ID_INVALID ( 0x0008 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_GET_MODE_INVALID ( 0x0009 + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_NO_MORE_OBJECT ( 0x000A + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_NO_MORE_SUB_OBJECT ( 0x000B + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_FULL ( 0x000C + cOCTVC1_GENERIC_RC_BASE ) -#define cOCTVC1_GENERIC_RC_TIMEOUT ( 0x000D + cOCTVC1_GENERIC_RC_BASE ) - -/**************************************************************************** - API return codes - ****************************************************************************/ -#define cOCTVC1_GENERIC_API_RC_BASE ( 0x0300 + cOCTVC1_GENERIC_RC_BASE ) - -#define cOCTVC1_GENERIC_RC_API_CMD_NOT_IMPLEMENTED ( 0x0001 + cOCTVC1_GENERIC_API_RC_BASE ) -#define cOCTVC1_GENERIC_RC_API_CMD_REJECT ( 0x0002 + cOCTVC1_GENERIC_API_RC_BASE ) -#define cOCTVC1_GENERIC_RC_API_CMD_RETRANSMIT ( 0x0003 + cOCTVC1_GENERIC_API_RC_BASE ) -#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 ) - -/**************************************************************************** - MEMORY return codes - ****************************************************************************/ -#define cOCTVC1_GENERIC_MEMORY_RC_BASE ( 0x0400 + cOCTVC1_GENERIC_RC_BASE ) - -#define cOCTVC1_GENERIC_RC_MEMORY_LOCAL_ALLOC ( 0x0001 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_LOCAL_FREE ( 0x0002 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_ALLOC ( 0x0003 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_FREE ( 0x0004 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_ALLOC ( 0x0005 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_FREE ( 0x0006 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_READ ( 0x0007 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_WRITE ( 0x0008 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_IO_READ ( 0x0009 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_IO_WRITE ( 0x000A + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_CHECKSUM ( 0x000B + cOCTVC1_GENERIC_MEMORY_RC_BASE ) -#define cOCTVC1_GENERIC_RC_MEMORY_SIZE ( 0x000C + cOCTVC1_GENERIC_MEMORY_RC_BASE ) - -/**************************************************************************** - INTERNAL return codes - ****************************************************************************/ -#define cOCTVC1_GENERIC_INTERNAL_RC_BASE ( 0x0500 + cOCTVC1_GENERIC_RC_BASE ) - -#define cOCTVC1_GENERIC_RC_INTERNAL_ERROR ( 0x0001 + cOCTVC1_GENERIC_INTERNAL_RC_BASE ) -#define cOCTVC1_GENERIC_RC_INTERNAL_SERVICE_NOT_INIT ( 0x0002 + cOCTVC1_GENERIC_INTERNAL_RC_BASE ) -#define cOCTVC1_GENERIC_RC_INTERNAL_TIMEOUT ( 0x0003 + cOCTVC1_GENERIC_INTERNAL_RC_BASE ) -#define cOCTVC1_GENERIC_RC_INTERNAL_MSG_UNKNOWN ( 0x0004 + cOCTVC1_GENERIC_INTERNAL_RC_BASE ) - -#endif /* OCTVC1_GENERIC_RC_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef OCTVC1_GENERIC_RC_H__ +#define OCTVC1_GENERIC_RC_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "octvc1_base.h" + +/**************************************************************************** + GENERIC return codes + ****************************************************************************/ +#define cOCTVC1_RC_OK ( 0x0000 ) +#define cOCTVC1_GENERIC_RC_BAD_PARAM ( 0x0001 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_NOT_FOUND ( 0x0002 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_ALREADY_USED ( 0x0003 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_READ_OBJECT ( 0x0004 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_WRITE_OBJECT ( 0x0005 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_INVALID_TRANSACTION_ID ( 0x0006 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_ID_INVALID ( 0x0007 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_SUB_ID_INVALID ( 0x0008 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_GET_MODE_INVALID ( 0x0009 + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_NO_MORE_OBJECT ( 0x000A + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_NO_MORE_SUB_OBJECT ( 0x000B + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_FULL ( 0x000C + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_TIMEOUT ( 0x000D + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_BAD_STATE ( 0x000E + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_ALREADY_START ( 0x000F + cOCTVC1_GENERIC_RC_BASE ) +#define cOCTVC1_GENERIC_RC_ALREADY_STOP ( 0x0010 + cOCTVC1_GENERIC_RC_BASE ) + +/**************************************************************************** + API return codes + ****************************************************************************/ +#define cOCTVC1_GENERIC_API_RC_BASE ( 0x0300 + cOCTVC1_GENERIC_RC_BASE ) + +#define cOCTVC1_GENERIC_RC_API_CMD_NOT_IMPLEMENTED ( 0x0001 + cOCTVC1_GENERIC_API_RC_BASE ) +#define cOCTVC1_GENERIC_RC_API_CMD_REJECT ( 0x0002 + cOCTVC1_GENERIC_API_RC_BASE ) +#define cOCTVC1_GENERIC_RC_API_CMD_RETRANSMIT ( 0x0003 + cOCTVC1_GENERIC_API_RC_BASE ) +#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 ) + +/**************************************************************************** + MEMORY return codes + ****************************************************************************/ +#define cOCTVC1_GENERIC_MEMORY_RC_BASE ( 0x0400 + cOCTVC1_GENERIC_RC_BASE ) + +#define cOCTVC1_GENERIC_RC_MEMORY_LOCAL_ALLOC ( 0x0001 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_LOCAL_FREE ( 0x0002 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_ALLOC ( 0x0003 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_FREE ( 0x0004 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_ALLOC ( 0x0005 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_FREE ( 0x0006 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_READ ( 0x0007 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_WRITE ( 0x0008 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_IO_READ ( 0x0009 + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_IO_WRITE ( 0x000A + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_CHECKSUM ( 0x000B + cOCTVC1_GENERIC_MEMORY_RC_BASE ) +#define cOCTVC1_GENERIC_RC_MEMORY_SIZE ( 0x000C + cOCTVC1_GENERIC_MEMORY_RC_BASE ) + +/**************************************************************************** + INTERNAL return codes + ****************************************************************************/ +#define cOCTVC1_GENERIC_INTERNAL_RC_BASE ( 0x0500 + cOCTVC1_GENERIC_RC_BASE ) + +#define cOCTVC1_GENERIC_RC_INTERNAL_ERROR ( 0x0001 + cOCTVC1_GENERIC_INTERNAL_RC_BASE ) +#define cOCTVC1_GENERIC_RC_INTERNAL_SERVICE_NOT_INIT ( 0x0002 + cOCTVC1_GENERIC_INTERNAL_RC_BASE ) +#define cOCTVC1_GENERIC_RC_INTERNAL_TIMEOUT ( 0x0003 + cOCTVC1_GENERIC_INTERNAL_RC_BASE ) +#define cOCTVC1_GENERIC_RC_INTERNAL_MSG_UNKNOWN ( 0x0004 + cOCTVC1_GENERIC_INTERNAL_RC_BASE ) + +#endif /* OCTVC1_GENERIC_RC_H__ */ + diff --git a/software/include/octvc1/octvc1_handle.h b/software/include/octvc1/octvc1_handle.h index a7d2de0..81801a9 100644 --- a/software/include/octvc1/octvc1_handle.h +++ b/software/include/octvc1/octvc1_handle.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_HANDLE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_HANDLE.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,118 +18,101 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_HANDLE_H__ -#define __OCTVC1_HANDLE_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Handle Type Definitions --------------------------------------------------------------------------------------*/ - -#define cOCTVC1_HANDLE_TYPE_OBJECT 0x00000000 -#define cOCTVC1_HANDLE_TYPE_SPECIAL 0xC0000000 - -/*------------------------------------------------------------------------------------- - Special Object Handle. - These handle are used by setting - tOCTVC1_HANDLE.aulHandle[0] to the selected value. --------------------------------------------------------------------------------------*/ - -#define cOCTVC1_HANDLE_INVALID 0xFFFFFFFF -#define cOCTVC1_HANDLE_TX_ETHERNET 0xFFFFFFFE -#define cOCTVC1_HANDLE_RX_ETHERNET 0xFFFFFFFD - -/*------------------------------------------------------------------------------------- - Generic Definitions --------------------------------------------------------------------------------------*/ - -#define cOCTVC1_DO_NOT_MODIFY 0xEEEEEEEE -#define cOCTVC1_INDEX_INVALID 0xFFFFFFFF -#define cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY 100 -#define cOCTVC1_HANDLE_OBJECT32_NAME_LIST_MAX_ENTRY 25 -#define cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH 31 - -/*------------------------------------------------------------------------------------- - Base Object Type, for MAIN API --------------------------------------------------------------------------------------*/ - -#define cOCTVC1_HANDLE_BASE_OBJ_TYPE_MAIN_MASK 0xFF00 -#define cOCTVC1_HANDLE_BASE_OBJ_TYPE_INVALID 0x0000 -#define cOCTVC1_HANDLE_BASE_OBJ_TYPE_MAIN (cOCTVC1_MAIN_UID<<8) - -/*------------------------------------------------------------------------------------- - Generic Vocallo Object Handle --------------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------------- - tOCTVC1_HANDLE - - Members: - aulHandle - aulHandle[0] = bits[31:30] = Handle Type (cOCTVC1_HANDLE_TYPE_*) - bits[29:16] = Handle Object Type (tOCTVC1_HANDLE_OBJ_TYPE_*) - bits[15:0] = Handle Object Instance bits[79:64] - aulHandle[1] = bits[31:0] = Handle Object Instance bits[63:32] - aulHandle[2] = bits[31:0] = Handle Object Instance bits[31:0] --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT32 aulHandle[3]; - -} tOCTVC1_HANDLE; - -/*------------------------------------------------------------------------------------- - tOCTVC1_HANDLE_OBJECT : Handle Object Definitions - bits[31:20] = Object Type - bits[19:0] = Object Instance bits --------------------------------------------------------------------------------------*/ -#define tOCTVC1_HANDLE_OBJECT tOCT_UINT32 - - -/*------------------------------------------------------------------------------------- - tOCTVC1_OBJECT32_NAME - - Members: - ulObject32 - 32 bits object identifier - May be tOCTVC1_HANDLE_OBJECT, tOCTVC1_SUB_OBJECT_ID, tOCTVC1_INDEX or any 32bits - szDisplayName - Name given to the object. Normally use for display name threw populate --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT32 ulObject32; - tOCT_UINT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)]; - -} tOCTVC1_OBJECT32_NAME; - -/*------------------------------------------------------------------------------------- - tOCTVC1_SUB_OBJECT_ID : Identifier specific to a child. - Implementation is specific for every parent. --------------------------------------------------------------------------------------*/ -#define tOCTVC1_SUB_OBJECT_ID tOCT_UINT32 - - -/*------------------------------------------------------------------------------------- - tOCTVC1_INDEX : Index specific to an object. - Implementation is specific for every object. --------------------------------------------------------------------------------------*/ -#define tOCTVC1_INDEX tOCT_UINT32 - - - -#endif /* __OCTVC1_HANDLE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_HANDLE_H__ +#define __OCTVC1_HANDLE_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Handle Type Definitions +-------------------------------------------------------------------------------------*/ + +#define cOCTVC1_HANDLE_TYPE_OBJECT 0x00000000 +#define cOCTVC1_HANDLE_TYPE_SPECIAL 0xC0000000 + +/*------------------------------------------------------------------------------------- + Special Object Handle. + These handle are used by setting + tOCTVC1_HANDLE.aulHandle[0] to the selected value. +-------------------------------------------------------------------------------------*/ + +#define cOCTVC1_HANDLE_INVALID 0xFFFFFFFF +#define cOCTVC1_HANDLE_TX_ETHERNET 0xFFFFFFFE +#define cOCTVC1_HANDLE_RX_ETHERNET 0xFFFFFFFD + +/*------------------------------------------------------------------------------------- + Generic Definitions +-------------------------------------------------------------------------------------*/ + +#define cOCTVC1_DO_NOT_MODIFY 0xEEEEEEEE +#define cOCTVC1_INDEX_INVALID 0xFFFFFFFF +#define cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY 100 +#define cOCTVC1_HANDLE_OBJECT32_NAME_LIST_MAX_ENTRY 25 +#define cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH 31 + +/*------------------------------------------------------------------------------------- + Base Object Type, for MAIN API +-------------------------------------------------------------------------------------*/ + +#define cOCTVC1_HANDLE_BASE_OBJ_TYPE_MAIN_MASK 0xFF00 +#define cOCTVC1_HANDLE_BASE_OBJ_TYPE_INVALID 0x0000 +#define cOCTVC1_HANDLE_BASE_OBJ_TYPE_MAIN (cOCTVC1_MAIN_UID<<8) + +/*------------------------------------------------------------------------------------- + Generic Vocallo Object Handle +-------------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------------- + tOCTVC1_HANDLE_OBJECT : Handle Object Definitions + bits[31:20] = Object Type + bits[19:0] = Object Instance bits +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_HANDLE_OBJECT tOCT_UINT32 + + +/*------------------------------------------------------------------------------------- + tOCTVC1_OBJECT32_NAME + + Members: + ulObject32 + 32 bits object identifier + May be tOCTVC1_HANDLE_OBJECT, tOCTVC1_SUB_OBJECT_ID, tOCTVC1_INDEX or any 32bits + szDisplayName + Name given to the object. Normally use for display name threw populate +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulObject32; + tOCT_UINT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)]; + +} tOCTVC1_OBJECT32_NAME; + +/*------------------------------------------------------------------------------------- + tOCTVC1_SUB_OBJECT_ID : Identifier specific to a child. + Implementation is specific for every parent. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_SUB_OBJECT_ID tOCT_UINT32 + + +/*------------------------------------------------------------------------------------- + tOCTVC1_INDEX : Index specific to an object. + Implementation is specific for every object. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_INDEX tOCT_UINT32 + + + +#endif /* __OCTVC1_HANDLE_H__ */ + diff --git a/software/include/octvc1/octvc1_handle_swap.h b/software/include/octvc1/octvc1_handle_swap.h index fd30cba..553a43a 100644 --- a/software/include/octvc1/octvc1_handle_swap.h +++ b/software/include/octvc1/octvc1_handle_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_HANDLE_SWAP_H__ @@ -37,18 +37,6 @@ extern "C" { /********************************* MACROS **********************************/ -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_HANDLE_SWAP( _f_pParms ){ tOCTVC1_HANDLE * pOCTVC1_HANDLE = (_f_pParms); SWAP_UNUSED(pOCTVC1_HANDLE)\ - { tOCT_UINT32 iOCTVC1_HANDLE; \ - for( iOCTVC1_HANDLE=0; \ - iOCTVC1_HANDLE<(3);iOCTVC1_HANDLE++ ) \ - ((tOCTVC1_HANDLE *)pOCTVC1_HANDLE)->aulHandle[iOCTVC1_HANDLE] = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_HANDLE *)pOCTVC1_HANDLE)->aulHandle[iOCTVC1_HANDLE]);}\ -} -#else -#define mOCTVC1_HANDLE_SWAP( pOCTVC1_HANDLE ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_OBJECT32_NAME_SWAP( _f_pParms ){ tOCTVC1_OBJECT32_NAME * pOCTVC1_OBJECT32_NAME = (_f_pParms); SWAP_UNUSED(pOCTVC1_OBJECT32_NAME)\ ((tOCTVC1_OBJECT32_NAME *)pOCTVC1_OBJECT32_NAME)->ulObject32 = \ diff --git a/software/include/octvc1/octvc1_id2string.h b/software/include/octvc1/octvc1_id2string.h index 4c7a2f0..04f4861 100644 --- a/software/include/octvc1/octvc1_id2string.h +++ b/software/include/octvc1/octvc1_id2string.h @@ -1,13 +1,13 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: octvc1_id2string.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - -This file contains the id2string implementation for package OCTVC1 - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: octvc1_id2string.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: + +This file contains the id2string implementation for package OCTVC1 + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -20,297 +20,324 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - - -#ifndef __OCTVC1_ID2STRING__ -#define __OCTVC1_ID2STRING__ - -#include "../octdev_types.h" -/* ------------------------------------------------------------------------------------- - OCTVC1_ID2STRING - -------------------------------------------------------------------------------------*/ -#define mOCTVC1_ID2STRING( _f_ulId ) \ - octvc1_id2string( _f_ulId ) - -#ifndef OCTVC1_ID2STRING_DECLARE -extern const char * octvc1_id2string( tOCT_UINT32 f_ulId ); -#endif - - -#ifdef OCTVC1_ID2STRING_DECLARE -#include -#include "main/octvc1_main_id.h" -#include "hw/octvc1_hw_id.h" -#include "irsc/octvc1_irsc_id.h" -#include "gsm/octvc1_gsm_id.h" - - -/* ------------------------------------------------------------------------------------- - octvc1_id2string - -------------------------------------------------------------------------------------*/ -const char * octvc1_id2string( tOCT_UINT32 f_ulId ) -{ - static char g_szUnknownoctvc1_id2string[32]; - switch( f_ulId ) - { - /* OCTVC1_MAIN */ - case cOCTVC1_MAIN_MSG_TARGET_RESET_CID: - return "cOCTVC1_MAIN_MSG_TARGET_RESET_CID"; - case cOCTVC1_MAIN_MSG_TARGET_INFO_CID: - return "cOCTVC1_MAIN_MSG_TARGET_INFO_CID"; - case cOCTVC1_MAIN_MSG_LOG_ERASE_CID: - return "cOCTVC1_MAIN_MSG_LOG_ERASE_CID"; - case cOCTVC1_MAIN_MSG_LOG_INFO_CID: - return "cOCTVC1_MAIN_MSG_LOG_INFO_CID"; - case cOCTVC1_MAIN_MSG_LOG_STATS_CID: - return "cOCTVC1_MAIN_MSG_LOG_STATS_CID"; - case cOCTVC1_MAIN_MSG_LOG_INFO_TRACE_CID: - return "cOCTVC1_MAIN_MSG_LOG_INFO_TRACE_CID"; - case cOCTVC1_MAIN_MSG_LOG_START_TRACE_CID: - return "cOCTVC1_MAIN_MSG_LOG_START_TRACE_CID"; - case cOCTVC1_MAIN_MSG_LOG_STOP_TRACE_CID: - return "cOCTVC1_MAIN_MSG_LOG_STOP_TRACE_CID"; - case cOCTVC1_MAIN_MSG_LOG_ERASE_TRACE_CID: - return "cOCTVC1_MAIN_MSG_LOG_ERASE_TRACE_CID"; - case cOCTVC1_MAIN_MSG_LOG_STATS_TRACE_CID: - return "cOCTVC1_MAIN_MSG_LOG_STATS_TRACE_CID"; - case cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID: - return "cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID"; - case cOCTVC1_MAIN_MSG_FILE_OPEN_CID: - return "cOCTVC1_MAIN_MSG_FILE_OPEN_CID"; - case cOCTVC1_MAIN_MSG_FILE_CLOSE_CID: - return "cOCTVC1_MAIN_MSG_FILE_CLOSE_CID"; - case cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID: - return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID"; - case cOCTVC1_MAIN_MSG_FILE_WRITE_CID: - return "cOCTVC1_MAIN_MSG_FILE_WRITE_CID"; - case cOCTVC1_MAIN_MSG_FILE_READ_CID: - return "cOCTVC1_MAIN_MSG_FILE_READ_CID"; - case cOCTVC1_MAIN_MSG_FILE_INFO_CID: - return "cOCTVC1_MAIN_MSG_FILE_INFO_CID"; - case cOCTVC1_MAIN_MSG_FILE_LIST_CID: - return "cOCTVC1_MAIN_MSG_FILE_LIST_CID"; - case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID: - return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID"; - case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID: - return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID"; - case cOCTVC1_MAIN_MSG_PROCESS_INFO_CID: - return "cOCTVC1_MAIN_MSG_PROCESS_INFO_CID"; - case cOCTVC1_MAIN_MSG_PROCESS_LIST_CID: - return "cOCTVC1_MAIN_MSG_PROCESS_LIST_CID"; - case cOCTVC1_MAIN_MSG_PROCESS_MONITOR_CPU_USAGE_CID: - return "cOCTVC1_MAIN_MSG_PROCESS_MONITOR_CPU_USAGE_CID"; - case cOCTVC1_MAIN_MSG_PROCESS_STATS_CPU_USAGE_CID: - return "cOCTVC1_MAIN_MSG_PROCESS_STATS_CPU_USAGE_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_LIST_SESSION_CID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_LIST_SESSION_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_CID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_EVT_CID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_EVT_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_HEARTBEAT_CID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_HEARTBEAT_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_STATS_SESSION_HEARTBEAT_CID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_STATS_SESSION_HEARTBEAT_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID: - 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: - return "cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID"; - case cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID: - return "cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID"; - case cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID: - return "cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID"; - case cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID: - return "cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID"; - case cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID: - return "cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID"; - case cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID: - return "cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID"; - case cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID: - return "cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID"; - /* OCTVC1_HW */ - case cOCTVC1_HW_MSG_PCB_INFO_CID: - return "cOCTVC1_HW_MSG_PCB_INFO_CID"; - case cOCTVC1_HW_MSG_CPU_CORE_STATS_CID: - return "cOCTVC1_HW_MSG_CPU_CORE_STATS_CID"; - case cOCTVC1_HW_MSG_CPU_CORE_INFO_CID: - return "cOCTVC1_HW_MSG_CPU_CORE_INFO_CID"; - case cOCTVC1_HW_MSG_CPU_CORE_LIST_CID: - return "cOCTVC1_HW_MSG_CPU_CORE_LIST_CID"; - case cOCTVC1_HW_MSG_ETH_PORT_INFO_CID: - return "cOCTVC1_HW_MSG_ETH_PORT_INFO_CID"; - case cOCTVC1_HW_MSG_ETH_PORT_LIST_CID: - return "cOCTVC1_HW_MSG_ETH_PORT_LIST_CID"; - case cOCTVC1_HW_MSG_ETH_PORT_STATS_CID: - return "cOCTVC1_HW_MSG_ETH_PORT_STATS_CID"; - case cOCTVC1_HW_MSG_ETH_PORT_MODIFY_CID: - return "cOCTVC1_HW_MSG_ETH_PORT_MODIFY_CID"; - case cOCTVC1_HW_MSG_RF_PORT_INFO_CID: - return "cOCTVC1_HW_MSG_RF_PORT_INFO_CID"; - case cOCTVC1_HW_MSG_RF_PORT_STATS_CID: - return "cOCTVC1_HW_MSG_RF_PORT_STATS_CID"; - case cOCTVC1_HW_MSG_RF_PORT_LIST_CID: - return "cOCTVC1_HW_MSG_RF_PORT_LIST_CID"; - case cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID: - return "cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID"; - case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID: - return "cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID"; - case cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID: - return "cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_RX_CONFIG_CID"; - case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID: - return "cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID"; - case cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CID: - return "cOCTVC1_HW_MSG_RF_PORT_MODIFY_ANTENNA_TX_CONFIG_CID"; - case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID: - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID"; - case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID: - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID"; - case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID: - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID"; - case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID: - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID"; - case cOCTVC1_HW_MSG_CPU_CORE_EXEC_REPORT_EID: - return "cOCTVC1_HW_MSG_CPU_CORE_EXEC_REPORT_EID"; - case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EID: - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EID"; - /* OCTVC1_IRSC */ - case cOCTVC1_IRSC_MSG_PROCESS_INFO_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_INFO_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_STATS_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_STATS_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_LIST_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_LIST_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID: - return "cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID"; - case cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID: - return "cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID"; - case cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID: - return "cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID"; - case cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID: - return "cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID"; - case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID: - return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID"; - case cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID: - return "cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID"; - /* OCTVC1_GSM */ - case cOCTVC1_GSM_MSG_TRX_OPEN_CID: - return "cOCTVC1_GSM_MSG_TRX_OPEN_CID"; - case cOCTVC1_GSM_MSG_TRX_CLOSE_CID: - return "cOCTVC1_GSM_MSG_TRX_CLOSE_CID"; - case cOCTVC1_GSM_MSG_TRX_STATUS_CID: - return "cOCTVC1_GSM_MSG_TRX_STATUS_CID"; - case cOCTVC1_GSM_MSG_TRX_INFO_CID: - return "cOCTVC1_GSM_MSG_TRX_INFO_CID"; - case cOCTVC1_GSM_MSG_TRX_RESET_CID: - return "cOCTVC1_GSM_MSG_TRX_RESET_CID"; - case cOCTVC1_GSM_MSG_TRX_MODIFY_CID: - return "cOCTVC1_GSM_MSG_TRX_MODIFY_CID"; - case cOCTVC1_GSM_MSG_TRX_LIST_CID: - return "cOCTVC1_GSM_MSG_TRX_LIST_CID"; - case cOCTVC1_GSM_MSG_TRX_CLOSE_ALL_CID: - return "cOCTVC1_GSM_MSG_TRX_CLOSE_ALL_CID"; - case cOCTVC1_GSM_MSG_TRX_START_RECORD_CID: - return "cOCTVC1_GSM_MSG_TRX_START_RECORD_CID"; - case cOCTVC1_GSM_MSG_TRX_STOP_RECORD_CID: - return "cOCTVC1_GSM_MSG_TRX_STOP_RECORD_CID"; - case cOCTVC1_GSM_MSG_TRX_ACTIVATE_LOGICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_ACTIVATE_LOGICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_DEACTIVATE_LOGICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_DEACTIVATE_LOGICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_STATUS_LOGICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_STATUS_LOGICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_INFO_LOGICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_INFO_LOGICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_LIST_LOGICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_LIST_LOGICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID: - return "cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID"; - case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID: - return "cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID"; - case cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_RESET_PHYSICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_RESET_PHYSICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_LIST_PHYSICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_LIST_PHYSICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CID: - return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CID"; - case cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID: - return "cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID"; - case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID: - return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID"; - case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID: - return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID"; - case cOCTVC1_GSM_MSG_TRX_INFO_RF_CID: - return "cOCTVC1_GSM_MSG_TRX_INFO_RF_CID"; - case cOCTVC1_GSM_MSG_TRX_MODIFY_RF_CID: - return "cOCTVC1_GSM_MSG_TRX_MODIFY_RF_CID"; - case cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID: - return "cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID"; - case cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID: - return "cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID"; - case cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID: - return "cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID"; - case cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID: - return "cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID"; - case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_DATA_INDICATION_EID: - return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_DATA_INDICATION_EID"; - case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION_EID: - return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION_EID"; - case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RACH_INDICATION_EID: - return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RACH_INDICATION_EID"; - case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION_EID: - return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION_EID"; - - } - sprintf( g_szUnknownoctvc1_id2string, "0x%.8X", f_ulId ); - return g_szUnknownoctvc1_id2string; -} -#endif - -#endif /* __OCTVC1_ID2STRING__ */ +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + + +#ifndef __OCTVC1_ID2STRING__ +#define __OCTVC1_ID2STRING__ + +#include "../octdev_types.h" +/* ------------------------------------------------------------------------------------- + OCTVC1_ID2STRING + -------------------------------------------------------------------------------------*/ +#define mOCTVC1_ID2STRING( _f_ulId ) \ + octvc1_id2string( _f_ulId ) + +#ifndef OCTVC1_ID2STRING_DECLARE +extern const char * octvc1_id2string( tOCT_UINT32 f_ulId ); +#endif + + +#ifdef OCTVC1_ID2STRING_DECLARE +#include +#include "main/octvc1_main_id.h" +#include "hw/octvc1_hw_id.h" +#include "irsc/octvc1_irsc_id.h" +#include "gsm/octvc1_gsm_id.h" + + +/* ------------------------------------------------------------------------------------- + octvc1_id2string + -------------------------------------------------------------------------------------*/ +const char * octvc1_id2string( tOCT_UINT32 f_ulId ) +{ + static char g_szUnknownoctvc1_id2string[32]; + switch( f_ulId ) + { + /* OCTVC1_MAIN */ + case cOCTVC1_MAIN_MSG_TARGET_RESET_CID: + return "cOCTVC1_MAIN_MSG_TARGET_RESET_CID"; + case cOCTVC1_MAIN_MSG_TARGET_INFO_CID: + return "cOCTVC1_MAIN_MSG_TARGET_INFO_CID"; + case cOCTVC1_MAIN_MSG_LOG_ERASE_CID: + return "cOCTVC1_MAIN_MSG_LOG_ERASE_CID"; + case cOCTVC1_MAIN_MSG_LOG_INFO_CID: + return "cOCTVC1_MAIN_MSG_LOG_INFO_CID"; + case cOCTVC1_MAIN_MSG_LOG_STATS_CID: + return "cOCTVC1_MAIN_MSG_LOG_STATS_CID"; + case cOCTVC1_MAIN_MSG_LOG_INFO_TRACE_CID: + return "cOCTVC1_MAIN_MSG_LOG_INFO_TRACE_CID"; + case cOCTVC1_MAIN_MSG_LOG_START_TRACE_CID: + return "cOCTVC1_MAIN_MSG_LOG_START_TRACE_CID"; + case cOCTVC1_MAIN_MSG_LOG_STOP_TRACE_CID: + return "cOCTVC1_MAIN_MSG_LOG_STOP_TRACE_CID"; + case cOCTVC1_MAIN_MSG_LOG_ERASE_TRACE_CID: + return "cOCTVC1_MAIN_MSG_LOG_ERASE_TRACE_CID"; + case cOCTVC1_MAIN_MSG_LOG_STATS_TRACE_CID: + return "cOCTVC1_MAIN_MSG_LOG_STATS_TRACE_CID"; + case cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID: + return "cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID"; + case cOCTVC1_MAIN_MSG_FILE_OPEN_CID: + return "cOCTVC1_MAIN_MSG_FILE_OPEN_CID"; + case cOCTVC1_MAIN_MSG_FILE_CLOSE_CID: + return "cOCTVC1_MAIN_MSG_FILE_CLOSE_CID"; + case cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID: + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID"; + case cOCTVC1_MAIN_MSG_FILE_WRITE_CID: + return "cOCTVC1_MAIN_MSG_FILE_WRITE_CID"; + case cOCTVC1_MAIN_MSG_FILE_READ_CID: + return "cOCTVC1_MAIN_MSG_FILE_READ_CID"; + case cOCTVC1_MAIN_MSG_FILE_INFO_CID: + return "cOCTVC1_MAIN_MSG_FILE_INFO_CID"; + case cOCTVC1_MAIN_MSG_FILE_LIST_CID: + return "cOCTVC1_MAIN_MSG_FILE_LIST_CID"; + case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID: + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_CID"; + case cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID: + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_INFO_FILE_CID"; + case cOCTVC1_MAIN_MSG_PROCESS_INFO_CID: + return "cOCTVC1_MAIN_MSG_PROCESS_INFO_CID"; + case cOCTVC1_MAIN_MSG_PROCESS_LIST_CID: + return "cOCTVC1_MAIN_MSG_PROCESS_LIST_CID"; + case cOCTVC1_MAIN_MSG_PROCESS_MONITOR_CPU_USAGE_CID: + return "cOCTVC1_MAIN_MSG_PROCESS_MONITOR_CPU_USAGE_CID"; + case cOCTVC1_MAIN_MSG_PROCESS_STATS_CPU_USAGE_CID: + return "cOCTVC1_MAIN_MSG_PROCESS_STATS_CPU_USAGE_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_LIST_SESSION_CID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_LIST_SESSION_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_CID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_EVT_CID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_EVT_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_HEARTBEAT_CID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_INFO_SESSION_HEARTBEAT_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_STATS_SESSION_HEARTBEAT_CID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_STATS_SESSION_HEARTBEAT_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID: + 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: + return "cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID"; + case cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID: + return "cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID"; + case cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID: + return "cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID"; + case cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID: + return "cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID"; + case cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID: + return "cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID"; + case cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID: + return "cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID"; + case cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID: + return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID"; + case cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID: + return "cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID"; + case cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID: + return "cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID"; + case cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID: + return "cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID"; + case cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID: + return "cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID"; + /* OCTVC1_HW */ + case cOCTVC1_HW_MSG_PCB_INFO_CID: + return "cOCTVC1_HW_MSG_PCB_INFO_CID"; + case cOCTVC1_HW_MSG_CPU_CORE_STATS_CID: + return "cOCTVC1_HW_MSG_CPU_CORE_STATS_CID"; + case cOCTVC1_HW_MSG_CPU_CORE_INFO_CID: + return "cOCTVC1_HW_MSG_CPU_CORE_INFO_CID"; + case cOCTVC1_HW_MSG_CPU_CORE_LIST_CID: + return "cOCTVC1_HW_MSG_CPU_CORE_LIST_CID"; + case cOCTVC1_HW_MSG_ETH_PORT_INFO_CID: + return "cOCTVC1_HW_MSG_ETH_PORT_INFO_CID"; + case cOCTVC1_HW_MSG_ETH_PORT_LIST_CID: + return "cOCTVC1_HW_MSG_ETH_PORT_LIST_CID"; + case cOCTVC1_HW_MSG_ETH_PORT_STATS_CID: + return "cOCTVC1_HW_MSG_ETH_PORT_STATS_CID"; + case cOCTVC1_HW_MSG_ETH_PORT_MODIFY_CID: + return "cOCTVC1_HW_MSG_ETH_PORT_MODIFY_CID"; + case cOCTVC1_HW_MSG_RF_PORT_INFO_CID: + return "cOCTVC1_HW_MSG_RF_PORT_INFO_CID"; + case cOCTVC1_HW_MSG_RF_PORT_STATS_CID: + return "cOCTVC1_HW_MSG_RF_PORT_STATS_CID"; + case cOCTVC1_HW_MSG_RF_PORT_LIST_CID: + return "cOCTVC1_HW_MSG_RF_PORT_LIST_CID"; + case cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID: + return "cOCTVC1_HW_MSG_RF_PORT_LIST_ANTENNA_CID"; + case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID: + return "cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_RX_CONFIG_CID"; + case cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID: + return "cOCTVC1_HW_MSG_RF_PORT_INFO_ANTENNA_TX_CONFIG_CID"; + case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID: + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_CID"; + case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID: + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_CID"; + case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID: + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_INFO_SOURCE_CID"; + case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID: + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_MODIFY_SOURCE_CID"; + case cOCTVC1_HW_MSG_CPU_CORE_EXEC_REPORT_EID: + return "cOCTVC1_HW_MSG_CPU_CORE_EXEC_REPORT_EID"; + case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EID: + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATUS_CHANGE_EID"; + /* OCTVC1_IRSC */ + case cOCTVC1_IRSC_MSG_PROCESS_INFO_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_INFO_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_STATS_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_STATS_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_LIST_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_LIST_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_STATS_IPC_PORT_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_LIST_IPC_PORT_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_STATS_TASK_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID: + return "cOCTVC1_IRSC_MSG_PROCESS_LIST_TASK_CID"; + case cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID: + return "cOCTVC1_IRSC_MSG_OBJMGR_INFO_CID"; + case cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID: + return "cOCTVC1_IRSC_MSG_OBJMGR_STATS_CID"; + case cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID: + return "cOCTVC1_IRSC_MSG_OBJMGR_LIST_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_START_MONITORING_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_STOP_MONITORING_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_COMMAND_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_COMMAND_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_LIST_SESSION_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_INFO_SESSION_EVT_CID"; + case cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID: + return "cOCTVC1_IRSC_MSG_API_SYSTEM_STATS_SESSION_EVT_CID"; + case cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID: + return "cOCTVC1_IRSC_MSG_APPLICATION_LIST_TAP_CID"; + case cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID: + return "cOCTVC1_IRSC_MSG_APPLICATION_INFO_TAP_CID"; + case cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID: + return "cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID"; + case cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID: + return "cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID"; + case cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID: + return "cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID"; + case cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID: + return "cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID"; + /* OCTVC1_GSM */ + case cOCTVC1_GSM_MSG_TRX_OPEN_CID: + return "cOCTVC1_GSM_MSG_TRX_OPEN_CID"; + case cOCTVC1_GSM_MSG_TRX_CLOSE_CID: + return "cOCTVC1_GSM_MSG_TRX_CLOSE_CID"; + case cOCTVC1_GSM_MSG_TRX_STATUS_CID: + return "cOCTVC1_GSM_MSG_TRX_STATUS_CID"; + case cOCTVC1_GSM_MSG_TRX_INFO_CID: + return "cOCTVC1_GSM_MSG_TRX_INFO_CID"; + case cOCTVC1_GSM_MSG_TRX_RESET_CID: + return "cOCTVC1_GSM_MSG_TRX_RESET_CID"; + case cOCTVC1_GSM_MSG_TRX_MODIFY_CID: + return "cOCTVC1_GSM_MSG_TRX_MODIFY_CID"; + case cOCTVC1_GSM_MSG_TRX_LIST_CID: + return "cOCTVC1_GSM_MSG_TRX_LIST_CID"; + case cOCTVC1_GSM_MSG_TRX_CLOSE_ALL_CID: + return "cOCTVC1_GSM_MSG_TRX_CLOSE_ALL_CID"; + case cOCTVC1_GSM_MSG_TRX_START_RECORD_CID: + return "cOCTVC1_GSM_MSG_TRX_START_RECORD_CID"; + case cOCTVC1_GSM_MSG_TRX_STOP_RECORD_CID: + return "cOCTVC1_GSM_MSG_TRX_STOP_RECORD_CID"; + case cOCTVC1_GSM_MSG_TRX_ACTIVATE_LOGICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_ACTIVATE_LOGICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_DEACTIVATE_LOGICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_DEACTIVATE_LOGICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_STATUS_LOGICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_STATUS_LOGICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_INFO_LOGICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_INFO_LOGICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_LIST_LOGICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_LIST_LOGICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID: + return "cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_EMPTY_FRAME_CID"; + case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID: + return "cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CID"; + case cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_ACTIVATE_PHYSICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_DEACTIVATE_PHYSICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_STATUS_PHYSICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_RESET_PHYSICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_RESET_PHYSICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_LIST_PHYSICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_LIST_PHYSICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CID: + return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CID"; + case cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID: + return "cOCTVC1_GSM_MSG_TRX_MODIFY_PHYSICAL_CHANNEL_CIPHERING_CID"; + case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID: + return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_CIPHERING_CID"; + case cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID: + return "cOCTVC1_GSM_MSG_TRX_INFO_PHYSICAL_CHANNEL_MEASUREMENT_CID"; + case cOCTVC1_GSM_MSG_TRX_INFO_RF_CID: + return "cOCTVC1_GSM_MSG_TRX_INFO_RF_CID"; + case cOCTVC1_GSM_MSG_TRX_MODIFY_RF_CID: + return "cOCTVC1_GSM_MSG_TRX_MODIFY_RF_CID"; + case cOCTVC1_GSM_MSG_TAP_FILTER_LIST_CID: + return "cOCTVC1_GSM_MSG_TAP_FILTER_LIST_CID"; + case cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID: + return "cOCTVC1_GSM_MSG_TAP_FILTER_INFO_CID"; + case cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID: + return "cOCTVC1_GSM_MSG_TAP_FILTER_STATS_CID"; + case cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID: + return "cOCTVC1_GSM_MSG_TAP_FILTER_MODIFY_CID"; + case cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID: + return "cOCTVC1_GSM_MSG_TRX_START_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID"; + case cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID: + return "cOCTVC1_GSM_MSG_TRX_STOP_LOGICAL_CHANNEL_RAW_DATA_INDICATIONS_CID"; + case cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID: + return "cOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_CMU_LOOPBACK_TEST_CID"; + case cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID: + return "cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID"; + case cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID: + return "cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID"; + case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_DATA_INDICATION_EID: + return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_DATA_INDICATION_EID"; + case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION_EID: + return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_READY_TO_SEND_INDICATION_EID"; + case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RACH_INDICATION_EID: + return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RACH_INDICATION_EID"; + case cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION_EID: + return "cOCTVC1_GSM_MSG_TRX_LOGICAL_CHANNEL_RAW_DATA_INDICATION_EID"; + + default: + break; + + } + sprintf( g_szUnknownoctvc1_id2string, "0x%.8X", f_ulId ); + return g_szUnknownoctvc1_id2string; +} +#endif + +#endif /* __OCTVC1_ID2STRING__ */ diff --git a/software/include/octvc1/octvc1_id2string_priv.h b/software/include/octvc1/octvc1_id2string_priv.h index 01c969b..4d1b084 100644 --- a/software/include/octvc1/octvc1_id2string_priv.h +++ b/software/include/octvc1/octvc1_id2string_priv.h @@ -1,13 +1,13 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: octvc1_id2string_priv.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - -This file contains the id2string implementation for package OCTVC1 - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: octvc1_id2string_priv.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: + +This file contains the id2string implementation for package OCTVC1 + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -20,87 +20,90 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - - -#ifndef __OCTVC1_ID2STRING_PRIV__ -#define __OCTVC1_ID2STRING_PRIV__ - -#include "../octdev_types.h" -#include "octvc1_id2string.h" -/* ------------------------------------------------------------------------------------- - OCTVC1_ID2STRING_PRIV - -------------------------------------------------------------------------------------*/ -#define mOCTVC1_ID2STRING_PRIV( _f_ulId ) \ - octvc1_id2string_priv( _f_ulId ) - -#ifndef OCTVC1_ID2STRING_PRIV_DECLARE -extern const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId ); -#endif - - -#ifdef OCTVC1_ID2STRING_PRIV_DECLARE -#include -#include "test/octvc1_test_id_priv.h" -#include "hw/octvc1_hw_id_priv.h" - - -/* ------------------------------------------------------------------------------------- - octvc1_id2string_priv - -------------------------------------------------------------------------------------*/ -const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId ) -{ - static char g_szUnknownoctvc1_id2string_priv[32]; - switch( f_ulId ) - { - /* OCTVC1_TEST */ - case cOCTVC1_TEST_MSG_DESCR_LIST_CID: - return "cOCTVC1_TEST_MSG_DESCR_LIST_CID"; - case cOCTVC1_TEST_MSG_DESCR_INFO_CID: - return "cOCTVC1_TEST_MSG_DESCR_INFO_CID"; - case cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID: - return "cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID"; - case cOCTVC1_TEST_MSG_DESCR_STATS_CID: - return "cOCTVC1_TEST_MSG_DESCR_STATS_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID"; - case cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID: - return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID"; - /* OCTVC1_GENERIC */ - case cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID: - return "cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID"; - case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID: - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID"; - case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID: - return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID"; - - } - return octvc1_id2string( f_ulId ); -} -#endif - -#endif /* __OCTVC1_ID2STRING_PRIV__ */ +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + + +#ifndef __OCTVC1_ID2STRING_PRIV__ +#define __OCTVC1_ID2STRING_PRIV__ + +#include "../octdev_types.h" +#include "octvc1_id2string.h" +/* ------------------------------------------------------------------------------------- + OCTVC1_ID2STRING_PRIV + -------------------------------------------------------------------------------------*/ +#define mOCTVC1_ID2STRING_PRIV( _f_ulId ) \ + octvc1_id2string_priv( _f_ulId ) + +#ifndef OCTVC1_ID2STRING_PRIV_DECLARE +extern const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId ); +#endif + + +#ifdef OCTVC1_ID2STRING_PRIV_DECLARE +#include +#include "test/octvc1_test_id_priv.h" +#include "hw/octvc1_hw_id_priv.h" + + +/* ------------------------------------------------------------------------------------- + octvc1_id2string_priv + -------------------------------------------------------------------------------------*/ +const char * octvc1_id2string_priv( tOCT_UINT32 f_ulId ) +{ + static char g_szUnknownoctvc1_id2string_priv[32]; + switch( f_ulId ) + { + /* OCTVC1_TEST */ + case cOCTVC1_TEST_MSG_DESCR_LIST_CID: + return "cOCTVC1_TEST_MSG_DESCR_LIST_CID"; + case cOCTVC1_TEST_MSG_DESCR_INFO_CID: + return "cOCTVC1_TEST_MSG_DESCR_INFO_CID"; + case cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID: + return "cOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CID"; + case cOCTVC1_TEST_MSG_DESCR_STATS_CID: + return "cOCTVC1_TEST_MSG_DESCR_STATS_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID"; + case cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID: + return "cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID"; + /* OCTVC1_GENERIC */ + case cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID: + return "cOCTVC1_HW_MSG_ETH_PORT_RESTRICTED_UNBLOCK_CID"; + case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID: + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_START_SYNCHRO_CID"; + case cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID: + return "cOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STOP_SYNCHRO_CID"; + + default: + break; + + } + return octvc1_id2string( f_ulId ); +} +#endif + +#endif /* __OCTVC1_ID2STRING_PRIV__ */ diff --git a/software/include/octvc1/octvc1_ip.h b/software/include/octvc1/octvc1_ip.h index b350c97..fc35db7 100644 --- a/software/include/octvc1/octvc1_ip.h +++ b/software/include/octvc1/octvc1_ip.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_IP.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_IP.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,46 +18,46 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_IP_H__ -#define __OCTVC1_IP_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - tOCTVC1_IP_VERSION_ENUM : IP versions --------------------------------------------------------------------------------------*/ -#define tOCTVC1_IP_VERSION_ENUM tOCTDEV_IP_VERSION_ENUM - -#define cOCTVC1_IP_VERSION_ENUM_4 cOCTDEV_IP_VERSION_ENUM_4 -#define cOCTVC1_IP_VERSION_ENUM_6 cOCTDEV_IP_VERSION_ENUM_6 -#define cOCTVC1_IP_VERSION_ENUM_INVALID cOCTDEV_IP_VERSION_ENUM_INVALID - -/*------------------------------------------------------------------------------------- - tOCTVC1_IP_ADDRESS : IP address structure --------------------------------------------------------------------------------------*/ -#define tOCTVC1_IP_ADDRESS tOCTDEV_IP_ADDRESS - - - -/*-------------------------------------------------------------------------- - SWAP directive (for compatibility reason) -----------------------------------------------------------------------------*/ -#define mOCTVC1_IP_ADDRESS_SWAP mOCTDEV_IP_ADDRESS_SWAP - - - -#endif /* __OCTVC1_IP_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_IP_H__ +#define __OCTVC1_IP_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + tOCTVC1_IP_VERSION_ENUM : IP versions +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_IP_VERSION_ENUM tOCTDEV_IP_VERSION_ENUM + +#define cOCTVC1_IP_VERSION_ENUM_4 cOCTDEV_IP_VERSION_ENUM_4 +#define cOCTVC1_IP_VERSION_ENUM_6 cOCTDEV_IP_VERSION_ENUM_6 +#define cOCTVC1_IP_VERSION_ENUM_INVALID cOCTDEV_IP_VERSION_ENUM_INVALID + +/*------------------------------------------------------------------------------------- + tOCTVC1_IP_ADDRESS : IP address structure +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_IP_ADDRESS tOCTDEV_IP_ADDRESS + + + +/*-------------------------------------------------------------------------- + SWAP directive (for compatibility reason) +----------------------------------------------------------------------------*/ +#define mOCTVC1_IP_ADDRESS_SWAP mOCTDEV_IP_ADDRESS_SWAP + + + +#endif /* __OCTVC1_IP_H__ */ + diff --git a/software/include/octvc1/octvc1_ip_swap.h b/software/include/octvc1/octvc1_ip_swap.h index ee87f63..7f7fcf5 100644 --- a/software/include/octvc1/octvc1_ip_swap.h +++ b/software/include/octvc1/octvc1_ip_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_IP_SWAP_H__ diff --git a/software/include/octvc1/octvc1_licensing_rc.h b/software/include/octvc1/octvc1_licensing_rc.h index d0c1a8c..dd295d1 100644 --- a/software/include/octvc1/octvc1_licensing_rc.h +++ b/software/include/octvc1/octvc1_licensing_rc.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_LICENSING_RC.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the return codes for the LICENSING API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_LICENSING_RC.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the return codes for the LICENSING API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,26 +18,26 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef OCTVC1_LICENSING_RC_H__ -#define OCTVC1_LICENSING_RC_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_base.h" - -/**************************************************************************** - LICENSING return codes - ****************************************************************************/ -#define cOCTVC1_LICENSING_RC_DENIED ( 0x0001 + cOCTVC1_LICENSING_RC_BASE ) -#define cOCTVC1_LICENSING_RC_INVALID_LICENSE ( 0x0002 + cOCTVC1_LICENSING_RC_BASE ) - -#endif /* OCTVC1_LICENSING_RC_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef OCTVC1_LICENSING_RC_H__ +#define OCTVC1_LICENSING_RC_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "octvc1_base.h" + +/**************************************************************************** + LICENSING return codes + ****************************************************************************/ +#define cOCTVC1_LICENSING_RC_DENIED ( 0x0001 + cOCTVC1_LICENSING_RC_BASE ) +#define cOCTVC1_LICENSING_RC_INVALID_LICENSE ( 0x0002 + cOCTVC1_LICENSING_RC_BASE ) + +#endif /* OCTVC1_LICENSING_RC_H__ */ + diff --git a/software/include/octvc1/octvc1_list.h b/software/include/octvc1/octvc1_list.h index c616f4f..7fa2f53 100644 --- a/software/include/octvc1/octvc1_list.h +++ b/software/include/octvc1/octvc1_list.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_LIST.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_LIST.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,183 +18,144 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_LIST_H__ -#define __OCTVC1_LIST_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" -#include "octvc1_base.h" -#include "octvc1_cursor.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - tOCTVC1_LIST_HANDLE_GET - Handle list List structure, - Used when the objects to list are identified by a tOCTVC1_HANDLE. - - Members: - ulNumHandle - Number of valid handles in aHandle - aHandle - Array containing the listed handles --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT32 ulNumHandle; - tOCTVC1_HANDLE aHandle[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; - -} tOCTVC1_LIST_HANDLE_GET; - -/*------------------------------------------------------------------------------------- - tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID - Handle list List structure, - Used when the objects to list are identified by a tOCTVC1_SUB_OBJECT_ID. - - Members: - hParent - Handle of the parent of the sub-object IDs - ulNumSubObjectId - Number of valid entries in aSubObjectId - aSubObjectId - Array containing the listed sub object IDs --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_HANDLE hParent; - tOCT_UINT32 ulNumSubObjectId; - tOCTVC1_SUB_OBJECT_ID aSubObjectId[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; - -} tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID; - -/*------------------------------------------------------------------------------------- - tOCTVC1_LIST_HANDLE_OBJECT_GET - Handle Object list List structure, - Used when the objects to list are identified by a tOCTVC1_HANDLE_OBJECT. - - Members: - ulNumHandleObject - Number of valid handle objects in aHandleObject - aHandleObject - Array containing the listed handles --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT32 ulNumHandleObject; - tOCTVC1_HANDLE_OBJECT aHandleObject[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; - -} tOCTVC1_LIST_HANDLE_OBJECT_GET; - -/*------------------------------------------------------------------------------------- - tOCTVC1_LIST_NAME_OBJECT32_GET - Handle Object name List structure, - Used when the objects to list are identified by a tOCT_UINT32 and displayed by - name. - - Members: - ulNumObject - Number of valid objects in aNamedObject - aNameObject32 - Array containing the listed handles and named --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT32 ulNumObject; - tOCTVC1_OBJECT32_NAME aNameObject32[cOCTVC1_HANDLE_OBJECT32_NAME_LIST_MAX_ENTRY]; - -} tOCTVC1_LIST_NAME_OBJECT32_GET; - -/*------------------------------------------------------------------------------------- - tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME - Handle Object list List structure, - Used when the objects to list are identified by a tOCTVC1_SUB_OBJECT_ID. - - Members: - hParent - Handle object of the parent - ulNumObject - Number of valid sub object IDs in aSubObjectId - aNameObject32 - Array containing the listed handles --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_HANDLE_OBJECT hParent; - tOCT_UINT32 ulNumObject; - tOCTVC1_OBJECT32_NAME aNameObject32[cOCTVC1_HANDLE_OBJECT32_NAME_LIST_MAX_ENTRY]; - -} tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME; - -/*------------------------------------------------------------------------------------- - tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID - Handle Object list List structure, - Used when the objects to list are identified by a tOCTVC1_SUB_OBJECT_ID. - - Members: - hParent - Handle object of the parent - ulNumSubObjectId - Number of valid sub object IDs in aSubObjectId - aSubObjectId - Array containing the listed handles --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_HANDLE_OBJECT hParent; - tOCT_UINT32 ulNumSubObjectId; - tOCTVC1_SUB_OBJECT_ID aSubObjectId[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; - -} tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID; - -/*------------------------------------------------------------------------------------- - tOCTVC1_LIST_INDEX_GET - Object Index List structure, - Used when the objects to list are identified by a tOCTVC1_INDEX. - - Members: - ulNumIndex - Number of valid index in aIndex - aIndex - Array containing the listed of indexes --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCT_UINT32 ulNumIndex; - tOCTVC1_INDEX aIndex[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; - -} tOCTVC1_LIST_INDEX_GET; - -/*------------------------------------------------------------------------------------- - tOCTVC1_LIST_INDEX_GET_SUB_INDEX - Object Index List structure, - Used when the objects to list are identified by a tOCTVC1_INDEX. - - Members: - ulParentIndex - Index of the parent of the sub-index - ulNumIndex - Number of valid index in aIndex - aIndex - Array containing the listed of indexes --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_INDEX ulParentIndex; - tOCT_UINT32 ulNumIndex; - tOCTVC1_INDEX aIndex[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; - -} tOCTVC1_LIST_INDEX_GET_SUB_INDEX; - - -#endif /* __OCTVC1_LIST_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_LIST_H__ +#define __OCTVC1_LIST_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" +#include "octvc1_base.h" +#include "octvc1_cursor.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + tOCTVC1_LIST_HANDLE_OBJECT_GET + Handle Object list List structure, + Used when the objects to list are identified by a tOCTVC1_HANDLE_OBJECT. + + Members: + ulNumHandleObject + Number of valid handle objects in aHandleObject + aHandleObject + Array containing the listed handles +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulNumHandleObject; + tOCTVC1_HANDLE_OBJECT aHandleObject[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; + +} tOCTVC1_LIST_HANDLE_OBJECT_GET; + +/*------------------------------------------------------------------------------------- + tOCTVC1_LIST_NAME_OBJECT32_GET + Handle Object name List structure, + Used when the objects to list are identified by a tOCT_UINT32 and displayed by + name. + + Members: + ulNumObject + Number of valid objects in aNamedObject + aNameObject32 + Array containing the listed handles and named +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulNumObject; + tOCTVC1_OBJECT32_NAME aNameObject32[cOCTVC1_HANDLE_OBJECT32_NAME_LIST_MAX_ENTRY]; + +} tOCTVC1_LIST_NAME_OBJECT32_GET; + +/*------------------------------------------------------------------------------------- + tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME + Handle Object list List structure, + Used when the objects to list are identified by a tOCTVC1_SUB_OBJECT_ID. + + Members: + hParent + Handle object of the parent + ulNumObject + Number of valid sub object IDs in aSubObjectId + aNameObject32 + Array containing the listed handles +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_HANDLE_OBJECT hParent; + tOCT_UINT32 ulNumObject; + tOCTVC1_OBJECT32_NAME aNameObject32[cOCTVC1_HANDLE_OBJECT32_NAME_LIST_MAX_ENTRY]; + +} tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID_NAME; + +/*------------------------------------------------------------------------------------- + tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID + Handle Object list List structure, + Used when the objects to list are identified by a tOCTVC1_SUB_OBJECT_ID. + + Members: + hParent + Handle object of the parent + ulNumSubObjectId + Number of valid sub object IDs in aSubObjectId + aSubObjectId + Array containing the listed handles +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_HANDLE_OBJECT hParent; + tOCT_UINT32 ulNumSubObjectId; + tOCTVC1_SUB_OBJECT_ID aSubObjectId[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; + +} tOCTVC1_LIST_HANDLE_OBJECT_GET_SUB_OBJECT_ID; + +/*------------------------------------------------------------------------------------- + tOCTVC1_LIST_INDEX_GET + Object Index List structure, + Used when the objects to list are identified by a tOCTVC1_INDEX. + + Members: + ulNumIndex + Number of valid index in aIndex + aIndex + Array containing the listed of indexes +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCT_UINT32 ulNumIndex; + tOCTVC1_INDEX aIndex[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; + +} tOCTVC1_LIST_INDEX_GET; + +/*------------------------------------------------------------------------------------- + tOCTVC1_LIST_INDEX_GET_SUB_INDEX + Object Index List structure, + Used when the objects to list are identified by a tOCTVC1_INDEX. + + Members: + ulParentIndex + Index of the parent of the sub-index + ulNumIndex + Number of valid index in aIndex + aIndex + Array containing the listed of indexes +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_INDEX ulParentIndex; + tOCT_UINT32 ulNumIndex; + tOCTVC1_INDEX aIndex[cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY]; + +} tOCTVC1_LIST_INDEX_GET_SUB_INDEX; + + +#endif /* __OCTVC1_LIST_H__ */ + diff --git a/software/include/octvc1/octvc1_list_swap.h b/software/include/octvc1/octvc1_list_swap.h index 6396421..98e41a3 100644 --- a/software/include/octvc1/octvc1_list_swap.h +++ b/software/include/octvc1/octvc1_list_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_LIST_SWAP_H__ @@ -37,34 +37,6 @@ extern "C" { /********************************* MACROS **********************************/ -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_LIST_HANDLE_GET_SWAP( _f_pParms ){ tOCTVC1_LIST_HANDLE_GET * pOCTVC1_LIST_HANDLE_GET = (_f_pParms); SWAP_UNUSED(pOCTVC1_LIST_HANDLE_GET)\ - ((tOCTVC1_LIST_HANDLE_GET *)pOCTVC1_LIST_HANDLE_GET)->ulNumHandle = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_LIST_HANDLE_GET *)pOCTVC1_LIST_HANDLE_GET)->ulNumHandle); \ - { tOCT_UINT32 jOCTVC1_LIST_HANDLE_GET; \ - for( jOCTVC1_LIST_HANDLE_GET=0; \ - jOCTVC1_LIST_HANDLE_GET<(cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY);jOCTVC1_LIST_HANDLE_GET++ ) \ - { mOCTVC1_HANDLE_SWAP( &((tOCTVC1_LIST_HANDLE_GET *)pOCTVC1_LIST_HANDLE_GET)->aHandle[jOCTVC1_LIST_HANDLE_GET] ); }} \ -} -#else -#define mOCTVC1_LIST_HANDLE_GET_SWAP( pOCTVC1_LIST_HANDLE_GET ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID_SWAP( _f_pParms ){ tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID * pOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID = (_f_pParms); SWAP_UNUSED(pOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID)\ - { mOCTVC1_HANDLE_SWAP( &((tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID)->hParent ); } \ - ((tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID)->ulNumSubObjectId = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID)->ulNumSubObjectId); \ - { tOCT_UINT32 iOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID; \ - for( iOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID=0; \ - iOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID<(cOCTVC1_HANDLE_OBJECT_LIST_MAX_ENTRY);iOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID++ ) \ - ((tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID)->aSubObjectId[iOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID] = \ - mOCT_SWAP32_IF_LE(((tOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID *)pOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID)->aSubObjectId[iOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID]);}\ -} -#else -#define mOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID_SWAP( pOCTVC1_LIST_HANDLE_GET_SUB_OBJECT_ID ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVC1_LIST_HANDLE_OBJECT_GET_SWAP( _f_pParms ){ tOCTVC1_LIST_HANDLE_OBJECT_GET * pOCTVC1_LIST_HANDLE_OBJECT_GET = (_f_pParms); SWAP_UNUSED(pOCTVC1_LIST_HANDLE_OBJECT_GET)\ ((tOCTVC1_LIST_HANDLE_OBJECT_GET *)pOCTVC1_LIST_HANDLE_OBJECT_GET)->ulNumHandleObject = \ diff --git a/software/include/octvc1/octvc1_log.h b/software/include/octvc1/octvc1_log.h index b42deee..ad5122f 100644 --- a/software/include/octvc1/octvc1_log.h +++ b/software/include/octvc1/octvc1_log.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_LOG.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_LOG.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,138 +18,138 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_LOG_H__ -#define __OCTVC1_LOG_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Log and trace --------------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------------- - tOCTVC1_LOG_TYPE_ENUM : --------------------------------------------------------------------------------------*/ -#define tOCTVC1_LOG_TYPE_ENUM tOCT_UINT32 - -#define cOCTVC1_LOG_TYPE_ENUM_LOG 0 -#define cOCTVC1_LOG_TYPE_ENUM_TRACE 1 - -/*------------------------------------------------------------------------------------- - tOCTVC1_LOG_LEVEL_ENUM : --------------------------------------------------------------------------------------*/ -#define tOCTVC1_LOG_LEVEL_ENUM tOCT_UINT32 - -#define cOCTVC1_LOG_LEVEL_ENUM_EMERGENCY 0 -#define cOCTVC1_LOG_LEVEL_ENUM_ALERT 1 -#define cOCTVC1_LOG_LEVEL_ENUM_CRITICAL 2 -#define cOCTVC1_LOG_LEVEL_ENUM_ERROR 3 -#define cOCTVC1_LOG_LEVEL_ENUM_WARNING 4 -#define cOCTVC1_LOG_LEVEL_ENUM_NOTICE 5 - -/*------------------------------------------------------------------------------------- - tOCTVC1_LOG_PAYLOAD_TYPE_ENUM : --------------------------------------------------------------------------------------*/ -#define tOCTVC1_LOG_PAYLOAD_TYPE_ENUM tOCT_UINT32 - -#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_DATA 0 -#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_STRING 1 -#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_RC 2 - -/*------------------------------------------------------------------------------------- - tOCTVC1_LOG_TRACE_MASK : --------------------------------------------------------------------------------------*/ -#define tOCTVC1_LOG_TRACE_MASK tOCT_UINT32 - -#define cOCTVC1_LOG_TRACE_MASK_SYSTEM 0x01 -#define cOCTVC1_LOG_TRACE_MASK_IPC_MESSAGE 0x02 -#define cOCTVC1_LOG_TRACE_MASK_USER_0 0x04 -#define cOCTVC1_LOG_TRACE_MASK_USER_1 0x08 -#define cOCTVC1_LOG_TRACE_MASK_USER_2 0x10 -#define cOCTVC1_LOG_TRACE_MASK_USER_3 0x20 -#define cOCTVC1_LOG_TRACE_MASK_USER_4 0x40 -#define cOCTVC1_LOG_TRACE_MASK_USER_5 0x80 -#define cOCTVC1_LOG_TRACE_MASK_NONE 0x00 -#define cOCTVC1_LOG_TRACE_MASK_ALL 0xFFFFFFFF - -/*------------------------------------------------------------------------------------- - tOCTVC1_LOG_ID : --------------------------------------------------------------------------------------*/ -#define tOCTVC1_LOG_ID tOCT_UINT32 - - -/*------------------------------------------------------------------------------------- - Log Header Type --------------------------------------------------------------------------------------*/ -#define cOCTVC1_LOG_TYPE_BIT_OFFSET 28 -#define cOCTVC1_LOG_TYPE_BIT_MASK 0xF0000000 - -/*------------------------------------------------------------------------------------- - Log Header Fragment Extra Entry. --------------------------------------------------------------------------------------*/ -#define cOCTVC1_LOG_FRAGMENT_BIT_OFFSET 27 -#define cOCTVC1_LOG_FRAGMENT_BIT_MASK 0x08000000 - -/*------------------------------------------------------------------------------------- - Log Header string data --------------------------------------------------------------------------------------*/ -#define cOCTVC1_LOG_PAYLOAD_TYPE_BIT_OFFSET 25 -#define cOCTVC1_LOG_PAYLOAD_TYPE_BIT_MASK 0x06000000 - -/*------------------------------------------------------------------------------------- - Log Header info - If TYPE_LOG info value map to tOCTVC1_LOG_LEVEL_ENUM - If TYPE_TRACE info value map to tOCTVC1_LOG_TRACE_MASK --------------------------------------------------------------------------------------*/ -#define cOCTVC1_LOG_INFO_BIT_OFFSET 16 -#define cOCTVC1_LOG_INFO_BIT_MASK 0x00FF0000 - -/*------------------------------------------------------------------------------------- - Log Header payload length --------------------------------------------------------------------------------------*/ -#define cOCTVC1_LOG_PAYLOAD_LENGTH_BIT_OFFSET 0 -#define cOCTVC1_LOG_PAYLOAD_LENGTH_BIT_MASK 0x0000FFFF -/*------------------------------------------------------------------------------------- - tOCTVC1_LOG_HEADER - Log and trace Header - - Members: - ulId - ulTime - Time of log, base on system time - hProcess - Process handle - ul_Type_Info_Length - bits[31:28] = Log TYPE tOCTVC1_LOG_TYPE_ENUM. - bits[27] = Fragment Extra Entry will follow. - bits[26:25] = Payload TYPE tOCTVC1_LOG_PAYLOAD_TYPE_ENUM. - bits[24] = Reserved. - bits[23:16] = Type Info base of Log Type see tOCTVC1_LOG_TYPE_ENUM - If TYPE_LOG base tOCTVC1_LOG_LEVEL_ENUM - If TYPE_TRACE base tOCTVC1_LOG_TRACE_MASK - bits[15:0] = Log or Trace payload length (in bytes). --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_LOG_ID ulId; - tOCT_UINT32 ulTime; - tOCT_UINT32 hProcess; - tOCT_UINT32 ul_Type_Info_Length; - -} tOCTVC1_LOG_HEADER; - - -#endif /* __OCTVC1_LOG_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_LOG_H__ +#define __OCTVC1_LOG_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Log and trace +-------------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------------- + tOCTVC1_LOG_TYPE_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_LOG_TYPE_ENUM tOCT_UINT32 + +#define cOCTVC1_LOG_TYPE_ENUM_LOG 0 +#define cOCTVC1_LOG_TYPE_ENUM_TRACE 1 + +/*------------------------------------------------------------------------------------- + tOCTVC1_LOG_LEVEL_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_LOG_LEVEL_ENUM tOCT_UINT32 + +#define cOCTVC1_LOG_LEVEL_ENUM_EMERGENCY 0 +#define cOCTVC1_LOG_LEVEL_ENUM_ALERT 1 +#define cOCTVC1_LOG_LEVEL_ENUM_CRITICAL 2 +#define cOCTVC1_LOG_LEVEL_ENUM_ERROR 3 +#define cOCTVC1_LOG_LEVEL_ENUM_WARNING 4 +#define cOCTVC1_LOG_LEVEL_ENUM_NOTICE 5 + +/*------------------------------------------------------------------------------------- + tOCTVC1_LOG_PAYLOAD_TYPE_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_LOG_PAYLOAD_TYPE_ENUM tOCT_UINT32 + +#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_DATA 0 +#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_STRING 1 +#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_RC 2 + +/*------------------------------------------------------------------------------------- + tOCTVC1_LOG_TRACE_MASK : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_LOG_TRACE_MASK tOCT_UINT32 + +#define cOCTVC1_LOG_TRACE_MASK_SYSTEM 0x01 +#define cOCTVC1_LOG_TRACE_MASK_IPC_MESSAGE 0x02 +#define cOCTVC1_LOG_TRACE_MASK_USER_0 0x04 +#define cOCTVC1_LOG_TRACE_MASK_USER_1 0x08 +#define cOCTVC1_LOG_TRACE_MASK_USER_2 0x10 +#define cOCTVC1_LOG_TRACE_MASK_USER_3 0x20 +#define cOCTVC1_LOG_TRACE_MASK_USER_4 0x40 +#define cOCTVC1_LOG_TRACE_MASK_USER_5 0x80 +#define cOCTVC1_LOG_TRACE_MASK_NONE 0x00 +#define cOCTVC1_LOG_TRACE_MASK_ALL 0xFFFFFFFF + +/*------------------------------------------------------------------------------------- + tOCTVC1_LOG_ID : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_LOG_ID tOCT_UINT32 + + +/*------------------------------------------------------------------------------------- + Log Header Type +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_LOG_TYPE_BIT_OFFSET 28 +#define cOCTVC1_LOG_TYPE_BIT_MASK 0xF0000000 + +/*------------------------------------------------------------------------------------- + Log Header Fragment Extra Entry. +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_LOG_FRAGMENT_BIT_OFFSET 27 +#define cOCTVC1_LOG_FRAGMENT_BIT_MASK 0x08000000 + +/*------------------------------------------------------------------------------------- + Log Header string data +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_LOG_PAYLOAD_TYPE_BIT_OFFSET 25 +#define cOCTVC1_LOG_PAYLOAD_TYPE_BIT_MASK 0x06000000 + +/*------------------------------------------------------------------------------------- + Log Header info + If TYPE_LOG info value map to tOCTVC1_LOG_LEVEL_ENUM + If TYPE_TRACE info value map to tOCTVC1_LOG_TRACE_MASK +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_LOG_INFO_BIT_OFFSET 16 +#define cOCTVC1_LOG_INFO_BIT_MASK 0x00FF0000 + +/*------------------------------------------------------------------------------------- + Log Header payload length +-------------------------------------------------------------------------------------*/ +#define cOCTVC1_LOG_PAYLOAD_LENGTH_BIT_OFFSET 0 +#define cOCTVC1_LOG_PAYLOAD_LENGTH_BIT_MASK 0x0000FFFF +/*------------------------------------------------------------------------------------- + tOCTVC1_LOG_HEADER + Log and trace Header + + Members: + ulId + ulTime + Time of log, base on system time + hProcess + Process handle + ul_Type_Info_Length + bits[31:28] = Log TYPE tOCTVC1_LOG_TYPE_ENUM. + bits[27] = Fragment Extra Entry will follow. + bits[26:25] = Payload TYPE tOCTVC1_LOG_PAYLOAD_TYPE_ENUM. + bits[24] = Reserved. + bits[23:16] = Type Info base of Log Type see tOCTVC1_LOG_TYPE_ENUM + If TYPE_LOG base tOCTVC1_LOG_LEVEL_ENUM + If TYPE_TRACE base tOCTVC1_LOG_TRACE_MASK + bits[15:0] = Log or Trace payload length (in bytes). +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_LOG_ID ulId; + tOCT_UINT32 ulTime; + tOCT_UINT32 hProcess; + tOCT_UINT32 ul_Type_Info_Length; + +} tOCTVC1_LOG_HEADER; + + +#endif /* __OCTVC1_LOG_H__ */ + diff --git a/software/include/octvc1/octvc1_log_swap.h b/software/include/octvc1/octvc1_log_swap.h index 80a2bb5..76d69ed 100644 --- a/software/include/octvc1/octvc1_log_swap.h +++ b/software/include/octvc1/octvc1_log_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_LOG_SWAP_H__ diff --git a/software/include/octvc1/octvc1_mac.h b/software/include/octvc1/octvc1_mac.h index b66cc0d..5b80b4c 100644 --- a/software/include/octvc1/octvc1_mac.h +++ b/software/include/octvc1/octvc1_mac.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_MAC.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_MAC.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,37 +18,37 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_MAC_H__ -#define __OCTVC1_MAC_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - tOCTVC1_MAC_ADDRESS : MAC address structure --------------------------------------------------------------------------------------*/ -#define tOCTVC1_MAC_ADDRESS tOCTDEV_MAC_ADDRESS - - - -/*-------------------------------------------------------------------------- - SWAP directive (for compatibility reason) -----------------------------------------------------------------------------*/ -#define mOCTVC1_MAC_ADDRESS_SWAP mOCTDEV_MAC_ADDRESS_SWAP - - - -#endif /* __OCTVC1_MAC_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_MAC_H__ +#define __OCTVC1_MAC_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + tOCTVC1_MAC_ADDRESS : MAC address structure +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_MAC_ADDRESS tOCTDEV_MAC_ADDRESS + + + +/*-------------------------------------------------------------------------- + SWAP directive (for compatibility reason) +----------------------------------------------------------------------------*/ +#define mOCTVC1_MAC_ADDRESS_SWAP mOCTDEV_MAC_ADDRESS_SWAP + + + +#endif /* __OCTVC1_MAC_H__ */ + diff --git a/software/include/octvc1/octvc1_macro.h b/software/include/octvc1/octvc1_macro.h index e1bc559..b77a2ff 100644 --- a/software/include/octvc1/octvc1_macro.h +++ b/software/include/octvc1/octvc1_macro.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_MACRO.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_MACRO.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,65 +18,65 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_MACRO_H__ -#define __OCTVC1_MACRO_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" -#include "../octdev_macro.h" -#include "octvc1_handle.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Generic swap macros --------------------------------------------------------------------------------------*/ - - -/*-------------------------------------------------------------------------- - 32-bit Endian Swapping when target is Little Endian -----------------------------------------------------------------------------*/ -#if !defined( mOCTVC1_SWAP32_IF_LE ) -#define mOCTVC1_SWAP32_IF_LE( f_ulValue ) mOCT_SWAP32_IF_LE( f_ulValue ) -#endif /* mOCTVC1_SWAP32_IF_LE */ - -/*-------------------------------------------------------------------------- - 16-bit Endian Swapping when target is Little Endian -----------------------------------------------------------------------------*/ -#if !defined( mOCTVC1_SWAP16_IF_LE ) -#define mOCTVC1_SWAP16_IF_LE( f_usValue ) mOCT_SWAP16_IF_LE( f_usValue ) -#endif /* mOCTVC1_SWAP16_IF_LE */ - -/*-------------------------------------------------------------------------- - Create a TSST Identifier -----------------------------------------------------------------------------*/ - -#define mOCTVC1_MAKE_TSST_ID( f_ulStream, f_ulTimeslot ) \ - ( ( ((f_ulStream) & 0x1f) << 10 ) + \ - ((f_ulTimeslot) & 0x3ff) ) - -/*-------------------------------------------------------------------------- - Get Vocoder Mask from a Vocoder Type Value -----------------------------------------------------------------------------*/ -/* what 32-bit DWORD index the bit mask corresponds to */ -#define mOCTVC1_GET_VOCMASK_INDEX( f_ulEncoderType ) \ - ( (((f_ulEncoderType) >> 5) & 0x3) ) - -/* The actual bit mask for the 32-bit index */ -#define mOCTVC1_GET_VOCMASK_BIT( f_ulEncoderType ) \ - ( (1 << ((f_ulEncoderType) & 0x1F)) ) - - - -#endif /* __OCTVC1_MACRO_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_MACRO_H__ +#define __OCTVC1_MACRO_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" +#include "../octdev_macro.h" +#include "octvc1_handle.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Generic swap macros +-------------------------------------------------------------------------------------*/ + + +/*-------------------------------------------------------------------------- + 32-bit Endian Swapping when target is Little Endian +----------------------------------------------------------------------------*/ +#if !defined( mOCTVC1_SWAP32_IF_LE ) +#define mOCTVC1_SWAP32_IF_LE( f_ulValue ) mOCT_SWAP32_IF_LE( f_ulValue ) +#endif /* mOCTVC1_SWAP32_IF_LE */ + +/*-------------------------------------------------------------------------- + 16-bit Endian Swapping when target is Little Endian +----------------------------------------------------------------------------*/ +#if !defined( mOCTVC1_SWAP16_IF_LE ) +#define mOCTVC1_SWAP16_IF_LE( f_usValue ) mOCT_SWAP16_IF_LE( f_usValue ) +#endif /* mOCTVC1_SWAP16_IF_LE */ + +/*-------------------------------------------------------------------------- + Create a TSST Identifier +----------------------------------------------------------------------------*/ + +#define mOCTVC1_MAKE_TSST_ID( f_ulStream, f_ulTimeslot ) \ + ( ( ((f_ulStream) & 0x1f) << 10 ) + \ + ((f_ulTimeslot) & 0x3ff) ) + +/*-------------------------------------------------------------------------- + Get Vocoder Mask from a Vocoder Type Value +----------------------------------------------------------------------------*/ +/* what 32-bit DWORD index the bit mask corresponds to */ +#define mOCTVC1_GET_VOCMASK_INDEX( f_ulEncoderType ) \ + ( (((f_ulEncoderType) >> 5) & 0x3) ) + +/* The actual bit mask for the 32-bit index */ +#define mOCTVC1_GET_VOCMASK_BIT( f_ulEncoderType ) \ + ( (1 << ((f_ulEncoderType) & 0x1F)) ) + + + +#endif /* __OCTVC1_MACRO_H__ */ + diff --git a/software/include/octvc1/octvc1_module.h b/software/include/octvc1/octvc1_module.h index f331446..850ebf2 100644 --- a/software/include/octvc1/octvc1_module.h +++ b/software/include/octvc1/octvc1_module.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_MODULE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_MODULE.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,47 +18,65 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_MODULE_H__ -#define __OCTVC1_MODULE_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" -#include "octvc1_base.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Module ID identifiers --------------------------------------------------------------------------------------*/ -/*------------------------------------------------------------------------------------- - tOCTVC1_MODULE_ID_ENUM : --------------------------------------------------------------------------------------*/ -#define tOCTVC1_MODULE_ID_ENUM tOCT_UINT8 - -#define cOCTVC1_MODULE_ID_ENUM_GENERIC 0x00 -#define cOCTVC1_MODULE_ID_ENUM_MAIN 0x01 -#define cOCTVC1_MODULE_ID_ENUM_PKT_API 0x02 -#define cOCTVC1_MODULE_ID_ENUM_CTRL 0x03 -#define cOCTVC1_MODULE_ID_ENUM_LICENSING 0x04 -#define cOCTVC1_MODULE_ID_ENUM_TEST 0x05 -#define cOCTVC1_MODULE_ID_ENUM_HW 0x06 -#define cOCTVC1_MODULE_ID_ENUM_IRSC 0x07 -#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 - - -#endif /* __OCTVC1_MODULE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_MODULE_H__ +#define __OCTVC1_MODULE_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" +#include "octvc1_base.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Module ID identifiers +-------------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------------- + tOCTVC1_MODULE_ID_ENUM : +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_MODULE_ID_ENUM tOCT_UINT32 + +#define cOCTVC1_MODULE_ID_ENUM_GENERIC 0x00 +#define cOCTVC1_MODULE_ID_ENUM_MAIN 0x01 +#define cOCTVC1_MODULE_ID_ENUM_PKT_API 0x02 +#define cOCTVC1_MODULE_ID_ENUM_CTRL 0x03 +#define cOCTVC1_MODULE_ID_ENUM_LICENSING 0x04 +#define cOCTVC1_MODULE_ID_ENUM_TEST 0x05 +#define cOCTVC1_MODULE_ID_ENUM_HW 0x06 +#define cOCTVC1_MODULE_ID_ENUM_IRSC 0x07 +#define cOCTVC1_MODULE_ID_ENUM_OBM 0x08 +#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 + +/*------------------------------------------------------------------------------------- + tOCTVC1_MODULE_DATA + Format Module Data + + Members: + ulModuleId + Module Id. + ulModuleDataId + Module Data Id. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MODULE_ID_ENUM ulModuleId; + tOCT_UINT32 ulModuleDataId; + +} tOCTVC1_MODULE_DATA; + + +#endif /* __OCTVC1_MODULE_H__ */ + diff --git a/software/include/octvc1/octvc1_module_swap.h b/software/include/octvc1/octvc1_module_swap.h index 0a37505..dad11c1 100644 --- a/software/include/octvc1/octvc1_module_swap.h +++ b/software/include/octvc1/octvc1_module_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_MODULE_SWAP_H__ @@ -37,8 +37,24 @@ extern "C" { /********************************* MACROS **********************************/ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVC1_MODULE_ID_ENUM_SWAP( pType ){ \ + *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); } +#else -#define mOCTVC1_MODULE_ID_ENUM_SWAP( pType ) /* tOCT_UINT8 */ +#define mOCTVC1_MODULE_ID_ENUM_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); \ +} +#else +#define mOCTVC1_MODULE_DATA_SWAP( pOCTVC1_MODULE_DATA ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ #ifdef __cplusplus } diff --git a/software/include/octvc1/octvc1_msg.h b/software/include/octvc1/octvc1_msg.h index 041de6b..a863fd5 100644 --- a/software/include/octvc1/octvc1_msg.h +++ b/software/include/octvc1/octvc1_msg.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_MSG.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_MSG.h + +Copyright (c) 2015 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 General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,143 +18,143 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_MSG_H__ -#define __OCTVC1_MSG_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octdev_types.h" -#include "octvocnet_pkt.h" - - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Message Types --------------------------------------------------------------------------------------*/ -#define cOCTVC1_MSG_TYPE_COMMAND 0 -#define cOCTVC1_MSG_TYPE_RESPONSE 1 -#define cOCTVC1_MSG_TYPE_NOTIFICATION 2 -#define cOCTVC1_MSG_TYPE_SUPERVISORY 7 -#define cOCTVC1_MSG_TYPE_BIT_OFFSET 29 -#define cOCTVC1_MSG_TYPE_BIT_MASK 0x7 - -/*------------------------------------------------------------------------------------- - Message Resynch --------------------------------------------------------------------------------------*/ -#define cOCTVC1_MSG_RESYNCH_BIT_OFFSET 28 -#define cOCTVC1_MSG_RESYNCH_BIT_MASK 0x1 - -/*------------------------------------------------------------------------------------- - Message identifier --------------------------------------------------------------------------------------*/ -#define cOCTVC1_MSG_ID_BIT_OFFSET 0 -#define cOCTVC1_MSG_ID_BIT_MASK 0x0FFFFFFF - -/*------------------------------------------------------------------------------------- - Message identifier - Method ID --------------------------------------------------------------------------------------*/ -#define cOCTVC1_MSG_METHOD_ID_BIT_OFFSET 0 -#define cOCTVC1_MSG_METHOD_BIT_MASK 0x00000FFF - -/*------------------------------------------------------------------------------------- - Message identifier - Module ID --------------------------------------------------------------------------------------*/ -#define cOCTVC1_MSG_MODULE_ID_BIT_OFFSET 16 -#define cOCTVC1_MSG_MODULE_BIT_MASK 0x000000FF - -/*------------------------------------------------------------------------------------- - Message identifier - Module and MethodID --------------------------------------------------------------------------------------*/ -#define cOCTVC1_MSG_MODULE_AND_METHOD_BIT_MASK ((cOCTVC1_MSG_MODULE_BIT_MASK< -#include "octvc1_generic_rc.h" -#include "octvc1_licensing_rc.h" -#include "pkt_api/octvc1_pkt_api_rc.h" -#include "main/octvc1_main_rc.h" -#include "test/octvc1_test_rc.h" -#include "hw/octvc1_hw_rc.h" -#include "irsc/octvc1_irsc_rc.h" -#include "gsm/octvc1_gsm_rc.h" - - -/* ------------------------------------------------------------------------------------- - octvc1_rc2string - -------------------------------------------------------------------------------------*/ -const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) -{ - static char g_szUnknownoctvc1_rc2string[32]; - switch( f_ulRc ) - { - case cOCTVC1_RC_OK: - return "cOCTVC1_RC_OK"; - case cOCTVC1_GENERIC_RC_BAD_PARAM: - return "cOCTVC1_GENERIC_RC_BAD_PARAM"; - case cOCTVC1_GENERIC_RC_NOT_FOUND: - return "cOCTVC1_GENERIC_RC_NOT_FOUND"; - case cOCTVC1_GENERIC_RC_ALREADY_USED: - return "cOCTVC1_GENERIC_RC_ALREADY_USED"; - case cOCTVC1_GENERIC_RC_READ_OBJECT: - return "cOCTVC1_GENERIC_RC_READ_OBJECT"; - case cOCTVC1_GENERIC_RC_WRITE_OBJECT: - return "cOCTVC1_GENERIC_RC_WRITE_OBJECT"; - case cOCTVC1_GENERIC_RC_INVALID_TRANSACTION_ID: - return "cOCTVC1_GENERIC_RC_INVALID_TRANSACTION_ID"; - case cOCTVC1_GENERIC_RC_ID_INVALID: - return "cOCTVC1_GENERIC_RC_ID_INVALID"; - case cOCTVC1_GENERIC_RC_SUB_ID_INVALID: - return "cOCTVC1_GENERIC_RC_SUB_ID_INVALID"; - case cOCTVC1_GENERIC_RC_GET_MODE_INVALID: - return "cOCTVC1_GENERIC_RC_GET_MODE_INVALID"; - case cOCTVC1_GENERIC_RC_NO_MORE_OBJECT: - return "cOCTVC1_GENERIC_RC_NO_MORE_OBJECT"; - case cOCTVC1_GENERIC_RC_NO_MORE_SUB_OBJECT: - return "cOCTVC1_GENERIC_RC_NO_MORE_SUB_OBJECT"; - case cOCTVC1_GENERIC_RC_FULL: - return "cOCTVC1_GENERIC_RC_FULL"; - case cOCTVC1_GENERIC_RC_TIMEOUT: - return "cOCTVC1_GENERIC_RC_TIMEOUT"; - case cOCTVC1_GENERIC_RC_API_CMD_NOT_IMPLEMENTED: - return "cOCTVC1_GENERIC_RC_API_CMD_NOT_IMPLEMENTED"; - case cOCTVC1_GENERIC_RC_API_CMD_REJECT: - return "cOCTVC1_GENERIC_RC_API_CMD_REJECT"; - case cOCTVC1_GENERIC_RC_API_CMD_RETRANSMIT: - return "cOCTVC1_GENERIC_RC_API_CMD_RETRANSMIT"; - case cOCTVC1_GENERIC_RC_API_SESSION_INACTIVE: - return "cOCTVC1_GENERIC_RC_API_SESSION_INACTIVE"; - case cOCTVC1_GENERIC_RC_API_INVALID_CMD_LENGTH: - 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_MEMORY_LOCAL_ALLOC: - return "cOCTVC1_GENERIC_RC_MEMORY_LOCAL_ALLOC"; - case cOCTVC1_GENERIC_RC_MEMORY_LOCAL_FREE: - return "cOCTVC1_GENERIC_RC_MEMORY_LOCAL_FREE"; - case cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_ALLOC: - return "cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_ALLOC"; - case cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_FREE: - return "cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_FREE"; - case cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_ALLOC: - return "cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_ALLOC"; - case cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_FREE: - return "cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_FREE"; - case cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_READ: - return "cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_READ"; - case cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_WRITE: - return "cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_WRITE"; - case cOCTVC1_GENERIC_RC_MEMORY_IO_READ: - return "cOCTVC1_GENERIC_RC_MEMORY_IO_READ"; - case cOCTVC1_GENERIC_RC_MEMORY_IO_WRITE: - return "cOCTVC1_GENERIC_RC_MEMORY_IO_WRITE"; - case cOCTVC1_GENERIC_RC_MEMORY_CHECKSUM: - return "cOCTVC1_GENERIC_RC_MEMORY_CHECKSUM"; - case cOCTVC1_GENERIC_RC_MEMORY_SIZE: - return "cOCTVC1_GENERIC_RC_MEMORY_SIZE"; - case cOCTVC1_GENERIC_RC_INTERNAL_ERROR: - return "cOCTVC1_GENERIC_RC_INTERNAL_ERROR"; - case cOCTVC1_GENERIC_RC_INTERNAL_SERVICE_NOT_INIT: - return "cOCTVC1_GENERIC_RC_INTERNAL_SERVICE_NOT_INIT"; - case cOCTVC1_GENERIC_RC_INTERNAL_TIMEOUT: - return "cOCTVC1_GENERIC_RC_INTERNAL_TIMEOUT"; - case cOCTVC1_GENERIC_RC_INTERNAL_MSG_UNKNOWN: - return "cOCTVC1_GENERIC_RC_INTERNAL_MSG_UNKNOWN"; - case cOCTVC1_LICENSING_RC_DENIED: - return "cOCTVC1_LICENSING_RC_DENIED"; - case cOCTVC1_LICENSING_RC_INVALID_LICENSE: - return "cOCTVC1_LICENSING_RC_INVALID_LICENSE"; - case cOCTVC1_PKT_API_RC_OS_ERROR: - return "cOCTVC1_PKT_API_RC_OS_ERROR"; - case cOCTVC1_PKT_API_RC_TRANSPORT_ERROR: - return "cOCTVC1_PKT_API_RC_TRANSPORT_ERROR"; - case cOCTVC1_PKT_API_RC_TIMEOUT: - return "cOCTVC1_PKT_API_RC_TIMEOUT"; - case cOCTVC1_PKT_API_RC_LOCAL_MAC_INDEX_NOT_FOUND: - return "cOCTVC1_PKT_API_RC_LOCAL_MAC_INDEX_NOT_FOUND"; - case cOCTVC1_PKT_API_RC_BAD_PARAM: - return "cOCTVC1_PKT_API_RC_BAD_PARAM"; - case cOCTVC1_PKT_API_RC_INST_CNCT_NOMORE: - return "cOCTVC1_PKT_API_RC_INST_CNCT_NOMORE"; - case cOCTVC1_PKT_API_RC_INST_PKT_NOMORE: - return "cOCTVC1_PKT_API_RC_INST_PKT_NOMORE"; - case cOCTVC1_PKT_API_RC_INST_SYNC_TOOMANY: - return "cOCTVC1_PKT_API_RC_INST_SYNC_TOOMANY"; - case cOCTVC1_PKT_API_RC_INST_CNCT_DEP: - return "cOCTVC1_PKT_API_RC_INST_CNCT_DEP"; - case cOCTVC1_PKT_API_RC_INST_DISCOVER_INPROGRESS: - return "cOCTVC1_PKT_API_RC_INST_DISCOVER_INPROGRESS"; - case cOCTVC1_PKT_API_RC_INST_RSP_TRUNCATE: - return "cOCTVC1_PKT_API_RC_INST_RSP_TRUNCATE"; - case cOCTVC1_PKT_API_RC_INST_TERMINATED: - return "cOCTVC1_PKT_API_RC_INST_TERMINATED"; - case cOCTVC1_PKT_API_RC_CNCT_SESS_NOMORE: - return "cOCTVC1_PKT_API_RC_CNCT_SESS_NOMORE"; - case cOCTVC1_PKT_API_RC_CNCT_SESS_DEP: - return "cOCTVC1_PKT_API_RC_CNCT_SESS_DEP"; - case cOCTVC1_PKT_API_RC_CNCT_BRIDGE_DEP: - return "cOCTVC1_PKT_API_RC_CNCT_BRIDGE_DEP"; - case cOCTVC1_PKT_API_RC_CNCT_ALREADY_OPEN: - return "cOCTVC1_PKT_API_RC_CNCT_ALREADY_OPEN"; - case cOCTVC1_PKT_API_RC_INTERFACE_NAME_NOT_FOUND: - return "cOCTVC1_PKT_API_RC_INTERFACE_NAME_NOT_FOUND"; - case cOCTVC1_PKT_API_RC_DEPENDENCIES: - return "cOCTVC1_PKT_API_RC_DEPENDENCIES"; - case cOCTVC1_PKT_API_RC_SESS_CLOSE: - return "cOCTVC1_PKT_API_RC_SESS_CLOSE"; - case cOCTVC1_PKT_API_RC_CNCT_CLOSE: - return "cOCTVC1_PKT_API_RC_CNCT_CLOSE"; - case cOCTVC1_PKT_API_RC_SESS_ALREADY_OPEN: - return "cOCTVC1_PKT_API_RC_SESS_ALREADY_OPEN"; - case cOCTVC1_PKT_API_RC_NOT_IMPLEMENT_YET: - return "cOCTVC1_PKT_API_RC_NOT_IMPLEMENT_YET"; - case cOCTVC1_PKT_API_RC_DISPATCHER_NOT_READY: - return "cOCTVC1_PKT_API_RC_DISPATCHER_NOT_READY"; - case cOCTVC1_PKT_API_RC_REQUIRES_MULTI_THREAD: - return "cOCTVC1_PKT_API_RC_REQUIRES_MULTI_THREAD"; - case cOCTVC1_MAIN_RC_PROCESS_IMAGE_LOAD_FILE_NOT_FOUND: - return "cOCTVC1_MAIN_RC_PROCESS_IMAGE_LOAD_FILE_NOT_FOUND"; - case cOCTVC1_MAIN_RC_EVENT_MASK_INVALID: - return "cOCTVC1_MAIN_RC_EVENT_MASK_INVALID"; - case cOCTVC1_MAIN_RC_PROCESS_NOT_FOUND: - return "cOCTVC1_MAIN_RC_PROCESS_NOT_FOUND"; - case cOCTVC1_MAIN_RC_API_SYSTEM_SESSION_NOT_ACTIVE: - return "cOCTVC1_MAIN_RC_API_SYSTEM_SESSION_NOT_ACTIVE"; - case cOCTVC1_MAIN_RC_RESET_STATS_ERROR: - return "cOCTVC1_MAIN_RC_RESET_STATS_ERROR"; - case cOCTVC1_MAIN_RC_FILE_OPEN: - return "cOCTVC1_MAIN_RC_FILE_OPEN"; - case cOCTVC1_MAIN_RC_FILE_HANDLE: - return "cOCTVC1_MAIN_RC_FILE_HANDLE"; - case cOCTVC1_MAIN_RC_FILE_INVALID_ACCESS_RIGHTS: - return "cOCTVC1_MAIN_RC_FILE_INVALID_ACCESS_RIGHTS"; - case cOCTVC1_MAIN_RC_FILE_WRITE: - return "cOCTVC1_MAIN_RC_FILE_WRITE"; - case cOCTVC1_MAIN_RC_FILE_SEEK_UNKOWN_ORIGIN: - return "cOCTVC1_MAIN_RC_FILE_SEEK_UNKOWN_ORIGIN"; - case cOCTVC1_MAIN_RC_FILE_SEEK_INVALID_OFFSET: - return "cOCTVC1_MAIN_RC_FILE_SEEK_INVALID_OFFSET"; - case cOCTVC1_MAIN_RC_FILE_SEEK: - return "cOCTVC1_MAIN_RC_FILE_SEEK"; - case cOCTVC1_MAIN_RC_FILE_NOT_FOUND: - return "cOCTVC1_MAIN_RC_FILE_NOT_FOUND"; - case cOCTVC1_MAIN_RC_FILE_MAX_READ_BYTE_SIZE: - return "cOCTVC1_MAIN_RC_FILE_MAX_READ_BYTE_SIZE"; - case cOCTVC1_MAIN_RC_FILE_MAX_WRITE_BYTE_SIZE: - return "cOCTVC1_MAIN_RC_FILE_MAX_WRITE_BYTE_SIZE"; - case cOCTVC1_MAIN_RC_FILE_NAME: - return "cOCTVC1_MAIN_RC_FILE_NAME"; - case cOCTVC1_MAIN_RC_FILE_ALREADY_OPENED: - return "cOCTVC1_MAIN_RC_FILE_ALREADY_OPENED"; - case cOCTVC1_MAIN_RC_FILE_BUSY: - return "cOCTVC1_MAIN_RC_FILE_BUSY"; - case cOCTVC1_MAIN_RC_FILE_ALREADY_CLOSED: - return "cOCTVC1_MAIN_RC_FILE_ALREADY_CLOSED"; - case cOCTVC1_MAIN_RC_FILE_NOT_OPEN: - return "cOCTVC1_MAIN_RC_FILE_NOT_OPEN"; - case cOCTVC1_MAIN_RC_FILE_FLASH_CMD_NOT_AVAILABLE: - return "cOCTVC1_MAIN_RC_FILE_FLASH_CMD_NOT_AVAILABLE"; - case cOCTVC1_MAIN_RC_FILE_GET_MODE_INVALID: - return "cOCTVC1_MAIN_RC_FILE_GET_MODE_INVALID"; - case cOCTVC1_MAIN_RC_FILE_ACCESS_DENIED: - return "cOCTVC1_MAIN_RC_FILE_ACCESS_DENIED"; - case cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO: - return "cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO"; - case cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE: - return "cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE"; - case cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START: - return "cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START"; - case cOCTVC1_MAIN_RC_CPU_USAGE_HANDLE_INVALID: - return "cOCTVC1_MAIN_RC_CPU_USAGE_HANDLE_INVALID"; - case cOCTVC1_MAIN_RC_CPU_USAGE_THRESHOLD_INVALID: - return "cOCTVC1_MAIN_RC_CPU_USAGE_THRESHOLD_INVALID"; - case cOCTVC1_MAIN_RC_CPU_USAGE_NOT_ACCESSIBLE: - return "cOCTVC1_MAIN_RC_CPU_USAGE_NOT_ACCESSIBLE"; - case cOCTVC1_MAIN_RC_API_SESSION_SERVICE_NOT_INIT: - return "cOCTVC1_MAIN_RC_API_SESSION_SERVICE_NOT_INIT"; - case cOCTVC1_MAIN_RC_API_SESSION_HEARTBEAT_ALREADY_START: - return "cOCTVC1_MAIN_RC_API_SESSION_HEARTBEAT_ALREADY_START"; - case cOCTVC1_MAIN_RC_API_SESSION_HEARTBEAT_NOT_START: - return "cOCTVC1_MAIN_RC_API_SESSION_HEARTBEAT_NOT_START"; - case cOCTVC1_MAIN_RC_LOG_LOGGER_NOT_INIT: - return "cOCTVC1_MAIN_RC_LOG_LOGGER_NOT_INIT"; - case cOCTVC1_MAIN_RC_LOG_MGR_NOT_INIT: - return "cOCTVC1_MAIN_RC_LOG_MGR_NOT_INIT"; - case cOCTVC1_MAIN_RC_LOG_INTERNAL_ERROR: - return "cOCTVC1_MAIN_RC_LOG_INTERNAL_ERROR"; - case cOCTVC1_MAIN_RC_LOG_TRACE_ALREADY_START: - 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_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: - return "cOCTVC1_MAIN_RC_PROCESS_CPU_USAGE_MONITOR_INVALID_ALARM_THRESHOLD_LOW_PERCENT"; - case cOCTVC1_HW_RC_CORE_NOT_FOUND: - return "cOCTVC1_HW_RC_CORE_NOT_FOUND"; - case cOCTVC1_HW_RC_ETH_PORT_RESTRICTED_API_DENIED: - return "cOCTVC1_HW_RC_ETH_PORT_RESTRICTED_API_DENIED"; - case cOCTVC1_HW_RC_ETH_PORT_IN_USED: - return "cOCTVC1_HW_RC_ETH_PORT_IN_USED"; - case cOCTVC1_HW_RC_RF_PORT_UNUSED: - return "cOCTVC1_HW_RC_RF_PORT_UNUSED"; - case cOCTVC1_HW_RC_RF_PORT_ANTENNA_UNUSED: - return "cOCTVC1_HW_RC_RF_PORT_ANTENNA_UNUSED"; - case cOCTVC1_HW_RC_RF_PORT_ANTENNA_INTERNAL_ERROR: - return "cOCTVC1_HW_RC_RF_PORT_ANTENNA_INTERNAL_ERROR"; - case cOCTVC1_HW_RC_RF_PORT_ANTENNA_CANNOT_MODIFY: - return "cOCTVC1_HW_RC_RF_PORT_ANTENNA_CANNOT_MODIFY"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_ALREADY_OPEN: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_ALREADY_OPEN"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_OPEN_ERROR: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_OPEN_ERROR"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_CLOSE_ERROR: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_CLOSE_ERROR"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_PCB_INFO: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_PCB_INFO"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_OPEN_ERROR: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_OPEN_ERROR"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_OPEN_ERROR: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_OPEN_ERROR"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_CLOSE_ERROR: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_CLOSE_ERROR"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_CLOSE_ERROR: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_CLOSE_ERROR"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_STATS_ERROR: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_STATS_ERROR"; - case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_SUPPORTED: - return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_SUPPORTED"; - case cOCTVC1_IRSC_RC_INVALID_TASK: - return "cOCTVC1_IRSC_RC_INVALID_TASK"; - case cOCTVC1_IRSC_RC_OBJMGR_LIST_ERROR: - return "cOCTVC1_IRSC_RC_OBJMGR_LIST_ERROR"; - case cOCTVC1_IRSC_RC_OBJMGR_INVALID_OBJECT: - return "cOCTVC1_IRSC_RC_OBJMGR_INVALID_OBJECT"; - case cOCTVC1_IRSC_RC_OBJMGR_INTERNAL_ERROR: - 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_API_COMMAND_MONITORING_DISABLE: - return "cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_DISABLE"; - case cOCTVC1_IRSC_RC_API_COMMAND_MAX_REACHED: - return "cOCTVC1_IRSC_RC_API_COMMAND_MAX_REACHED"; - case cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_ALREADY_START: - return "cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_ALREADY_START"; - case cOCTVC1_IRSC_RC_API_COMMAND_INTERNAL_ERROR: - return "cOCTVC1_IRSC_RC_API_COMMAND_INTERNAL_ERROR"; - case cOCTVC1_GSM_RC_GENERIC_EVENT_MASK_INVALID: - return "cOCTVC1_GSM_RC_GENERIC_EVENT_MASK_INVALID"; - case cOCTVC1_GSM_RC_TRX_RESOURCE_UNAVAILABLE: - return "cOCTVC1_GSM_RC_TRX_RESOURCE_UNAVAILABLE"; - case cOCTVC1_GSM_RC_TRX_ALREADY_OPENED: - return "cOCTVC1_GSM_RC_TRX_ALREADY_OPENED"; - case cOCTVC1_GSM_RC_TRX_ID_INVALID: - return "cOCTVC1_GSM_RC_TRX_ID_INVALID"; - case cOCTVC1_GSM_RC_TRX_NOT_FOUND: - return "cOCTVC1_GSM_RC_TRX_NOT_FOUND"; - case cOCTVC1_GSM_RC_TRX_RADIO_INIT: - return "cOCTVC1_GSM_RC_TRX_RADIO_INIT"; - case cOCTVC1_GSM_RC_TRX_RADIO_CONFIG: - return "cOCTVC1_GSM_RC_TRX_RADIO_CONFIG"; - case cOCTVC1_GSM_RC_TRX_RADIO_RESET: - return "cOCTVC1_GSM_RC_TRX_RADIO_RESET"; - case cOCTVC1_GSM_RC_TRX_RADIO_TERMINATE: - return "cOCTVC1_GSM_RC_TRX_RADIO_TERMINATE"; - case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_RESOURCE_UNAVAILABLE: - return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_RESOURCE_UNAVAILABLE"; - case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ALREADY_ACTIVATED: - return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ALREADY_ACTIVATED"; - case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_NOT_ACTIVATED: - return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_NOT_ACTIVATED"; - case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ID_INVALID: - return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ID_INVALID"; - case cOCTVC1_GSM_RC_SUB_CHANNEL_ID_INVALID: - return "cOCTVC1_GSM_RC_SUB_CHANNEL_ID_INVALID"; - case cOCTVC1_GSM_RC_SUB_CHANNEL_DIRECTION_INVALID: - return "cOCTVC1_GSM_RC_SUB_CHANNEL_DIRECTION_INVALID"; - case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RESOURCE_UNAVAILABLE: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RESOURCE_UNAVAILABLE"; - case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ALREADY_ACTIVATED: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ALREADY_ACTIVATED"; - case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_NOT_ACTIVATED: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_NOT_ACTIVATED"; - case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ID_INVALID: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ID_INVALID"; - case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DIRECTION_INVALID: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DIRECTION_INVALID"; - case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_SAPI_INVALID: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_SAPI_INVALID"; - case cOCTVC1_GSM_RC_RF_CONFIG_INVALID_RX_GAIN_DB: - return "cOCTVC1_GSM_RC_RF_CONFIG_INVALID_RX_GAIN_DB"; - case cOCTVC1_GSM_RC_RF_CONFIG_INVALID_TX_ATTND_B: - 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_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: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_DATA_LENGTH"; - case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_FRAME_NUMBER: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_FRAME_NUMBER"; - case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_DATA_LENGTH: - return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_DATA_LENGTH"; - case cOCTVC1_GSM_RC_TRX_LOGICAL_CHANNEL_EMPTY_FRAME_REQUEST_INVALID_FRAME_NUMBER: - return "cOCTVC1_GSM_RC_TRX_LOGICAL_CHANNEL_EMPTY_FRAME_REQUEST_INVALID_FRAME_NUMBER"; - - } - sprintf( g_szUnknownoctvc1_rc2string, "0x%.8X", f_ulRc ); - return g_szUnknownoctvc1_rc2string; -} -#endif - -#endif /* __OCTVC1_RC2STRING__ */ +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + + +#ifndef __OCTVC1_RC2STRING__ +#define __OCTVC1_RC2STRING__ + +#include "../octdev_types.h" +/* ------------------------------------------------------------------------------------- + OCTVC1_RC2STRING + -------------------------------------------------------------------------------------*/ +#define mOCTVC1_RC2STRING( _f_ulRc ) \ + octvc1_rc2string( _f_ulRc ) + +#ifndef OCTVC1_RC2STRING_DECLARE +extern const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ); +#endif + + +#ifdef OCTVC1_RC2STRING_DECLARE +#include +#include "octvc1_generic_rc.h" +#include "octvc1_licensing_rc.h" +#include "pkt_api/octvc1_pkt_api_rc.h" +#include "main/octvc1_main_rc.h" +#include "test/octvc1_test_rc.h" +#include "hw/octvc1_hw_rc.h" +#include "irsc/octvc1_irsc_rc.h" +#include "gsm/octvc1_gsm_rc.h" + + +/* ------------------------------------------------------------------------------------- + octvc1_rc2string + -------------------------------------------------------------------------------------*/ +const char * octvc1_rc2string( tOCT_UINT32 f_ulRc ) +{ + static char g_szUnknownoctvc1_rc2string[32]; + switch( f_ulRc ) + { + case cOCTVC1_RC_OK: + return "cOCTVC1_RC_OK"; + case cOCTVC1_GENERIC_RC_BAD_PARAM: + return "cOCTVC1_GENERIC_RC_BAD_PARAM"; + case cOCTVC1_GENERIC_RC_NOT_FOUND: + return "cOCTVC1_GENERIC_RC_NOT_FOUND"; + case cOCTVC1_GENERIC_RC_ALREADY_USED: + return "cOCTVC1_GENERIC_RC_ALREADY_USED"; + case cOCTVC1_GENERIC_RC_READ_OBJECT: + return "cOCTVC1_GENERIC_RC_READ_OBJECT"; + case cOCTVC1_GENERIC_RC_WRITE_OBJECT: + return "cOCTVC1_GENERIC_RC_WRITE_OBJECT"; + case cOCTVC1_GENERIC_RC_INVALID_TRANSACTION_ID: + return "cOCTVC1_GENERIC_RC_INVALID_TRANSACTION_ID"; + case cOCTVC1_GENERIC_RC_ID_INVALID: + return "cOCTVC1_GENERIC_RC_ID_INVALID"; + case cOCTVC1_GENERIC_RC_SUB_ID_INVALID: + return "cOCTVC1_GENERIC_RC_SUB_ID_INVALID"; + case cOCTVC1_GENERIC_RC_GET_MODE_INVALID: + return "cOCTVC1_GENERIC_RC_GET_MODE_INVALID"; + case cOCTVC1_GENERIC_RC_NO_MORE_OBJECT: + return "cOCTVC1_GENERIC_RC_NO_MORE_OBJECT"; + case cOCTVC1_GENERIC_RC_NO_MORE_SUB_OBJECT: + return "cOCTVC1_GENERIC_RC_NO_MORE_SUB_OBJECT"; + case cOCTVC1_GENERIC_RC_FULL: + return "cOCTVC1_GENERIC_RC_FULL"; + case cOCTVC1_GENERIC_RC_TIMEOUT: + return "cOCTVC1_GENERIC_RC_TIMEOUT"; + case cOCTVC1_GENERIC_RC_BAD_STATE: + return "cOCTVC1_GENERIC_RC_BAD_STATE"; + case cOCTVC1_GENERIC_RC_ALREADY_START: + return "cOCTVC1_GENERIC_RC_ALREADY_START"; + case cOCTVC1_GENERIC_RC_ALREADY_STOP: + return "cOCTVC1_GENERIC_RC_ALREADY_STOP"; + case cOCTVC1_GENERIC_RC_API_CMD_NOT_IMPLEMENTED: + return "cOCTVC1_GENERIC_RC_API_CMD_NOT_IMPLEMENTED"; + case cOCTVC1_GENERIC_RC_API_CMD_REJECT: + return "cOCTVC1_GENERIC_RC_API_CMD_REJECT"; + case cOCTVC1_GENERIC_RC_API_CMD_RETRANSMIT: + return "cOCTVC1_GENERIC_RC_API_CMD_RETRANSMIT"; + case cOCTVC1_GENERIC_RC_API_SESSION_INACTIVE: + return "cOCTVC1_GENERIC_RC_API_SESSION_INACTIVE"; + case cOCTVC1_GENERIC_RC_API_INVALID_CMD_LENGTH: + 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_MEMORY_LOCAL_ALLOC: + return "cOCTVC1_GENERIC_RC_MEMORY_LOCAL_ALLOC"; + case cOCTVC1_GENERIC_RC_MEMORY_LOCAL_FREE: + return "cOCTVC1_GENERIC_RC_MEMORY_LOCAL_FREE"; + case cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_ALLOC: + return "cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_ALLOC"; + case cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_FREE: + return "cOCTVC1_GENERIC_RC_MEMORY_RESIDENT_FREE"; + case cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_ALLOC: + return "cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_ALLOC"; + case cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_FREE: + return "cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_FREE"; + case cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_READ: + return "cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_READ"; + case cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_WRITE: + return "cOCTVC1_GENERIC_RC_MEMORY_EXTERNAL_WRITE"; + case cOCTVC1_GENERIC_RC_MEMORY_IO_READ: + return "cOCTVC1_GENERIC_RC_MEMORY_IO_READ"; + case cOCTVC1_GENERIC_RC_MEMORY_IO_WRITE: + return "cOCTVC1_GENERIC_RC_MEMORY_IO_WRITE"; + case cOCTVC1_GENERIC_RC_MEMORY_CHECKSUM: + return "cOCTVC1_GENERIC_RC_MEMORY_CHECKSUM"; + case cOCTVC1_GENERIC_RC_MEMORY_SIZE: + return "cOCTVC1_GENERIC_RC_MEMORY_SIZE"; + case cOCTVC1_GENERIC_RC_INTERNAL_ERROR: + return "cOCTVC1_GENERIC_RC_INTERNAL_ERROR"; + case cOCTVC1_GENERIC_RC_INTERNAL_SERVICE_NOT_INIT: + return "cOCTVC1_GENERIC_RC_INTERNAL_SERVICE_NOT_INIT"; + case cOCTVC1_GENERIC_RC_INTERNAL_TIMEOUT: + return "cOCTVC1_GENERIC_RC_INTERNAL_TIMEOUT"; + case cOCTVC1_GENERIC_RC_INTERNAL_MSG_UNKNOWN: + return "cOCTVC1_GENERIC_RC_INTERNAL_MSG_UNKNOWN"; + case cOCTVC1_LICENSING_RC_DENIED: + return "cOCTVC1_LICENSING_RC_DENIED"; + case cOCTVC1_LICENSING_RC_INVALID_LICENSE: + return "cOCTVC1_LICENSING_RC_INVALID_LICENSE"; + case cOCTVC1_PKT_API_RC_OS_ERROR: + return "cOCTVC1_PKT_API_RC_OS_ERROR"; + case cOCTVC1_PKT_API_RC_TRANSPORT_ERROR: + return "cOCTVC1_PKT_API_RC_TRANSPORT_ERROR"; + case cOCTVC1_PKT_API_RC_TIMEOUT: + return "cOCTVC1_PKT_API_RC_TIMEOUT"; + case cOCTVC1_PKT_API_RC_LOCAL_MAC_INDEX_NOT_FOUND: + return "cOCTVC1_PKT_API_RC_LOCAL_MAC_INDEX_NOT_FOUND"; + case cOCTVC1_PKT_API_RC_BAD_PARAM: + return "cOCTVC1_PKT_API_RC_BAD_PARAM"; + case cOCTVC1_PKT_API_RC_INST_CNCT_NOMORE: + return "cOCTVC1_PKT_API_RC_INST_CNCT_NOMORE"; + case cOCTVC1_PKT_API_RC_INST_PKT_NOMORE: + return "cOCTVC1_PKT_API_RC_INST_PKT_NOMORE"; + case cOCTVC1_PKT_API_RC_INST_SYNC_TOOMANY: + return "cOCTVC1_PKT_API_RC_INST_SYNC_TOOMANY"; + case cOCTVC1_PKT_API_RC_INST_CNCT_DEP: + return "cOCTVC1_PKT_API_RC_INST_CNCT_DEP"; + case cOCTVC1_PKT_API_RC_INST_DISCOVER_INPROGRESS: + return "cOCTVC1_PKT_API_RC_INST_DISCOVER_INPROGRESS"; + case cOCTVC1_PKT_API_RC_INST_RSP_TRUNCATE: + return "cOCTVC1_PKT_API_RC_INST_RSP_TRUNCATE"; + case cOCTVC1_PKT_API_RC_INST_TERMINATED: + return "cOCTVC1_PKT_API_RC_INST_TERMINATED"; + case cOCTVC1_PKT_API_RC_CNCT_SESS_NOMORE: + return "cOCTVC1_PKT_API_RC_CNCT_SESS_NOMORE"; + case cOCTVC1_PKT_API_RC_CNCT_SESS_DEP: + return "cOCTVC1_PKT_API_RC_CNCT_SESS_DEP"; + case cOCTVC1_PKT_API_RC_CNCT_BRIDGE_DEP: + return "cOCTVC1_PKT_API_RC_CNCT_BRIDGE_DEP"; + case cOCTVC1_PKT_API_RC_CNCT_ALREADY_OPEN: + return "cOCTVC1_PKT_API_RC_CNCT_ALREADY_OPEN"; + case cOCTVC1_PKT_API_RC_INTERFACE_NAME_NOT_FOUND: + return "cOCTVC1_PKT_API_RC_INTERFACE_NAME_NOT_FOUND"; + case cOCTVC1_PKT_API_RC_DEPENDENCIES: + return "cOCTVC1_PKT_API_RC_DEPENDENCIES"; + case cOCTVC1_PKT_API_RC_SESS_CLOSE: + return "cOCTVC1_PKT_API_RC_SESS_CLOSE"; + case cOCTVC1_PKT_API_RC_CNCT_CLOSE: + return "cOCTVC1_PKT_API_RC_CNCT_CLOSE"; + case cOCTVC1_PKT_API_RC_SESS_ALREADY_OPEN: + return "cOCTVC1_PKT_API_RC_SESS_ALREADY_OPEN"; + case cOCTVC1_PKT_API_RC_NOT_IMPLEMENT_YET: + return "cOCTVC1_PKT_API_RC_NOT_IMPLEMENT_YET"; + case cOCTVC1_PKT_API_RC_DISPATCHER_NOT_READY: + return "cOCTVC1_PKT_API_RC_DISPATCHER_NOT_READY"; + case cOCTVC1_PKT_API_RC_REQUIRES_MULTI_THREAD: + return "cOCTVC1_PKT_API_RC_REQUIRES_MULTI_THREAD"; + case cOCTVC1_MAIN_RC_PROCESS_IMAGE_LOAD_FILE_NOT_FOUND: + return "cOCTVC1_MAIN_RC_PROCESS_IMAGE_LOAD_FILE_NOT_FOUND"; + case cOCTVC1_MAIN_RC_EVENT_MASK_INVALID: + return "cOCTVC1_MAIN_RC_EVENT_MASK_INVALID"; + case cOCTVC1_MAIN_RC_PROCESS_NOT_FOUND: + return "cOCTVC1_MAIN_RC_PROCESS_NOT_FOUND"; + case cOCTVC1_MAIN_RC_API_SYSTEM_SESSION_NOT_ACTIVE: + return "cOCTVC1_MAIN_RC_API_SYSTEM_SESSION_NOT_ACTIVE"; + case cOCTVC1_MAIN_RC_RESET_STATS_ERROR: + return "cOCTVC1_MAIN_RC_RESET_STATS_ERROR"; + case cOCTVC1_MAIN_RC_FILE_OPEN: + return "cOCTVC1_MAIN_RC_FILE_OPEN"; + case cOCTVC1_MAIN_RC_FILE_HANDLE: + return "cOCTVC1_MAIN_RC_FILE_HANDLE"; + case cOCTVC1_MAIN_RC_FILE_INVALID_ACCESS_RIGHTS: + return "cOCTVC1_MAIN_RC_FILE_INVALID_ACCESS_RIGHTS"; + case cOCTVC1_MAIN_RC_FILE_WRITE: + return "cOCTVC1_MAIN_RC_FILE_WRITE"; + case cOCTVC1_MAIN_RC_FILE_SEEK_UNKOWN_ORIGIN: + return "cOCTVC1_MAIN_RC_FILE_SEEK_UNKOWN_ORIGIN"; + case cOCTVC1_MAIN_RC_FILE_SEEK_INVALID_OFFSET: + return "cOCTVC1_MAIN_RC_FILE_SEEK_INVALID_OFFSET"; + case cOCTVC1_MAIN_RC_FILE_SEEK: + return "cOCTVC1_MAIN_RC_FILE_SEEK"; + case cOCTVC1_MAIN_RC_FILE_NOT_FOUND: + return "cOCTVC1_MAIN_RC_FILE_NOT_FOUND"; + case cOCTVC1_MAIN_RC_FILE_MAX_READ_BYTE_SIZE: + return "cOCTVC1_MAIN_RC_FILE_MAX_READ_BYTE_SIZE"; + case cOCTVC1_MAIN_RC_FILE_MAX_WRITE_BYTE_SIZE: + return "cOCTVC1_MAIN_RC_FILE_MAX_WRITE_BYTE_SIZE"; + case cOCTVC1_MAIN_RC_FILE_NAME: + return "cOCTVC1_MAIN_RC_FILE_NAME"; + case cOCTVC1_MAIN_RC_FILE_ALREADY_OPENED: + return "cOCTVC1_MAIN_RC_FILE_ALREADY_OPENED"; + case cOCTVC1_MAIN_RC_FILE_BUSY: + return "cOCTVC1_MAIN_RC_FILE_BUSY"; + case cOCTVC1_MAIN_RC_FILE_ALREADY_CLOSED: + return "cOCTVC1_MAIN_RC_FILE_ALREADY_CLOSED"; + case cOCTVC1_MAIN_RC_FILE_NOT_OPEN: + return "cOCTVC1_MAIN_RC_FILE_NOT_OPEN"; + case cOCTVC1_MAIN_RC_FILE_FLASH_CMD_NOT_AVAILABLE: + return "cOCTVC1_MAIN_RC_FILE_FLASH_CMD_NOT_AVAILABLE"; + case cOCTVC1_MAIN_RC_FILE_GET_MODE_INVALID: + return "cOCTVC1_MAIN_RC_FILE_GET_MODE_INVALID"; + case cOCTVC1_MAIN_RC_FILE_ACCESS_DENIED: + return "cOCTVC1_MAIN_RC_FILE_ACCESS_DENIED"; + case cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO: + return "cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO"; + case cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE: + return "cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE"; + case cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START: + return "cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START"; + case cOCTVC1_MAIN_RC_CPU_USAGE_HANDLE_INVALID: + return "cOCTVC1_MAIN_RC_CPU_USAGE_HANDLE_INVALID"; + case cOCTVC1_MAIN_RC_CPU_USAGE_THRESHOLD_INVALID: + return "cOCTVC1_MAIN_RC_CPU_USAGE_THRESHOLD_INVALID"; + case cOCTVC1_MAIN_RC_CPU_USAGE_NOT_ACCESSIBLE: + return "cOCTVC1_MAIN_RC_CPU_USAGE_NOT_ACCESSIBLE"; + case cOCTVC1_MAIN_RC_API_SESSION_SERVICE_NOT_INIT: + return "cOCTVC1_MAIN_RC_API_SESSION_SERVICE_NOT_INIT"; + case cOCTVC1_MAIN_RC_API_SESSION_HEARTBEAT_ALREADY_START: + return "cOCTVC1_MAIN_RC_API_SESSION_HEARTBEAT_ALREADY_START"; + case cOCTVC1_MAIN_RC_API_SESSION_HEARTBEAT_NOT_START: + return "cOCTVC1_MAIN_RC_API_SESSION_HEARTBEAT_NOT_START"; + case cOCTVC1_MAIN_RC_LOG_LOGGER_NOT_INIT: + return "cOCTVC1_MAIN_RC_LOG_LOGGER_NOT_INIT"; + case cOCTVC1_MAIN_RC_LOG_MGR_NOT_INIT: + return "cOCTVC1_MAIN_RC_LOG_MGR_NOT_INIT"; + case cOCTVC1_MAIN_RC_LOG_INTERNAL_ERROR: + return "cOCTVC1_MAIN_RC_LOG_INTERNAL_ERROR"; + case cOCTVC1_MAIN_RC_LOG_TRACE_ALREADY_START: + 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_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: + return "cOCTVC1_MAIN_RC_PROCESS_CPU_USAGE_MONITOR_INVALID_ALARM_THRESHOLD_LOW_PERCENT"; + case cOCTVC1_HW_RC_CORE_NOT_FOUND: + return "cOCTVC1_HW_RC_CORE_NOT_FOUND"; + case cOCTVC1_HW_RC_ETH_PORT_RESTRICTED_API_DENIED: + return "cOCTVC1_HW_RC_ETH_PORT_RESTRICTED_API_DENIED"; + case cOCTVC1_HW_RC_ETH_PORT_IN_USED: + return "cOCTVC1_HW_RC_ETH_PORT_IN_USED"; + case cOCTVC1_HW_RC_RF_PORT_UNUSED: + return "cOCTVC1_HW_RC_RF_PORT_UNUSED"; + case cOCTVC1_HW_RC_RF_PORT_ANTENNA_UNUSED: + return "cOCTVC1_HW_RC_RF_PORT_ANTENNA_UNUSED"; + case cOCTVC1_HW_RC_RF_PORT_ANTENNA_INTERNAL_ERROR: + return "cOCTVC1_HW_RC_RF_PORT_ANTENNA_INTERNAL_ERROR"; + case cOCTVC1_HW_RC_RF_PORT_ANTENNA_CANNOT_MODIFY: + return "cOCTVC1_HW_RC_RF_PORT_ANTENNA_CANNOT_MODIFY"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_ALREADY_OPEN: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_ALREADY_OPEN"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_OPEN_ERROR: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_OPEN_ERROR"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_CLOSE_ERROR: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_CLOSE_ERROR"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_PCB_INFO: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_BAD_PCB_INFO"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_OPEN_ERROR: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_OPEN_ERROR"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_OPEN_ERROR: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_OPEN_ERROR"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_CLOSE_ERROR: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_PROCESS_CLOSE_ERROR"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_CLOSE_ERROR: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_DAC_CLOSE_ERROR"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_STATS_ERROR: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_STATS_ERROR"; + case cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_SUPPORTED: + return "cOCTVC1_HW_RC_CLOCK_SYNC_MGR_NOT_SUPPORTED"; + case cOCTVC1_IRSC_RC_INVALID_TASK: + return "cOCTVC1_IRSC_RC_INVALID_TASK"; + case cOCTVC1_IRSC_RC_OBJMGR_LIST_ERROR: + return "cOCTVC1_IRSC_RC_OBJMGR_LIST_ERROR"; + case cOCTVC1_IRSC_RC_OBJMGR_INVALID_OBJECT: + return "cOCTVC1_IRSC_RC_OBJMGR_INVALID_OBJECT"; + case cOCTVC1_IRSC_RC_OBJMGR_INTERNAL_ERROR: + 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_API_COMMAND_MONITORING_DISABLE: + return "cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_DISABLE"; + case cOCTVC1_IRSC_RC_API_COMMAND_MAX_REACHED: + return "cOCTVC1_IRSC_RC_API_COMMAND_MAX_REACHED"; + case cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_ALREADY_START: + return "cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_ALREADY_START"; + case cOCTVC1_IRSC_RC_API_COMMAND_INTERNAL_ERROR: + return "cOCTVC1_IRSC_RC_API_COMMAND_INTERNAL_ERROR"; + case cOCTVC1_GSM_RC_GENERIC_EVENT_MASK_INVALID: + return "cOCTVC1_GSM_RC_GENERIC_EVENT_MASK_INVALID"; + case cOCTVC1_GSM_RC_TRX_RESOURCE_UNAVAILABLE: + return "cOCTVC1_GSM_RC_TRX_RESOURCE_UNAVAILABLE"; + case cOCTVC1_GSM_RC_TRX_ALREADY_OPENED: + return "cOCTVC1_GSM_RC_TRX_ALREADY_OPENED"; + case cOCTVC1_GSM_RC_TRX_ID_INVALID: + return "cOCTVC1_GSM_RC_TRX_ID_INVALID"; + case cOCTVC1_GSM_RC_TRX_NOT_FOUND: + return "cOCTVC1_GSM_RC_TRX_NOT_FOUND"; + case cOCTVC1_GSM_RC_TRX_RADIO_INIT: + return "cOCTVC1_GSM_RC_TRX_RADIO_INIT"; + case cOCTVC1_GSM_RC_TRX_RADIO_CONFIG: + return "cOCTVC1_GSM_RC_TRX_RADIO_CONFIG"; + case cOCTVC1_GSM_RC_TRX_RADIO_RESET: + return "cOCTVC1_GSM_RC_TRX_RADIO_RESET"; + case cOCTVC1_GSM_RC_TRX_RADIO_TERMINATE: + return "cOCTVC1_GSM_RC_TRX_RADIO_TERMINATE"; + case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_RESOURCE_UNAVAILABLE: + return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_RESOURCE_UNAVAILABLE"; + case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ALREADY_ACTIVATED: + return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ALREADY_ACTIVATED"; + case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_NOT_ACTIVATED: + return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_NOT_ACTIVATED"; + case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ID_INVALID: + return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ID_INVALID"; + case cOCTVC1_GSM_RC_SUB_CHANNEL_ID_INVALID: + return "cOCTVC1_GSM_RC_SUB_CHANNEL_ID_INVALID"; + case cOCTVC1_GSM_RC_SUB_CHANNEL_DIRECTION_INVALID: + return "cOCTVC1_GSM_RC_SUB_CHANNEL_DIRECTION_INVALID"; + case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RESOURCE_UNAVAILABLE: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RESOURCE_UNAVAILABLE"; + case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ALREADY_ACTIVATED: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ALREADY_ACTIVATED"; + case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_NOT_ACTIVATED: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_NOT_ACTIVATED"; + case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ID_INVALID: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ID_INVALID"; + case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DIRECTION_INVALID: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DIRECTION_INVALID"; + case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_SAPI_INVALID: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_SAPI_INVALID"; + case cOCTVC1_GSM_RC_RF_CONFIG_INVALID_RX_GAIN_DB: + return "cOCTVC1_GSM_RC_RF_CONFIG_INVALID_RX_GAIN_DB"; + case cOCTVC1_GSM_RC_RF_CONFIG_INVALID_TX_ATTND_B: + 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_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: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_DATA_LENGTH"; + case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_FRAME_NUMBER: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_FRAME_NUMBER"; + case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_DATA_LENGTH: + return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_DATA_LENGTH"; + case cOCTVC1_GSM_RC_TAP_FILTER_PHYSICAL_CHANNEL_INVALID_ENTRY_CNT: + return "cOCTVC1_GSM_RC_TAP_FILTER_PHYSICAL_CHANNEL_INVALID_ENTRY_CNT"; + case cOCTVC1_GSM_RC_TAP_FILTER_LOGICAL_CHANNEL_INVALID_ENTRY_CNT: + return "cOCTVC1_GSM_RC_TAP_FILTER_LOGICAL_CHANNEL_INVALID_ENTRY_CNT"; + case cOCTVC1_GSM_RC_TAP_FILTER_STATS_INVALID_TAP_ID_CNT: + return "cOCTVC1_GSM_RC_TAP_FILTER_STATS_INVALID_TAP_ID_CNT"; + case cOCTVC1_GSM_RC_MODULE_DATA_RF_UPLINK_INPUT_HEADER_INVALID_FRAME_NUMBER: + return "cOCTVC1_GSM_RC_MODULE_DATA_RF_UPLINK_INPUT_HEADER_INVALID_FRAME_NUMBER"; + case cOCTVC1_GSM_RC_TRX_LOGICAL_CHANNEL_EMPTY_FRAME_REQUEST_INVALID_FRAME_NUMBER: + return "cOCTVC1_GSM_RC_TRX_LOGICAL_CHANNEL_EMPTY_FRAME_REQUEST_INVALID_FRAME_NUMBER"; + + } + sprintf( g_szUnknownoctvc1_rc2string, "0x%.8X", f_ulRc ); + return g_szUnknownoctvc1_rc2string; +} +#endif + +#endif /* __OCTVC1_RC2STRING__ */ diff --git a/software/include/octvc1/octvc1_swap_hdrs.h b/software/include/octvc1/octvc1_swap_hdrs.h index d29b273..c9d601c 100644 --- a/software/include/octvc1/octvc1_swap_hdrs.h +++ b/software/include/octvc1/octvc1_swap_hdrs.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_SWAP_HDRS_H__ @@ -54,6 +54,7 @@ extern "C" { #include "octvc1_log_swap.h" #include "octvc1_file_swap.h" #include "octvc1_module_swap.h" +#include "octvc1_tap_swap.h" #include "octvc1_process_swap.h" #include "octvc1_radio_swap.h" #include "octvc1_api_swap.h" diff --git a/software/include/octvc1/octvc1_tap.h b/software/include/octvc1/octvc1_tap.h new file mode 100644 index 0000000..dfc918b --- /dev/null +++ b/software/include/octvc1/octvc1_tap.h @@ -0,0 +1,71 @@ +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_TAP.h + +Copyright (c) 2015 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 General Public License as published by +the Free Software Foundation; either version 2 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 General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_TAP_H__ +#define __OCTVC1_TAP_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Tap +-------------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------------- + tOCTVC1_TAP_DIRECTION_ENUM : Tap direction. +-------------------------------------------------------------------------------------*/ +#define tOCTVC1_TAP_DIRECTION_ENUM tOCT_UINT32 + +#define cOCTVC1_TAP_DIRECTION_ENUM_TX 0 +#define cOCTVC1_TAP_DIRECTION_ENUM_RX 1 + +/*------------------------------------------------------------------------------------- + tOCTVC1_TAP_ID : TAP_ID : [ModuleId|Direction|Index]. + ModuleId -> cOCTVC1_MODULE_ID_ENUM_ . + 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 ((tOCT_UINT32)(cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT< Fields marked with "valid_rtp=1" are not valid; - 1 -> Fields marked with "valid_rtp=1" are valid. In this case, - aulRtp[] contains a complete RTP header which can also include a - CSRC list and a RTP extension. Refer to RFC 1889 for additional - details. - bits[30:22] = Packet encoding type. - bits[21:14] = RTP padding size in bytes. (valid_rtp=1) - bits[13:11] = Reserved and must be 0. - bits[10:0] = RTP payload offset in bytes. (valid_rtp=1) - aulRtp - aulRtp[ 0 ].bits[31:30] = RTP version = 0x2. (valid_rtp=1) - .bit[29] = RTP padding. (valid_rtp=1) - .bit[28] = RTP extension. (valid_rtp=1) - .bits[27:24] = RTP contributing source count. (valid_rtp=1) - .bit[23] = Marker. - .bits[22:16] = RTP payload type. (valid_rtp=1) - .bits[15:0] = Sequence Number - aulRtp[ 1 ].bits[31:0] = Timestamp - aulRtp[ 2 ].bits[31:0] = - valid_rtp=1: RTP Synchronization source. - valid_rtp=0: Vocoder-dependant flags as defined below: - Enhanced Full Rate (EFR), see 3GPP TS 48.081 - .bits[31:4]:reserved, must be 0 - .bit[3]:BFI - .bit[2]:TAF - .bits[1:0]:SID --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVOCNET_PKT_DATA_HEADER VocNetHeader; - tOCT_UINT32 ulReserved; - tOCT_UINT32 ul_Rtp_PktType_Pad_Offset; - tOCT_UINT32 aulRtp[3]; - -} tOCTVOCNET_PKT_DATA_D_HEADER; - -/*------------------------------------------------------------------------------------- - tOCTVOCNET_PKT_DATA_F_HEADER - VocalloNet Format F Packet Header (Raw Data packet) - - Members: - VocNetHeader - ulTimestamp - bits[31:0] = Timestamp - ulSubType - bits[31:4] = Reserved, bits[3:0] = SubType --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVOCNET_PKT_DATA_HEADER VocNetHeader; - tOCT_UINT32 ulTimestamp; - tOCT_UINT32 ulSubType; - -} tOCTVOCNET_PKT_DATA_F_HEADER; - - -#endif /* __OCTVOCNET_PKT_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVOCNET_PKT_H__ +#define __OCTVOCNET_PKT_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octdev_types.h" +#include "../octpkt/octpkt_hdr.h" +#include "../octpkt/octpkt_hdrxl.h" +#include "octvc1_handle.h" +#include "octvc1_module.h" + + +/************************ COMMON DEFINITIONS *******************************/ + +#define cOCTVOCNET_PKT_ETHERTYPE cOCTPKT_HDR_ETHERTYPE +#define cOCTVOCNET_PKT_ETHERTYPE_XL cOCTPKT_HDRXL_ETHERTYPE + +/*------------------------------------------------------------------------------------- + VocalloNet Packet Format Values +-------------------------------------------------------------------------------------*/ +#define cOCTVOCNET_PKT_FORMAT_MASK cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_FORMAT +#define cOCTVOCNET_PKT_FORMAT_BIT_OFFSET cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_FORMAT_BIT_OFFSET +#define cOCTVOCNET_PKT_FORMAT_BIT_MASK cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_FORMAT_BIT_MASK +#define cOCTVOCNET_PKT_TRACE_MASK cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_TRACE +#define cOCTVOCNET_PKT_TRACE_BIT_OFFSET cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_TRACE_BIT_OFFSET +#define cOCTVOCNET_PKT_TRACE_BIT_MASK cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_TRACE_BIT_MASK +#define cOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_MASK cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_CONTROL_PROTOCOL_TYPE +#define cOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_BIT_OFFSET cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_CONTROL_PROTOCOL_TYPE_BIT_OFFSET +#define cOCTVOCNET_PKT_CONTROL_PROTOCOL_TYPE_BIT_MASK cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_CONTROL_PROTOCOL_TYPE_BIT_MASK +#define cOCTVOCNET_PKT_LENGTH_MASK cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_LENGTH +#define cOCTVOCNET_PKT_LENGTH_BIT_OFFSET cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_LENGTH_BIT_OFFSET +#define cOCTVOCNET_PKT_LENGTH_BIT_MASK cOCTPKT_HDR_FORMAT_PROTO_TYPE_LEN_MASK_LENGTH_BIT_MASK + +/*------------------------------------------------------------------------------------- + VocalloNet Format Control Packet +-------------------------------------------------------------------------------------*/ +#define cOCTVOCNET_PKT_FORMAT_CTRL 0x00 +#define cOCTVOCNET_PKT_FORMAT_F 0x01 +#define cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT 0x02 + +/*------------------------------------------------------------------------------------- + VocalloNet Format Control Bit Shifted +-------------------------------------------------------------------------------------*/ +#define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_CTRL (cOCTVOCNET_PKT_FORMAT_CTRL<hLogicalObj ); } \ + ((tOCTVOCNET_PKT_DATA_HEADER *)pOCTVOCNET_PKT_DATA_HEADER)->hLogicalObj = \ + mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_HEADER *)pOCTVOCNET_PKT_DATA_HEADER)->hLogicalObj); \ ((tOCTVOCNET_PKT_DATA_HEADER *)pOCTVOCNET_PKT_DATA_HEADER)->ulLogicalObjPktPort = \ mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_HEADER *)pOCTVOCNET_PKT_DATA_HEADER)->ulLogicalObjPktPort); \ ((tOCTVOCNET_PKT_DATA_HEADER *)pOCTVOCNET_PKT_DATA_HEADER)->ulDestFifoId = \ @@ -65,23 +66,6 @@ extern "C" { #define mOCTVOCNET_PKT_DATA_HEADER_SWAP( pOCTVOCNET_PKT_DATA_HEADER ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ -#if defined( _OCT_ENDIAN_TYPE_LE_ ) -#define mOCTVOCNET_PKT_DATA_D_HEADER_SWAP( _f_pParms ){ tOCTVOCNET_PKT_DATA_D_HEADER * pOCTVOCNET_PKT_DATA_D_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVOCNET_PKT_DATA_D_HEADER)\ - { mOCTVOCNET_PKT_DATA_HEADER_SWAP( &((tOCTVOCNET_PKT_DATA_D_HEADER *)pOCTVOCNET_PKT_DATA_D_HEADER)->VocNetHeader ); } \ - ((tOCTVOCNET_PKT_DATA_D_HEADER *)pOCTVOCNET_PKT_DATA_D_HEADER)->ulReserved = \ - mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_D_HEADER *)pOCTVOCNET_PKT_DATA_D_HEADER)->ulReserved); \ - ((tOCTVOCNET_PKT_DATA_D_HEADER *)pOCTVOCNET_PKT_DATA_D_HEADER)->ul_Rtp_PktType_Pad_Offset = \ - mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_D_HEADER *)pOCTVOCNET_PKT_DATA_D_HEADER)->ul_Rtp_PktType_Pad_Offset); \ - { tOCT_UINT32 iOCTVOCNET_PKT_DATA_D_HEADER; \ - for( iOCTVOCNET_PKT_DATA_D_HEADER=0; \ - iOCTVOCNET_PKT_DATA_D_HEADER<(3);iOCTVOCNET_PKT_DATA_D_HEADER++ ) \ - ((tOCTVOCNET_PKT_DATA_D_HEADER *)pOCTVOCNET_PKT_DATA_D_HEADER)->aulRtp[iOCTVOCNET_PKT_DATA_D_HEADER] = \ - mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_D_HEADER *)pOCTVOCNET_PKT_DATA_D_HEADER)->aulRtp[iOCTVOCNET_PKT_DATA_D_HEADER]);}\ -} -#else -#define mOCTVOCNET_PKT_DATA_D_HEADER_SWAP( pOCTVOCNET_PKT_DATA_D_HEADER ) -#endif /* _OCT_ENDIAN_TYPE_LE_ */ - #if defined( _OCT_ENDIAN_TYPE_LE_ ) #define mOCTVOCNET_PKT_DATA_F_HEADER_SWAP( _f_pParms ){ tOCTVOCNET_PKT_DATA_F_HEADER * pOCTVOCNET_PKT_DATA_F_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVOCNET_PKT_DATA_F_HEADER)\ { mOCTVOCNET_PKT_DATA_HEADER_SWAP( &((tOCTVOCNET_PKT_DATA_F_HEADER *)pOCTVOCNET_PKT_DATA_F_HEADER)->VocNetHeader ); } \ @@ -94,6 +78,28 @@ extern "C" { #define mOCTVOCNET_PKT_DATA_F_HEADER_SWAP( pOCTVOCNET_PKT_DATA_F_HEADER ) #endif /* _OCT_ENDIAN_TYPE_LE_ */ +#if defined( _OCT_ENDIAN_TYPE_LE_ ) +#define mOCTVOCNET_PKT_DATA_FRAGMENT_HEADER_SWAP( _f_pParms ){ tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER * pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)\ + { mOCTVOCNET_PKT_DATA_F_HEADER_SWAP( &((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->DataHeader ); } \ + ((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulSequenceId = \ + 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)->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 = \ + mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentDataOffset); \ + ((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentDataSize = \ + mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentDataSize); \ + ((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulUserId = \ + mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulUserId); \ +} +#else +#define mOCTVOCNET_PKT_DATA_FRAGMENT_HEADER_SWAP( pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER ) +#endif /* _OCT_ENDIAN_TYPE_LE_ */ + #ifdef __cplusplus } diff --git a/software/include/octvc1/pkt_api/octvc1_pkt_api.h b/software/include/octvc1/pkt_api/octvc1_pkt_api.h index 8acd73e..56c98dd 100644 --- a/software/include/octvc1/pkt_api/octvc1_pkt_api.h +++ b/software/include/octvc1/pkt_api/octvc1_pkt_api.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Revision: $ @@ -216,7 +216,7 @@ typedef struct typedef struct { tOCT_UINT32 ulMaxConnection; /* Maximum connection on this instance */ - tOCT_UINT32 ulMaxSession; /* Maximum session per connection on this instance */ + tOCT_UINT32 ulMaxSession; /* deprecated: Maximum session per connection on this instance */ tOCT_UINT32 ulMaxSyncCmd; /* Maximum simultaneous synchronous command */ @@ -618,7 +618,7 @@ typedef struct struct { tOCT_UINT32 ulTimestamp; /* Event timestamp */ - tOCTVC1_HANDLE hLogicalObj; /* Logical_Object Handle */ + tOCTVC1_HANDLE_OBJECT hLogicalObj; /* Logical_Object Handle */ tOCT_UINT32 ulLogicalObjPktPort;/* Logical_Object Packet_Port */ tOCT_UINT32 ulDestFifoId; /* Destination FIFO ID.*/ tOCT_UINT32 ulEvtId; /* Identifier of the command */ diff --git a/software/include/octvc1/pkt_api/octvc1_pkt_api_default.h b/software/include/octvc1/pkt_api/octvc1_pkt_api_default.h index 8b4706e..9679214 100644 --- a/software/include/octvc1/pkt_api/octvc1_pkt_api_default.h +++ b/software/include/octvc1/pkt_api/octvc1_pkt_api_default.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Revision: $ @@ -331,7 +331,7 @@ extern "C" { { \ tOCTVC1_PKT_API_DATA_SEND_PARMS * _pParms; \ _pParms = (_f_pParms); \ - _pParms->ulFormat = cOCTVOCNET_PKT_FORMAT_D; \ + _pParms->ulFormat = cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT; \ _pParms->ulLength = 0; \ _pParms->pData = NULL; \ } diff --git a/software/include/octvc1/pkt_api/octvc1_pkt_api_rc.h b/software/include/octvc1/pkt_api/octvc1_pkt_api_rc.h index c6dcdce..d8eceda 100644 --- a/software/include/octvc1/pkt_api/octvc1_pkt_api_rc.h +++ b/software/include/octvc1/pkt_api/octvc1_pkt_api_rc.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_PKT_API_RC.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the return codes for the PKT_API API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_PKT_API_RC.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the return codes for the PKT_API API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,49 +18,49 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef OCTVC1_PKT_API_RC_H__ -#define OCTVC1_PKT_API_RC_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octvc1_generic_rc.h" - -/**************************************************************************** - PKT_API return codes - ****************************************************************************/ -#define cOCTVC1_PKT_API_RC_OK ( 0x0000 ) -#define cOCTVC1_PKT_API_RC_OS_ERROR ( 0x0001 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_TRANSPORT_ERROR ( 0x0002 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_TIMEOUT ( 0x0003 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_LOCAL_MAC_INDEX_NOT_FOUND ( 0x0004 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_BAD_PARAM ( 0x0005 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_INST_CNCT_NOMORE ( 0x0100 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_INST_PKT_NOMORE ( 0x0101 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_INST_SYNC_TOOMANY ( 0x0102 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_INST_CNCT_DEP ( 0x0103 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_INST_DISCOVER_INPROGRESS ( 0x0104 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_INST_RSP_TRUNCATE ( 0x0105 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_INST_TERMINATED ( 0x0106 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_CNCT_SESS_NOMORE ( 0x0200 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_CNCT_SESS_DEP ( 0x0201 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_CNCT_BRIDGE_DEP ( 0x0202 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_CNCT_ALREADY_OPEN ( 0x0203 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_INTERFACE_NAME_NOT_FOUND ( 0x0204 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_DEPENDENCIES ( 0x0205 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_SESS_CLOSE ( 0x0206 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_CNCT_CLOSE ( 0x0207 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_SESS_ALREADY_OPEN ( 0x0208 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_NOT_IMPLEMENT_YET ( 0x0209 + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_DISPATCHER_NOT_READY ( 0x020A + cOCTVC1_PKT_API_RC_BASE ) -#define cOCTVC1_PKT_API_RC_REQUIRES_MULTI_THREAD ( 0x020B + cOCTVC1_PKT_API_RC_BASE ) - -#endif /* OCTVC1_PKT_API_RC_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef OCTVC1_PKT_API_RC_H__ +#define OCTVC1_PKT_API_RC_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octvc1_generic_rc.h" + +/**************************************************************************** + PKT_API return codes + ****************************************************************************/ +#define cOCTVC1_PKT_API_RC_OK ( 0x0000 ) +#define cOCTVC1_PKT_API_RC_OS_ERROR ( 0x0001 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_TRANSPORT_ERROR ( 0x0002 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_TIMEOUT ( 0x0003 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_LOCAL_MAC_INDEX_NOT_FOUND ( 0x0004 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_BAD_PARAM ( 0x0005 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_INST_CNCT_NOMORE ( 0x0100 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_INST_PKT_NOMORE ( 0x0101 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_INST_SYNC_TOOMANY ( 0x0102 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_INST_CNCT_DEP ( 0x0103 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_INST_DISCOVER_INPROGRESS ( 0x0104 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_INST_RSP_TRUNCATE ( 0x0105 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_INST_TERMINATED ( 0x0106 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_CNCT_SESS_NOMORE ( 0x0200 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_CNCT_SESS_DEP ( 0x0201 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_CNCT_BRIDGE_DEP ( 0x0202 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_CNCT_ALREADY_OPEN ( 0x0203 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_INTERFACE_NAME_NOT_FOUND ( 0x0204 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_DEPENDENCIES ( 0x0205 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_SESS_CLOSE ( 0x0206 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_CNCT_CLOSE ( 0x0207 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_SESS_ALREADY_OPEN ( 0x0208 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_NOT_IMPLEMENT_YET ( 0x0209 + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_DISPATCHER_NOT_READY ( 0x020A + cOCTVC1_PKT_API_RC_BASE ) +#define cOCTVC1_PKT_API_RC_REQUIRES_MULTI_THREAD ( 0x020B + cOCTVC1_PKT_API_RC_BASE ) + +#endif /* OCTVC1_PKT_API_RC_H__ */ + diff --git a/software/include/octvc1/pkt_api/octvc1_pkt_api_version.h b/software/include/octvc1/pkt_api/octvc1_pkt_api_version.h index e056b37..f334809 100644 --- a/software/include/octvc1/pkt_api/octvc1_pkt_api_version.h +++ b/software/include/octvc1/pkt_api/octvc1_pkt_api_version.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: Octasic Application Development Framework OCTADF-03.03.00-B1571 (2015/03/24) +Release: Octasic Application Development Framework OCTADF-04.00.00-B1829 (2015/07/02) $Revision: $ @@ -49,10 +49,10 @@ extern "C" { bit[17:11]: Bug fix version bit[10:0]: Build number */ -#define cOCTVC1_PKT_API_VERSION_MAJOR 3 +#define cOCTVC1_PKT_API_VERSION_MAJOR 4 #define cOCTVC1_PKT_API_VERSION_MINOR 3 -#define cOCTVC1_PKT_API_VERSION_MAINTENANCE 4 -#define cOCTVC1_PKT_API_VERSION_BUILD 1571 +#define cOCTVC1_PKT_API_VERSION_MAINTENANCE 0 +#define cOCTVC1_PKT_API_VERSION_BUILD 1829 #define cOCTVC1_PKT_API_VERSION_ID ( (cOCTVC1_PKT_API_VERSION_MAJOR << 25) + \ (cOCTVC1_PKT_API_VERSION_MINOR << 18) + \ diff --git a/software/include/octvc1/test/octvc1_test_api.h b/software/include/octvc1/test/octvc1_test_api.h index e744107..69a6286 100644 --- a/software/include/octvc1/test/octvc1_test_api.h +++ b/software/include/octvc1/test/octvc1_test_api.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_TEST_API.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the definition of the TEST API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_TEST_API.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the definition of the TEST API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,63 +18,63 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_TEST_API_H__ -#define __OCTVC1_TEST_API_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../../octdev_types.h" -#include "../../octdev_devices.h" -#include "../octvc1_msg.h" -#include "../octvc1_handle.h" -#include "../octvc1_cursor.h" -#include "../octvc1_list.h" - -#include "octvc1_test_id.h" -#include "octvc1_test_rc.h" - -/************************ COMMON DEFINITIONS *******************************/ - -/*------------------------------------------------------------------------------------- - Test API constant definitions --------------------------------------------------------------------------------------*/ - -#define cOCTVC1_TEST_DESCR_MAX_LENGTH 127 /* Maximum char in test description string. */ -#define cOCTVC1_TEST_USAGE_MAX_LENGTH 511 /* Maximum char in test description string. */ -#define cOCTVC1_TEST_PARMS_MAX_LENGTH 511 /* Maximum char in test parameters string. */ -#define cOCTVC1_TEST_RUNNER_TEST_MAX_OBJ 8 /* Maximum object handle to pass as test parameter. */ -#define cOCTVC1_TEST_RUNNER_TEST_STATS_MAX_LENGTH 1023 /* Maximum number of char in szStats. */ - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_EXEC_PARMS - - Members: - ahObj - Object handle to pass as test parameter. - See Test Descriptor Usage for more information. - szParms - String Test parameter. - The buffer name can be up to cOCTVC1_TEST_PARMS_MAX_LENGTH characters long, - excluding the terminating NULL character. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_HANDLE_OBJECT ahObj[cOCTVC1_TEST_RUNNER_TEST_MAX_OBJ]; - tOCT_UINT8 szParms[(cOCTVC1_TEST_PARMS_MAX_LENGTH+1)]; - -} tOCTVC1_TEST_EXEC_PARMS; - -/***************************** METHODS *************************************/ - -/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ - -#endif /* __OCTVC1_TEST_API_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_TEST_API_H__ +#define __OCTVC1_TEST_API_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../../octdev_types.h" +#include "../../octdev_devices.h" +#include "../octvc1_msg.h" +#include "../octvc1_handle.h" +#include "../octvc1_cursor.h" +#include "../octvc1_list.h" + +#include "octvc1_test_id.h" +#include "octvc1_test_rc.h" + +/************************ COMMON DEFINITIONS *******************************/ + +/*------------------------------------------------------------------------------------- + Test API constant definitions +-------------------------------------------------------------------------------------*/ + +#define cOCTVC1_TEST_DESCR_MAX_LENGTH 127 /* Maximum char in test description string. */ +#define cOCTVC1_TEST_USAGE_MAX_LENGTH 511 /* Maximum char in test description string. */ +#define cOCTVC1_TEST_PARMS_MAX_LENGTH 511 /* Maximum char in test parameters string. */ +#define cOCTVC1_TEST_RUNNER_TEST_MAX_OBJ 8 /* Maximum object handle to pass as test parameter. */ +#define cOCTVC1_TEST_RUNNER_TEST_STATS_MAX_LENGTH 1023 /* Maximum number of char in szStats. */ + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_EXEC_PARMS + + Members: + ahObj + Object handle to pass as test parameter. + See Test Descriptor Usage for more information. + szParms + String Test parameter. + The buffer name can be up to cOCTVC1_TEST_PARMS_MAX_LENGTH characters long, + excluding the terminating NULL character. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_HANDLE_OBJECT ahObj[cOCTVC1_TEST_RUNNER_TEST_MAX_OBJ]; + tOCT_UINT8 szParms[(cOCTVC1_TEST_PARMS_MAX_LENGTH+1)]; + +} tOCTVC1_TEST_EXEC_PARMS; + +/***************************** METHODS *************************************/ + +/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ + +#endif /* __OCTVC1_TEST_API_H__ */ + diff --git a/software/include/octvc1/test/octvc1_test_api_priv.h b/software/include/octvc1/test/octvc1_test_api_priv.h index 30ce6b9..fce309b 100644 --- a/software/include/octvc1/test/octvc1_test_api_priv.h +++ b/software/include/octvc1/test/octvc1_test_api_priv.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_TEST_API_PRIV.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the definition of the TEST API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_TEST_API_PRIV.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the definition of the TEST API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,552 +18,552 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_TEST_API_PRIV_H__ -#define __OCTVC1_TEST_API_PRIV_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_test_api.h" -#include "octvc1_test_id_priv.h" -#include "octvc1_test_rc_priv.h" - -/************************ COMMON DEFINITIONS *******************************/ - - -/***************************** METHODS *************************************/ -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_LIST_CMD - - Members: - Header - OCTVC1 Message Header - ObjectCursor - Object cursor --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; - -} tOCTVC1_TEST_MSG_DESCR_LIST_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_LIST_RSP - - Members: - Header - OCTVC1 Message Header - ObjectCursor - Object cursor - ObjectNameList - Object32 named list. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; - tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; - -} tOCTVC1_TEST_MSG_DESCR_LIST_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_INFO_CMD - - Members: - Header - OCTVC1 Message Header - hDescr - Test Descriptor identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hDescr; - -} tOCTVC1_TEST_MSG_DESCR_INFO_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_INFO_RSP - - Members: - Header - OCTVC1 Message Header - hDescr - Test Descriptor identifier. - szName - Test name string (Array of bytes) . - The buffer name can be up to cOCTVC1_TEST_NAME_MAX_LENGTH characters long, - excluding the terminating NULL character. - szDescription - Test description string (Array of bytes) . - The buffer name can be up to cOCTVC1_TEST_DESCR_MAX_LENGTH characters long, - excluding the terminating NULL character. - szUsage - Test usage description . - The buffer name can be up to cOCTVC1_TEST_USAGE_MAX_LENGTH characters long, - excluding the terminating NULL character. --------------------------------------------------------------------------------------*/ -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)]; - -} tOCTVC1_TEST_MSG_DESCR_INFO_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CMD - - Members: - Header - OCTVC1 Message Header - szName - Descriptor Test name string (Array of bytes) . - The buffer name can be up to cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH characters - long, excluding the terminating NULL character. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)]; - -} tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_RSP - - Members: - Header - OCTVC1 Message Header - hDescr - Test Descriptor identifier. - szName - Test name string (Array of bytes) . - The buffer name can be up to cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH characters - long, excluding the terminating NULL character. - szDescription - Test description string (Array of bytes) . - The buffer name can be up to cOCTVC1_TEST_DESCR_MAX_LENGTH characters long, - excluding the terminating NULL character. - szUsage - Test usage description . - The buffer name can be up to cOCTVC1_TEST_USAGE_MAX_LENGTH characters long, - excluding the terminating NULL character. --------------------------------------------------------------------------------------*/ -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)]; - -} tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_STATS_CMD - - Members: - Header - OCTVC1 Message Header - hDescr - Test Descriptor identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hDescr; - -} tOCTVC1_TEST_MSG_DESCR_STATS_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_STATS_RSP - - Members: - Header - OCTVC1 Message Header - hDescr - Test Descriptor identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hDescr; - -} tOCTVC1_TEST_MSG_DESCR_STATS_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CMD - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_RSP - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CMD - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_RSP - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_START_CMD - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_START_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_START_RSP - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_START_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CMD - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_RSP - - Members: - Header - OCTVC1 Message Header --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CMD - This command adds a test in the runner server to the server. - - Members: - Header - OCTVC1 Message Header - hDescr - Default: cOCTVC1_HANDLE_INVALID - Test Descriptor. - Parms - test parameter. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hDescr; - tOCTVC1_TEST_EXEC_PARMS Parms; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_RSP - - Members: - Header - OCTVC1 Message Header - hTest - Test Identifier. - szDisplayName - Descriptor Test name string (Array of bytes) . - The buffer name can be up to cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH characters - long, excluding the terminating NULL character. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - tOCT_UINT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)]; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CMD - This command removes a redundant MGW. The redundant MGW’s resources are freed. - - Members: - Header - OCTVC1 Message Header - hTest - Default: cOCTVC1_HANDLE_INVALID - Test identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_RSP - - Members: - Header - OCTVC1 Message Header - hTest - Test identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CMD - - Members: - Header - OCTVC1 Message Header - ObjectCursor - Object cursor --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_RSP - - Members: - Header - OCTVC1 Message Header - ObjectCursor - Object cursor - ObjectNameList - Object List structure. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; - tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CMD - - Members: - Header - OCTVC1 Message Header - hTest - Default: cOCTVC1_HANDLE_INVALID - Transport identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_RSP - - Members: - Header - OCTVC1 Message Header - hTest - Transport identifier. - hDescr - Default: cOCTVC1_HANDLE_INVALID - Transport identifier. - Parms - test parameter. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - tOCTVC1_HANDLE_OBJECT hDescr; - tOCTVC1_TEST_EXEC_PARMS Parms; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CMD - - Members: - Header - OCTVC1 Message Header - hTest - Default: cOCTVC1_HANDLE_INVALID - Transport identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_RSP - - Members: - Header - OCTVC1 Message Header - hTest - Transport identifier. - szStats - String (Array of bytes) containing the parameter of transport remote - destination parameter. - The buffer name can be up to cOCTVC1_TEST_RUNNER_TEST_STATS_MAX_LENGTH - characters long, excluding the terminating NULL character. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - tOCT_UINT8 szStats[(cOCTVC1_TEST_RUNNER_TEST_STATS_MAX_LENGTH+1)]; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CMD - - Members: - Header - OCTVC1 Message Header - hTest - Default: cOCTVC1_HANDLE_INVALID - Transport identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_RSP - - Members: - Header - OCTVC1 Message Header - hTest - Transport identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_RSP; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CMD - - Members: - Header - OCTVC1 Message Header - hTest - Default: cOCTVC1_HANDLE_INVALID - Transport identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CMD; - -/*------------------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_RSP - - Members: - Header - OCTVC1 Message Header - hTest - Transport identifier. --------------------------------------------------------------------------------------*/ -typedef struct -{ - tOCTVC1_MSG_HEADER Header; - tOCTVC1_HANDLE_OBJECT hTest; - -} tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_RSP; - - -/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ - -#endif /* __OCTVC1_TEST_API_PRIV_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_TEST_API_PRIV_H__ +#define __OCTVC1_TEST_API_PRIV_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "octvc1_test_api.h" +#include "octvc1_test_id_priv.h" +#include "octvc1_test_rc_priv.h" + +/************************ COMMON DEFINITIONS *******************************/ + + +/***************************** METHODS *************************************/ +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_DESCR_LIST_CMD + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + +} tOCTVC1_TEST_MSG_DESCR_LIST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_DESCR_LIST_RSP + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor + ObjectNameList + Object32 named list. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; + +} tOCTVC1_TEST_MSG_DESCR_LIST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_DESCR_INFO_CMD + + Members: + Header + OCTVC1 Message Header + hDescr + Test Descriptor identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hDescr; + +} tOCTVC1_TEST_MSG_DESCR_INFO_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_DESCR_INFO_RSP + + Members: + Header + OCTVC1 Message Header + hDescr + Test Descriptor identifier. + szName + Test name string (Array of bytes) . + The buffer name can be up to cOCTVC1_TEST_NAME_MAX_LENGTH characters long, + excluding the terminating NULL character. + szDescription + Test description string (Array of bytes) . + The buffer name can be up to cOCTVC1_TEST_DESCR_MAX_LENGTH characters long, + excluding the terminating NULL character. + szUsage + Test usage description . + The buffer name can be up to cOCTVC1_TEST_USAGE_MAX_LENGTH characters long, + excluding the terminating NULL character. +-------------------------------------------------------------------------------------*/ +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)]; + +} tOCTVC1_TEST_MSG_DESCR_INFO_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CMD + + Members: + Header + OCTVC1 Message Header + szName + Descriptor Test name string (Array of bytes) . + The buffer name can be up to cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH characters + long, excluding the terminating NULL character. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCT_UINT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)]; + +} tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_RSP + + Members: + Header + OCTVC1 Message Header + hDescr + Test Descriptor identifier. + szName + Test name string (Array of bytes) . + The buffer name can be up to cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH characters + long, excluding the terminating NULL character. + szDescription + Test description string (Array of bytes) . + The buffer name can be up to cOCTVC1_TEST_DESCR_MAX_LENGTH characters long, + excluding the terminating NULL character. + szUsage + Test usage description . + The buffer name can be up to cOCTVC1_TEST_USAGE_MAX_LENGTH characters long, + excluding the terminating NULL character. +-------------------------------------------------------------------------------------*/ +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)]; + +} tOCTVC1_TEST_MSG_DESCR_INFO_BY_NAME_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_DESCR_STATS_CMD + + Members: + Header + OCTVC1 Message Header + hDescr + Test Descriptor identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hDescr; + +} tOCTVC1_TEST_MSG_DESCR_STATS_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_DESCR_STATS_RSP + + Members: + Header + OCTVC1 Message Header + hDescr + Test Descriptor identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hDescr; + +} tOCTVC1_TEST_MSG_DESCR_STATS_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CMD + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CMD + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_START_CMD + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_START_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_START_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_START_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CMD + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_RSP + + Members: + Header + OCTVC1 Message Header +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CMD + This command adds a test in the runner server to the server. + + Members: + Header + OCTVC1 Message Header + hDescr + Default: cOCTVC1_HANDLE_INVALID + Test Descriptor. + Parms + test parameter. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hDescr; + tOCTVC1_TEST_EXEC_PARMS Parms; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_RSP + + Members: + Header + OCTVC1 Message Header + hTest + Test Identifier. + szDisplayName + Descriptor Test name string (Array of bytes) . + The buffer name can be up to cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH characters + long, excluding the terminating NULL character. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + tOCT_UINT8 szDisplayName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)]; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CMD + This command removes a redundant MGW. The redundant MGW’s resources are freed. + + Members: + Header + OCTVC1 Message Header + hTest + Default: cOCTVC1_HANDLE_INVALID + Test identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_RSP + + Members: + Header + OCTVC1 Message Header + hTest + Test identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CMD + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_RSP + + Members: + Header + OCTVC1 Message Header + ObjectCursor + Object cursor + ObjectNameList + Object List structure. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_CURSOR_HANDLE_OBJECT_GET ObjectCursor; + tOCTVC1_LIST_NAME_OBJECT32_GET ObjectNameList; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CMD + + Members: + Header + OCTVC1 Message Header + hTest + Default: cOCTVC1_HANDLE_INVALID + Transport identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_RSP + + Members: + Header + OCTVC1 Message Header + hTest + Transport identifier. + hDescr + Default: cOCTVC1_HANDLE_INVALID + Transport identifier. + Parms + test parameter. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + tOCTVC1_HANDLE_OBJECT hDescr; + tOCTVC1_TEST_EXEC_PARMS Parms; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CMD + + Members: + Header + OCTVC1 Message Header + hTest + Default: cOCTVC1_HANDLE_INVALID + Transport identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_RSP + + Members: + Header + OCTVC1 Message Header + hTest + Transport identifier. + szStats + String (Array of bytes) containing the parameter of transport remote + destination parameter. + The buffer name can be up to cOCTVC1_TEST_RUNNER_TEST_STATS_MAX_LENGTH + characters long, excluding the terminating NULL character. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + tOCT_UINT8 szStats[(cOCTVC1_TEST_RUNNER_TEST_STATS_MAX_LENGTH+1)]; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CMD + + Members: + Header + OCTVC1 Message Header + hTest + Default: cOCTVC1_HANDLE_INVALID + Transport identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_RSP + + Members: + Header + OCTVC1 Message Header + hTest + Transport identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_RSP; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CMD + + Members: + Header + OCTVC1 Message Header + hTest + Default: cOCTVC1_HANDLE_INVALID + Transport identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CMD; + +/*------------------------------------------------------------------------------------- + tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_RSP + + Members: + Header + OCTVC1 Message Header + hTest + Transport identifier. +-------------------------------------------------------------------------------------*/ +typedef struct +{ + tOCTVC1_MSG_HEADER Header; + tOCTVC1_HANDLE_OBJECT hTest; + +} tOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_RSP; + + +/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/ + +#endif /* __OCTVC1_TEST_API_PRIV_H__ */ + diff --git a/software/include/octvc1/test/octvc1_test_api_priv_swap.h b/software/include/octvc1/test/octvc1_test_api_priv_swap.h index 1c32b10..e8f1cc7 100644 --- a/software/include/octvc1/test/octvc1_test_api_priv_swap.h +++ b/software/include/octvc1/test/octvc1_test_api_priv_swap.h @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ diff --git a/software/include/octvc1/test/octvc1_test_api_swap.h b/software/include/octvc1/test/octvc1_test_api_swap.h index 9489b99..e9eab2c 100644 --- a/software/include/octvc1/test/octvc1_test_api_swap.h +++ b/software/include/octvc1/test/octvc1_test_api_swap.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ #ifndef __OCTVC1_TEST_API_SWAP_H__ diff --git a/software/include/octvc1/test/octvc1_test_base.h b/software/include/octvc1/test/octvc1_test_base.h index 144a959..1e326ad 100644 --- a/software/include/octvc1/test/octvc1_test_base.h +++ b/software/include/octvc1/test/octvc1_test_base.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_TEST_BASE.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the definition of the OCTVC1 API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_TEST_BASE.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the definition of the OCTVC1 API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,33 +18,33 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_TEST_BASE_H__ -#define __OCTVC1_TEST_BASE_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "../octvc1_base.h" - -/**************************************************************************** - Module unique identifiers - ****************************************************************************/ -#define cOCTVC1_TEST_UID ( 0x05 ) - -/**************************************************************************** - Module identifier bases - ****************************************************************************/ - -/* Module: TEST */ -#define cOCTVC1_TEST_CID_BASE ( (cOCTVC1_TEST_UID << 16) + cOCTVC1_CID_BASE ) -#define cOCTVC1_TEST_RC_BASE ( (cOCTVC1_TEST_UID << 16) + cOCTVC1_RC_BASE ) - -#endif /* __OCTVC1_TEST_BASE_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_TEST_BASE_H__ +#define __OCTVC1_TEST_BASE_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "../octvc1_base.h" + +/**************************************************************************** + Module unique identifiers + ****************************************************************************/ +#define cOCTVC1_TEST_UID ( 0x05 ) + +/**************************************************************************** + Module identifier bases + ****************************************************************************/ + +/* Module: TEST */ +#define cOCTVC1_TEST_CID_BASE ( (cOCTVC1_TEST_UID << 16) + cOCTVC1_CID_BASE ) +#define cOCTVC1_TEST_RC_BASE ( (cOCTVC1_TEST_UID << 16) + cOCTVC1_RC_BASE ) + +#endif /* __OCTVC1_TEST_BASE_H__ */ + diff --git a/software/include/octvc1/test/octvc1_test_default.h b/software/include/octvc1/test/octvc1_test_default.h index 2308059..966018d 100644 --- a/software/include/octvc1/test/octvc1_test_default.h +++ b/software/include/octvc1/test/octvc1_test_default.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_TEST_DEFAULT.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the event definition of the TEST API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_TEST_DEFAULT.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the event definition of the TEST API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,22 +18,22 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_TEST_DEFAULT_H__ -#define __OCTVC1_TEST_DEFAULT_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_test_api.h" - -/***************************** COMMAND DEFAULT *****************************/ - -#endif /* __OCTVC1_TEST_DEFAULT_H__ */ - +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Release: OCTSDR Software Development Kit OCTSDR_GSM-02.03.00-B572 (2015/08/13) + +$Octasic_Revision: $ + +\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ + +#ifndef __OCTVC1_TEST_DEFAULT_H__ +#define __OCTVC1_TEST_DEFAULT_H__ + + +/***************************** INCLUDE FILES *******************************/ +#include "octvc1_test_api.h" + +/***************************** COMMAND DEFAULT *****************************/ + +#endif /* __OCTVC1_TEST_DEFAULT_H__ */ + diff --git a/software/include/octvc1/test/octvc1_test_default_priv.h b/software/include/octvc1/test/octvc1_test_default_priv.h index 25348ff..4110c51 100644 --- a/software/include/octvc1/test/octvc1_test_default_priv.h +++ b/software/include/octvc1/test/octvc1_test_default_priv.h @@ -1,11 +1,11 @@ -/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ - -File: OCTVC1_TEST_DEFAULT_PRIV.h - -Copyright (c) 2015 Octasic Inc. All rights reserved. - -Description: Contains the event definition of the TEST API. - +/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\ + +File: OCTVC1_TEST_DEFAULT_PRIV.h + +Copyright (c) 2015 Octasic Inc. All rights reserved. + +Description: Contains the event definition of the TEST API. + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -18,507 +18,507 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Release: OCTSDR Software Development Kit OCTSDR_GSM-02.02.04-B403 (2015/04/27) - -$Octasic_Revision: $ - -\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ - -#ifndef __OCTVC1_TEST_DEFAULT_PRIV_H__ -#define __OCTVC1_TEST_DEFAULT_PRIV_H__ - - -/***************************** INCLUDE FILES *******************************/ -#include "octvc1_test_api_priv.h" -#include "octvc1_test_default.h" - -/***************************** COMMAND DEFAULT *****************************/ - -/*-------------------------------------------------------------------------- - tOCTVC1_TEST_MSG_DESCR_LIST_CMD -----------------------------------------------------------------------------*/ -#ifdef OCTVC1_OPT_DECLARE_DEFAULTS - -const tOCTVC1_TEST_MSG_DESCR_LIST_CMD buf_tOCTVC1_TEST_MSG_DESCR_LIST_CMD = -{ - { /* Header */ - ((sizeof(tOCTVC1_TEST_MSG_DESCR_LIST_CMD)<