aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-09-30 09:04:51 +0200
committerHarald Welte <laforge@gnumonks.org>2016-09-30 09:04:51 +0200
commitb50a162c9c239cc21968994799cdef25c36c04d9 (patch)
tree1ffb76d8685bd65db943a1ee0b0367534296dccc
parent953a258aadf18c05e8128a339f15b1c5bb377cfd (diff)
Import of OCTSDR_GSM-02.05.00-B780 (multi-TRX Branch)multi_trx
-rw-r--r--octdev_devices.h2
-rw-r--r--octdev_devices_swap.h2
-rw-r--r--octdev_macro.h2
-rw-r--r--octdev_opus_rev.h2
-rw-r--r--octdev_rc_base.h2
-rw-r--r--octdev_types.h2
-rw-r--r--octdev_types_swap.h2
-rw-r--r--octoptions.h2
-rw-r--r--octpkt/octpkt_hdr.h2
-rw-r--r--octpkt/octpkt_hdr_swap.h2
-rw-r--r--octpkt/octpkt_hdrxl.h2
-rw-r--r--octpkt/octpkt_hdrxl_swap.h2
-rw-r--r--octvc1/ctrl/octvc1_ctrl_api.h2
-rw-r--r--octvc1/ctrl/octvc1_ctrl_api_priv.h2
-rw-r--r--octvc1/ctrl/octvc1_ctrl_api_priv_swap.h2
-rw-r--r--octvc1/ctrl/octvc1_ctrl_api_swap.h2
-rw-r--r--octvc1/ctrl/octvc1_ctrl_base.h2
-rw-r--r--octvc1/ctrl/octvc1_ctrl_id.h2
-rw-r--r--octvc1/ctrl/octvc1_ctrl_id_priv.h2
-rw-r--r--octvc1/ctrl/octvc1_ctrl_version.h6
-rw-r--r--octvc1/gsm/octvc1_gsm_api.h192
-rw-r--r--octvc1/gsm/octvc1_gsm_api_priv.h6
-rw-r--r--octvc1/gsm/octvc1_gsm_api_priv_swap.h2
-rw-r--r--octvc1/gsm/octvc1_gsm_api_swap.h102
-rw-r--r--octvc1/gsm/octvc1_gsm_base.h3
-rw-r--r--octvc1/gsm/octvc1_gsm_default.h719
-rw-r--r--octvc1/gsm/octvc1_gsm_default_priv.h4
-rw-r--r--octvc1/gsm/octvc1_gsm_evt.h2
-rw-r--r--octvc1/gsm/octvc1_gsm_evt_priv.h2
-rw-r--r--octvc1/gsm/octvc1_gsm_evt_priv_swap.h2
-rw-r--r--octvc1/gsm/octvc1_gsm_evt_swap.h2
-rw-r--r--octvc1/gsm/octvc1_gsm_id.h15
-rw-r--r--octvc1/gsm/octvc1_gsm_id_priv.h6
-rw-r--r--octvc1/gsm/octvc1_gsm_rc.h14
-rw-r--r--octvc1/gsm/octvc1_gsm_rc_priv.h2
-rw-r--r--octvc1/gsm/octvc1_gsm_version.h6
-rw-r--r--octvc1/hw/octvc1_hw_api.h30
-rw-r--r--octvc1/hw/octvc1_hw_api_priv.h2
-rw-r--r--octvc1/hw/octvc1_hw_api_priv_swap.h2
-rw-r--r--octvc1/hw/octvc1_hw_api_swap.h7
-rw-r--r--octvc1/hw/octvc1_hw_base.h2
-rw-r--r--octvc1/hw/octvc1_hw_default.h2
-rw-r--r--octvc1/hw/octvc1_hw_default_priv.h2
-rw-r--r--octvc1/hw/octvc1_hw_evt.h2
-rw-r--r--octvc1/hw/octvc1_hw_evt_priv.h2
-rw-r--r--octvc1/hw/octvc1_hw_evt_priv_swap.h2
-rw-r--r--octvc1/hw/octvc1_hw_evt_swap.h2
-rw-r--r--octvc1/hw/octvc1_hw_id.h2
-rw-r--r--octvc1/hw/octvc1_hw_id_priv.h2
-rw-r--r--octvc1/hw/octvc1_hw_rc.h2
-rw-r--r--octvc1/hw/octvc1_hw_rc_priv.h2
-rw-r--r--octvc1/hw/octvc1_hw_version.h6
-rw-r--r--octvc1/irsc/octvc1_irsc_api.h330
-rw-r--r--octvc1/irsc/octvc1_irsc_api_priv.h4
-rw-r--r--octvc1/irsc/octvc1_irsc_api_priv_swap.h2
-rw-r--r--octvc1/irsc/octvc1_irsc_api_swap.h183
-rw-r--r--octvc1/irsc/octvc1_irsc_base.h2
-rw-r--r--octvc1/irsc/octvc1_irsc_default.h65
-rw-r--r--octvc1/irsc/octvc1_irsc_default_priv.h2
-rw-r--r--octvc1/irsc/octvc1_irsc_evt.h33
-rw-r--r--octvc1/irsc/octvc1_irsc_evt_priv.h2
-rw-r--r--octvc1/irsc/octvc1_irsc_evt_priv_swap.h2
-rw-r--r--octvc1/irsc/octvc1_irsc_evt_swap.h20
-rw-r--r--octvc1/irsc/octvc1_irsc_id.h11
-rw-r--r--octvc1/irsc/octvc1_irsc_id_priv.h2
-rw-r--r--octvc1/irsc/octvc1_irsc_rc.h9
-rw-r--r--octvc1/irsc/octvc1_irsc_rc_priv.h2
-rw-r--r--octvc1/irsc/octvc1_irsc_version.h6
-rw-r--r--octvc1/main/octvc1_main_api.h337
-rw-r--r--octvc1/main/octvc1_main_api_priv.h6
-rw-r--r--octvc1/main/octvc1_main_api_priv_swap.h2
-rw-r--r--octvc1/main/octvc1_main_api_swap.h212
-rw-r--r--octvc1/main/octvc1_main_base.h3
-rw-r--r--octvc1/main/octvc1_main_default.h252
-rw-r--r--octvc1/main/octvc1_main_default_priv.h4
-rw-r--r--octvc1/main/octvc1_main_evt.h36
-rw-r--r--octvc1/main/octvc1_main_evt_priv.h2
-rw-r--r--octvc1/main/octvc1_main_evt_priv_swap.h2
-rw-r--r--octvc1/main/octvc1_main_evt_swap.h16
-rw-r--r--octvc1/main/octvc1_main_id.h25
-rw-r--r--octvc1/main/octvc1_main_id_priv.h6
-rw-r--r--octvc1/main/octvc1_main_rc.h11
-rw-r--r--octvc1/main/octvc1_main_rc_priv.h2
-rw-r--r--octvc1/main/octvc1_main_version.h6
-rw-r--r--octvc1/octvc1_api.h2
-rw-r--r--octvc1/octvc1_api_swap.h2
-rw-r--r--octvc1/octvc1_app.h6
-rw-r--r--octvc1/octvc1_base.h4
-rw-r--r--octvc1/octvc1_buffer.h2
-rw-r--r--octvc1/octvc1_buffer_swap.h2
-rw-r--r--octvc1/octvc1_cursor.h2
-rw-r--r--octvc1/octvc1_cursor_swap.h2
-rw-r--r--octvc1/octvc1_eth.h2
-rw-r--r--octvc1/octvc1_eth_swap.h2
-rw-r--r--octvc1/octvc1_fifo.h11
-rw-r--r--octvc1/octvc1_file.h2
-rw-r--r--octvc1/octvc1_file_swap.h2
-rw-r--r--octvc1/octvc1_generic_rc.h2
-rw-r--r--octvc1/octvc1_handle.h2
-rw-r--r--octvc1/octvc1_handle_swap.h2
-rw-r--r--octvc1/octvc1_id2string.h30
-rw-r--r--octvc1/octvc1_id2string_priv.h2
-rw-r--r--octvc1/octvc1_ip.h2
-rw-r--r--octvc1/octvc1_ip_swap.h2
-rw-r--r--octvc1/octvc1_ipc.h84
-rw-r--r--octvc1/octvc1_ipc_swap.h55
-rw-r--r--octvc1/octvc1_licensing_rc.h2
-rw-r--r--octvc1/octvc1_list.h2
-rw-r--r--octvc1/octvc1_list_swap.h2
-rw-r--r--octvc1/octvc1_log.h11
-rw-r--r--octvc1/octvc1_log_swap.h5
-rw-r--r--octvc1/octvc1_mac.h2
-rw-r--r--octvc1/octvc1_macro.h2
-rw-r--r--octvc1/octvc1_module.h63
-rw-r--r--octvc1/octvc1_module_swap.h18
-rw-r--r--octvc1/octvc1_msg.h12
-rw-r--r--octvc1/octvc1_msg_swap.h2
-rw-r--r--octvc1/octvc1_priv_swap_hdrs.h2
-rw-r--r--octvc1/octvc1_privacy.h2
-rw-r--r--octvc1/octvc1_process.h6
-rw-r--r--octvc1/octvc1_process_swap.h4
-rw-r--r--octvc1/octvc1_radio.h32
-rw-r--r--octvc1/octvc1_radio_swap.h12
-rw-r--r--octvc1/octvc1_rc2string.h38
-rw-r--r--octvc1/octvc1_swap_hdrs.h4
-rw-r--r--octvc1/octvc1_tap.h14
-rw-r--r--octvc1/octvc1_tap_swap.h2
-rw-r--r--octvc1/octvc1_udp.h2
-rw-r--r--octvc1/octvc1_user_id.h57
-rw-r--r--octvc1/octvc1_user_id_swap.h52
-rw-r--r--octvc1/octvc1_vlan.h2
-rw-r--r--octvc1/octvc1_vlan_swap.h2
-rw-r--r--octvc1/octvocnet_pkt.h18
-rw-r--r--octvc1/octvocnet_pkt_swap.h6
-rw-r--r--octvc1/pkt_api/octvc1_pkt_api.h4
-rw-r--r--octvc1/pkt_api/octvc1_pkt_api_default.h8
-rw-r--r--octvc1/pkt_api/octvc1_pkt_api_rc.h2
-rw-r--r--octvc1/pkt_api/octvc1_pkt_api_version.h10
-rw-r--r--octvc1/test/octvc1_test_api.h2
-rw-r--r--octvc1/test/octvc1_test_api_priv.h2
-rw-r--r--octvc1/test/octvc1_test_api_priv_swap.h2
-rw-r--r--octvc1/test/octvc1_test_api_swap.h2
-rw-r--r--octvc1/test/octvc1_test_base.h2
-rw-r--r--octvc1/test/octvc1_test_default.h2
-rw-r--r--octvc1/test/octvc1_test_default_priv.h2
-rw-r--r--octvc1/test/octvc1_test_evt.h2
-rw-r--r--octvc1/test/octvc1_test_evt_priv.h2
-rw-r--r--octvc1/test/octvc1_test_evt_priv_swap.h2
-rw-r--r--octvc1/test/octvc1_test_evt_swap.h2
-rw-r--r--octvc1/test/octvc1_test_id.h2
-rw-r--r--octvc1/test/octvc1_test_id_priv.h10
-rw-r--r--octvc1/test/octvc1_test_rc.h2
-rw-r--r--octvc1/test/octvc1_test_rc_priv.h2
-rw-r--r--octvc1/test/octvc1_test_version.h6
154 files changed, 455 insertions, 3000 deletions
diff --git a/octdev_devices.h b/octdev_devices.h
index 8517298..1006a0c 100644
--- a/octdev_devices.h
+++ b/octdev_devices.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octdev_devices_swap.h b/octdev_devices_swap.h
index 11cd966..93cb63a 100644
--- a/octdev_devices_swap.h
+++ b/octdev_devices_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTDEV_DEVICES_SWAP_H__
diff --git a/octdev_macro.h b/octdev_macro.h
index 0afdb61..73bc780 100644
--- a/octdev_macro.h
+++ b/octdev_macro.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octdev_opus_rev.h b/octdev_opus_rev.h
index a1cfe39..66b4a2e 100644
--- a/octdev_opus_rev.h
+++ b/octdev_opus_rev.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octdev_rc_base.h b/octdev_rc_base.h
index 2a57286..d89196f 100644
--- a/octdev_rc_base.h
+++ b/octdev_rc_base.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octdev_types.h b/octdev_types.h
index 6215e3c..90e0b4a 100644
--- a/octdev_types.h
+++ b/octdev_types.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octdev_types_swap.h b/octdev_types_swap.h
index e0c191b..14432bf 100644
--- a/octdev_types_swap.h
+++ b/octdev_types_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTDEV_TYPES_SWAP_H__
diff --git a/octoptions.h b/octoptions.h
index 8e66334..2777a61 100644
--- a/octoptions.h
+++ b/octoptions.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octpkt/octpkt_hdr.h b/octpkt/octpkt_hdr.h
index ed95b01..5117944 100644
--- a/octpkt/octpkt_hdr.h
+++ b/octpkt/octpkt_hdr.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octpkt/octpkt_hdr_swap.h b/octpkt/octpkt_hdr_swap.h
index b9cd647..4fcbd88 100644
--- a/octpkt/octpkt_hdr_swap.h
+++ b/octpkt/octpkt_hdr_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTPKT_HDR_SWAP_H__
diff --git a/octpkt/octpkt_hdrxl.h b/octpkt/octpkt_hdrxl.h
index f2f5aa3..b5a0ddc 100644
--- a/octpkt/octpkt_hdrxl.h
+++ b/octpkt/octpkt_hdrxl.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octpkt/octpkt_hdrxl_swap.h b/octpkt/octpkt_hdrxl_swap.h
index cba7c7e..f331fce 100644
--- a/octpkt/octpkt_hdrxl_swap.h
+++ b/octpkt/octpkt_hdrxl_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTPKT_HDRXL_SWAP_H__
diff --git a/octvc1/ctrl/octvc1_ctrl_api.h b/octvc1/ctrl/octvc1_ctrl_api.h
index 83b8cb9..1d375ed 100644
--- a/octvc1/ctrl/octvc1_ctrl_api.h
+++ b/octvc1/ctrl/octvc1_ctrl_api.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_api_priv.h b/octvc1/ctrl/octvc1_ctrl_api_priv.h
index 45bb103..769a030 100644
--- a/octvc1/ctrl/octvc1_ctrl_api_priv.h
+++ b/octvc1/ctrl/octvc1_ctrl_api_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h b/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h
index 83dbca6..f14a5ee 100644
--- a/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h
+++ b/octvc1/ctrl/octvc1_ctrl_api_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/ctrl/octvc1_ctrl_api_swap.h b/octvc1/ctrl/octvc1_ctrl_api_swap.h
index 418cb21..1b22fa0 100644
--- a/octvc1/ctrl/octvc1_ctrl_api_swap.h
+++ b/octvc1/ctrl/octvc1_ctrl_api_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_CTRL_API_SWAP_H__
diff --git a/octvc1/ctrl/octvc1_ctrl_base.h b/octvc1/ctrl/octvc1_ctrl_base.h
index 917bfa1..efd1b5b 100644
--- a/octvc1/ctrl/octvc1_ctrl_base.h
+++ b/octvc1/ctrl/octvc1_ctrl_base.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_id.h b/octvc1/ctrl/octvc1_ctrl_id.h
index 1671c45..34c737e 100644
--- a/octvc1/ctrl/octvc1_ctrl_id.h
+++ b/octvc1/ctrl/octvc1_ctrl_id.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_id_priv.h b/octvc1/ctrl/octvc1_ctrl_id_priv.h
index 24e2355..5ed1fdd 100644
--- a/octvc1/ctrl/octvc1_ctrl_id_priv.h
+++ b/octvc1/ctrl/octvc1_ctrl_id_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/ctrl/octvc1_ctrl_version.h b/octvc1/ctrl/octvc1_ctrl_version.h
index cf9861d..41902f3 100644
--- a/octvc1/ctrl/octvc1_ctrl_version.h
+++ b/octvc1/ctrl/octvc1_ctrl_version.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $
bit[10:0]: Build number
*/
#define cOCTVC1_CTRL_VERSION_MAJOR 2
-#define cOCTVC1_CTRL_VERSION_MINOR 7
+#define cOCTVC1_CTRL_VERSION_MINOR 5
#define cOCTVC1_CTRL_VERSION_MAINTENANCE 0
-#define cOCTVC1_CTRL_VERSION_BUILD 1039
+#define cOCTVC1_CTRL_VERSION_BUILD 780
#define cOCTVC1_CTRL_VERSION_ID ( (cOCTVC1_CTRL_VERSION_MAJOR << 25) + \
(cOCTVC1_CTRL_VERSION_MINOR << 18) + \
diff --git a/octvc1/gsm/octvc1_gsm_api.h b/octvc1/gsm/octvc1_gsm_api.h
index d377d81..ea118d2 100644
--- a/octvc1/gsm/octvc1_gsm_api.h
+++ b/octvc1/gsm/octvc1_gsm_api.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -47,23 +47,16 @@ $Revision: $
/************************ COMMON DEFINITIONS *******************************/
/*-------------------------------------------------------------------------------------
- APP_TEST Application Module Id
--------------------------------------------------------------------------------------*/
-
-#define cOCTVC1_GSM_APPLICATION_ID_MODULE_PHY ((0x00)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_OFFSET))
-
-/*-------------------------------------------------------------------------------------
GSM Module Tap Id
-------------------------------------------------------------------------------------*/
-#define cOCTVC1_GSM_TAP_ID_RF_UPLINK_INPUT ((0x0000)|(cOCTVC1_TAP_DIRECTION_ENUM_TX<<cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET)|(cOCTVC1_GSM_APPLICATION_ID_MODULE_PHY<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET))
+#define cOCTVC1_GSM_TAP_ID_RF_UPLINK_INPUT ((0x0000)|(cOCTVC1_TAP_DIRECTION_ENUM_TX<<cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET))
/*-------------------------------------------------------------------------------------
GSM Module Data Id
-------------------------------------------------------------------------------------*/
-#define cOCTVC1_GSM_MODULE_DATA_ID_RF_UPLINK_INPUT_COMPLEX16 ((0x0000)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET)) /* Deprecated */
- /* Should use cOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MID */
+#define cOCTVC1_GSM_MODULE_DATA_ID_RF_UPLINK_INPUT_COMPLEX16 ((0x0000)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET))
#define cOCTVC1_GSM_HOPPING_LIST_MAX_ENTRY 64 /* This is the maximum number of entries in a hopping list */
@@ -77,7 +70,7 @@ $Revision: $
/* array. */
#define cOCTVC1_GSM_TIMESLOT_MAX_SUBCHANNEL (cOCTVC1_GSM_TIMESLOT_MAX_SUBCHANNEL_NUMBER+2) /* This is the number of subchannels associated with a timeslot. */
#define cOCTVC1_GSM_MAX_FRAME_COUNT 2715647 /* Max frame tick count. */
-#define cOCTVC1_GSM_DATA_CONTENT_SIZE 460 /* Data content buffer size in bytes. */
+#define cOCTVC1_GSM_DATA_CONTENT_SIZE 468 /* Data content buffer size in bytes. */
#define cOCTVC1_GSM_RATE_LIST_SIZE 4 /* Rate list size. */
#define cOCTVC1_GSM_RACH_IND_MSG_SIZE 32 /* RACH indication content buffer size. */
#define cOCTVC1_GSM_TRX_ID_LIST_MAX_ENTRY 32 /* Maximum number of TRX_ID per list. */
@@ -243,14 +236,6 @@ $Revision: $
#define cOCTVC1_GSM_SUBCHANNEL_MASK_7 ((tOCT_UINT32)(1<<7) )
/*-------------------------------------------------------------------------------------
- tOCTVC1_GSM_TEST_MODE_ENUM : TEST MODE OPTIONS.
--------------------------------------------------------------------------------------*/
-#define tOCTVC1_GSM_TEST_MODE_ENUM tOCT_UINT8
-
-#define cOCTVC1_GSM_TEST_MODE_ENUM_TEST_MODE_NONE 0
-#define cOCTVC1_GSM_TEST_MODE_ENUM_TEST_MODE_TX 1
-
-/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_BURST_TYPE_ENUM : Burst type.
-------------------------------------------------------------------------------------*/
#define tOCTVC1_GSM_BURST_TYPE_ENUM tOCT_UINT32
@@ -441,6 +426,7 @@ typedef struct
Default: 0
usArfcn
usBcchArfcn
+ usCentreArfcn
usHsn
usMaio
usReserve
@@ -454,6 +440,7 @@ typedef struct
tOCT_UINT16 usTsc;
tOCT_UINT16 usArfcn;
tOCT_UINT16 usBcchArfcn;
+ tOCT_UINT16 usCentreArfcn;
tOCT_UINT16 usHsn;
tOCT_UINT16 usMaio;
tOCT_UINT16 usReserve;
@@ -556,19 +543,19 @@ typedef struct
Buffer address
Members:
- IQ_SAMPLE_ADDR
+ BuffAddr_TCHFS
Range: [0..2147483647]
Default: 0
Adress of Real Pointer
- IQ_SAMPLE_ADDR_RACH
+ BuffAddr_RACH
Range: [0..2147483647]
Default: 0
Adress of Real Pointer
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCT_UINT32 IQ_SAMPLE_ADDR;
- tOCT_UINT32 IQ_SAMPLE_ADDR_RACH;
+ tOCT_UINT32 BuffAddr_TCHFS;
+ tOCT_UINT32 BuffAddr_RACH;
} tOCTVC1_GSM_BUFF_ADDR;
@@ -682,9 +669,6 @@ typedef struct
abyDataContent
The data contents are an array of size usDataLength. The current implementation
is incorrect.
- abyEgprsCrc
- EGPRS CRC Status for Max TWO Blocks.
- abyPadding
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -692,8 +676,6 @@ typedef struct
tOCTVC1_GSM_PAYLOAD_TYPE_ENUM ulPayloadType;
tOCT_UINT32 ulDataLength;
tOCT_UINT8 abyDataContent[cOCTVC1_GSM_DATA_CONTENT_SIZE];
- tOCT_UINT8 abyEgprsCrc[2];
- tOCT_UINT8 abyPadding[6];
} tOCTVC1_GSM_LOGICAL_CHANNEL_DATA;
@@ -796,8 +778,6 @@ typedef struct
ulTchDataCrcPassCount
ulTchDataCrcFailCount
ulRachCount
- aulPdtchCrcPassCount
- aulPdtchCrcFailCount
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -806,8 +786,6 @@ typedef struct
tOCT_UINT32 ulTchDataCrcPassCount;
tOCT_UINT32 ulTchDataCrcFailCount;
tOCT_UINT32 ulRachCount;
- tOCT_UINT32 aulPdtchCrcPassCount[2];
- tOCT_UINT32 aulPdtchCrcFailCount[2];
} tOCTVC1_GSM_PHYSICAL_STATUS;
@@ -1029,10 +1007,6 @@ typedef struct
} tOCTVC1_GSM_TAP_FILTER_STATS;
/*-------------------------------------------------------------------------------------
- Deprecated
- Should use tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA
--------------------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------
tOCTVC1_GSM_MODULE_DATA_RF_UPLINK_INPUT_HEADER
Members:
@@ -2499,152 +2473,6 @@ typedef struct
} tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP;
-/*-------------------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD
-
- Members:
- Header
- OCTVC1 Message Header
- TrxId
- Unique TRX identifier
- testModeVal
- Test Mode None/TX
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_GSM_TRX_ID TrxId;
- tOCTVC1_GSM_TEST_MODE_ENUM testModeVal;
-
-} tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD
-
- Members:
- Header
- OCTVC1 Message Header
- TrxId
- Unique TRX identifier
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_GSM_TRX_ID TrxId;
-
-} tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP
-
- Members:
- Header
- OCTVC1 Message Header
- testModeVal
- Test Mode None/TX
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_GSM_TEST_MODE_ENUM testModeVal;
-
-} tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP;
-
-
-/***************************** MODULE_DATA *************************************/
-/*-------------------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA
-
- Members:
- ModuleData
- Module Data structure
- TrxId
- Unique TRX identifier
- LchId
- Logical Channel identifier
- ulAntennaIndex
- Antenna index
- ulFrameNumber
- Range: [..cOCTVC1_GSM_MAX_FRAME_COUNT]
- ulPower
- ulDataSizeInBytes
- byBadFlag
- byBurstId
- byReserved0
- byReserved1
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MODULE_DATA ModuleData;
- tOCTVC1_GSM_TRX_ID TrxId;
- tOCTVC1_GSM_LOGICAL_CHANNEL_ID LchId;
- tOCTVC1_INDEX ulAntennaIndex;
- tOCT_UINT32 ulFrameNumber;
- tOCT_UINT32 ulPower;
- tOCT_UINT32 ulDataSizeInBytes;
- tOCT_UINT8 byBadFlag;
- tOCT_UINT8 byBurstId;
- tOCT_UINT8 byReserved0;
- tOCT_UINT8 byReserved1;
-
-} tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA
-
- Members:
- ModuleData
- Module Data structure
- TrxId
- Unique TRX identifier
- LchId
- Unique Logical channel identifier
- ulFrameNumber
- Range: [..cOCTVC1_GSM_MAX_FRAME_COUNT]
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MODULE_DATA ModuleData;
- tOCTVC1_GSM_TRX_ID TrxId;
- tOCTVC1_GSM_LOGICAL_CHANNEL_ID LchId;
- tOCT_UINT32 ulFrameNumber;
-
-} tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA
-
- Members:
- ModuleData
- Module Data structure
- TrxId
- Unique TRX identifier
- LchId
- Unique Logical channel identifier
- Data
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MODULE_DATA ModuleData;
- tOCTVC1_GSM_TRX_ID TrxId;
- tOCTVC1_GSM_LOGICAL_CHANNEL_ID LchId;
- tOCTVC1_GSM_LOGICAL_CHANNEL_DATA Data;
-
-} tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA;
-
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_gsm_evt.h"
diff --git a/octvc1/gsm/octvc1_gsm_api_priv.h b/octvc1/gsm/octvc1_gsm_api_priv.h
index ef134fe..7dd56fa 100644
--- a/octvc1/gsm/octvc1_gsm_api_priv.h
+++ b/octvc1/gsm/octvc1_gsm_api_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -38,12 +38,8 @@ $Revision: $
-
-
/***************************** METHODS *************************************/
-/***************************** MODULE_DATA *************************************/
-
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_gsm_evt_priv.h"
diff --git a/octvc1/gsm/octvc1_gsm_api_priv_swap.h b/octvc1/gsm/octvc1_gsm_api_priv_swap.h
index e1507ed..4dc9416 100644
--- a/octvc1/gsm/octvc1_gsm_api_priv_swap.h
+++ b/octvc1/gsm/octvc1_gsm_api_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/gsm/octvc1_gsm_api_swap.h b/octvc1/gsm/octvc1_gsm_api_swap.h
index 42a5bc6..39682ed 100644
--- a/octvc1/gsm/octvc1_gsm_api_swap.h
+++ b/octvc1/gsm/octvc1_gsm_api_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_GSM_API_SWAP_H__
@@ -101,9 +101,6 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#define mOCTVC1_GSM_TEST_MODE_ENUM_SWAP( pType ) /* tOCT_UINT8 */
-
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_GSM_BURST_TYPE_ENUM_SWAP( pType ){ \
*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
@@ -195,6 +192,8 @@ extern "C" {
mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_TRX_CONFIG *)pOCTVC1_GSM_TRX_CONFIG)->usArfcn); \
((tOCTVC1_GSM_TRX_CONFIG *)pOCTVC1_GSM_TRX_CONFIG)->usBcchArfcn = \
mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_TRX_CONFIG *)pOCTVC1_GSM_TRX_CONFIG)->usBcchArfcn); \
+ ((tOCTVC1_GSM_TRX_CONFIG *)pOCTVC1_GSM_TRX_CONFIG)->usCentreArfcn = \
+ mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_TRX_CONFIG *)pOCTVC1_GSM_TRX_CONFIG)->usCentreArfcn); \
((tOCTVC1_GSM_TRX_CONFIG *)pOCTVC1_GSM_TRX_CONFIG)->usHsn = \
mOCT_SWAP16_IF_LE(((tOCTVC1_GSM_TRX_CONFIG *)pOCTVC1_GSM_TRX_CONFIG)->usHsn); \
((tOCTVC1_GSM_TRX_CONFIG *)pOCTVC1_GSM_TRX_CONFIG)->usMaio = \
@@ -271,10 +270,10 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_GSM_BUFF_ADDR_SWAP( _f_pParms ){ tOCTVC1_GSM_BUFF_ADDR * pOCTVC1_GSM_BUFF_ADDR = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_BUFF_ADDR)\
- ((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->IQ_SAMPLE_ADDR = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->IQ_SAMPLE_ADDR); \
- ((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->IQ_SAMPLE_ADDR_RACH = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->IQ_SAMPLE_ADDR_RACH); \
+ ((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->BuffAddr_TCHFS = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->BuffAddr_TCHFS); \
+ ((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->BuffAddr_RACH = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_BUFF_ADDR *)pOCTVC1_GSM_BUFF_ADDR)->BuffAddr_RACH); \
}
#else
#define mOCTVC1_GSM_BUFF_ADDR_SWAP( pOCTVC1_GSM_BUFF_ADDR )
@@ -427,16 +426,6 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_PHYSICAL_STATUS *)pOCTVC1_GSM_PHYSICAL_STATUS)->ulTchDataCrcFailCount); \
((tOCTVC1_GSM_PHYSICAL_STATUS *)pOCTVC1_GSM_PHYSICAL_STATUS)->ulRachCount = \
mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_PHYSICAL_STATUS *)pOCTVC1_GSM_PHYSICAL_STATUS)->ulRachCount); \
- { tOCT_UINT32 iOCTVC1_GSM_PHYSICAL_STATUS; \
- for( iOCTVC1_GSM_PHYSICAL_STATUS=0; \
- iOCTVC1_GSM_PHYSICAL_STATUS<(2);iOCTVC1_GSM_PHYSICAL_STATUS++ ) \
- ((tOCTVC1_GSM_PHYSICAL_STATUS *)pOCTVC1_GSM_PHYSICAL_STATUS)->aulPdtchCrcPassCount[iOCTVC1_GSM_PHYSICAL_STATUS] = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_PHYSICAL_STATUS *)pOCTVC1_GSM_PHYSICAL_STATUS)->aulPdtchCrcPassCount[iOCTVC1_GSM_PHYSICAL_STATUS]);}\
- { tOCT_UINT32 iOCTVC1_GSM_PHYSICAL_STATUS; \
- for( iOCTVC1_GSM_PHYSICAL_STATUS=0; \
- iOCTVC1_GSM_PHYSICAL_STATUS<(2);iOCTVC1_GSM_PHYSICAL_STATUS++ ) \
- ((tOCTVC1_GSM_PHYSICAL_STATUS *)pOCTVC1_GSM_PHYSICAL_STATUS)->aulPdtchCrcFailCount[iOCTVC1_GSM_PHYSICAL_STATUS] = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_PHYSICAL_STATUS *)pOCTVC1_GSM_PHYSICAL_STATUS)->aulPdtchCrcFailCount[iOCTVC1_GSM_PHYSICAL_STATUS]);}\
}
#else
#define mOCTVC1_GSM_PHYSICAL_STATUS_SWAP( pOCTVC1_GSM_PHYSICAL_STATUS )
@@ -1397,83 +1386,6 @@ extern "C" {
#define mOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_RSP )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD * pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD *)pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD)->Header ); } \
- { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD *)pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD)->TrxId ); } \
- { mOCTVC1_GSM_TEST_MODE_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD *)pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD)->testModeVal ); } \
-}
-#else
-#define mOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP * pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP *)pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP)->Header ); } \
-}
-#else
-#define mOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD * pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD *)pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD)->Header ); } \
- { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD *)pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD)->TrxId ); } \
-}
-#else
-#define mOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD_SWAP( pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP * pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP)->Header ); } \
- { mOCTVC1_GSM_TEST_MODE_ENUM_SWAP( &((tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP *)pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP)->testModeVal ); } \
-}
-#else
-#define mOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP_SWAP( pOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA * pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)\
- { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ModuleData ); } \
- { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->TrxId ); } \
- { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->LchId ); } \
- ((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulAntennaIndex = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulAntennaIndex); \
- ((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulFrameNumber = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulFrameNumber); \
- ((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulPower = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulPower); \
- ((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulDataSizeInBytes = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)->ulDataSizeInBytes); \
-}
-#else
-#define mOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA_SWAP( pOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA * pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)\
- { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->ModuleData ); } \
- { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->TrxId ); } \
- { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->LchId ); } \
- ((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->ulFrameNumber = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)->ulFrameNumber); \
-}
-#else
-#define mOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA_SWAP( pOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA_SWAP( _f_pParms ){ tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA * pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)\
- { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)->ModuleData ); } \
- { mOCTVC1_GSM_TRX_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)->TrxId ); } \
- { mOCTVC1_GSM_LOGICAL_CHANNEL_ID_SWAP( &((tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)->LchId ); } \
- { mOCTVC1_GSM_LOGICAL_CHANNEL_DATA_SWAP( &((tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *)pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)->Data ); } \
-}
-#else
-#define mOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA_SWAP( pOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
#ifdef __cplusplus
}
diff --git a/octvc1/gsm/octvc1_gsm_base.h b/octvc1/gsm/octvc1_gsm_base.h
index f7f51cc..4f0240b 100644
--- a/octvc1/gsm/octvc1_gsm_base.h
+++ b/octvc1/gsm/octvc1_gsm_base.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -43,7 +43,6 @@ $Octasic_Revision: $
/* Module: GSM */
#define cOCTVC1_GSM_CID_BASE ( (cOCTVC1_GSM_UID << 16) + cOCTVC1_CID_BASE )
#define cOCTVC1_GSM_EID_BASE ( (cOCTVC1_GSM_UID << 16) + cOCTVC1_EID_BASE )
-#define cOCTVC1_GSM_MID_BASE ( (cOCTVC1_GSM_UID << 24) )
#define cOCTVC1_GSM_RC_BASE ( (cOCTVC1_GSM_UID << 16) + cOCTVC1_RC_BASE )
#endif /* __OCTVC1_GSM_BASE_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_default.h b/octvc1/gsm/octvc1_gsm_default.h
index 164c7b0..df76700 100644
--- a/octvc1/gsm/octvc1_gsm_default.h
+++ b/octvc1/gsm/octvc1_gsm_default.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -62,6 +62,7 @@ const tOCTVC1_GSM_MSG_TRX_OPEN_CMD buf_tOCTVC1_GSM_MSG_TRX_OPEN_CMD =
0, /* usTsc */
0, /* usArfcn */
0, /* usBcchArfcn */
+ 0, /* usCentreArfcn */
0, /* usHsn */
0, /* usMaio */
0, /* usReserve */
@@ -334,6 +335,7 @@ const tOCTVC1_GSM_MSG_TRX_MODIFY_CMD buf_tOCTVC1_GSM_MSG_TRX_MODIFY_CMD =
(cOCTVC1_DO_NOT_MODIFY & 0xFFFF), /* usTsc */
(cOCTVC1_DO_NOT_MODIFY & 0xFFFF), /* usArfcn */
(cOCTVC1_DO_NOT_MODIFY & 0xFFFF), /* usBcchArfcn */
+ (cOCTVC1_DO_NOT_MODIFY & 0xFFFF), /* usCentreArfcn */
(cOCTVC1_DO_NOT_MODIFY & 0xFFFF), /* usHsn */
(cOCTVC1_DO_NOT_MODIFY & 0xFFFF), /* usMaio */
(cOCTVC1_DO_NOT_MODIFY & 0xFFFF), /* usReserve */
@@ -1341,19 +1343,15 @@ const tOCTVC1_GSM_MSG_TRX_REQUEST_LOGICAL_CHANNEL_DATA_CMD buf_tOCTVC1_GSM_MSG_T
0, /* abyDataContent[456] */
0, /* abyDataContent[457] */
0, /* abyDataContent[458] */
- 0 /* abyDataContent[459] */
- },
- { /* abyEgprsCrc */
- 0, /* abyEgprsCrc[0] */
- 0 /* abyEgprsCrc[1] */
- },
- { /* abyPadding */
- 0, /* abyPadding[0] */
- 0, /* abyPadding[1] */
- 0, /* abyPadding[2] */
- 0, /* abyPadding[3] */
- 0, /* abyPadding[4] */
- 0 /* abyPadding[5] */
+ 0, /* abyDataContent[459] */
+ 0, /* abyDataContent[460] */
+ 0, /* abyDataContent[461] */
+ 0, /* abyDataContent[462] */
+ 0, /* abyDataContent[463] */
+ 0, /* abyDataContent[464] */
+ 0, /* abyDataContent[465] */
+ 0, /* abyDataContent[466] */
+ 0 /* abyDataContent[467] */
}
}
};
@@ -2569,698 +2567,5 @@ extern const tOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CMD *g_pOctDef_tOCTVC1
}
-/*--------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD buf_tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- },
- { /* TrxId */
- 0, /* byTrxId */
- { /* abyPad */
- 0, /* abyPad[0] */
- 0, /* abyPad[1] */
- 0 /* abyPad[2] */
- }
- },
- 0 /* testModeVal */
-};
-
-const tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD =
- &buf_tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD buf_tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- },
- { /* TrxId */
- 0, /* byTrxId */
- { /* abyPad */
- 0, /* abyPad[0] */
- 0, /* abyPad[1] */
- 0 /* abyPad[2] */
- }
- }
-};
-
-const tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD =
- &buf_tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD *g_pOctDef_tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CMD; \
- }
-
-
-/***************************** MODULE_DATA *************************************/
-
-/*--------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA buf_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA =
-{
- { /* ModuleData */
- (cOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MID), /* ulModuleDataId */
- (sizeof(tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA)), /* ulModuleDataSize */
- 0, /* hLogicalObj */
- 0 /* ulTimestamp */
- },
- { /* TrxId */
- 0, /* byTrxId */
- { /* abyPad */
- 0, /* abyPad[0] */
- 0, /* abyPad[1] */
- 0 /* abyPad[2] */
- }
- },
- { /* LchId */
- cOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_0, /* byTimeslotNb */
- cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0, /* bySubChannelNb */
- 0, /* bySAPI */
- 0 /* byDirection */
- },
- 0, /* ulAntennaIndex */
- 0, /* ulFrameNumber */
- 0, /* ulPower */
- 0, /* ulDataSizeInBytes */
- 0, /* byBadFlag */
- 0, /* byBurstId */
- 0, /* byReserved0 */
- 0 /* byReserved1 */
-};
-
-const tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA =
- &buf_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MDA; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA buf_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA =
-{
- { /* ModuleData */
- (cOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MID), /* ulModuleDataId */
- (sizeof(tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA)), /* ulModuleDataSize */
- 0, /* hLogicalObj */
- 0 /* ulTimestamp */
- },
- { /* TrxId */
- 0, /* byTrxId */
- { /* abyPad */
- 0, /* abyPad[0] */
- 0, /* abyPad[1] */
- 0 /* abyPad[2] */
- }
- },
- { /* LchId */
- cOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_0, /* byTimeslotNb */
- cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0, /* bySubChannelNb */
- 0, /* bySAPI */
- 0 /* byDirection */
- },
- 0 /* ulFrameNumber */
-};
-
-const tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA =
- &buf_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MDA; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA buf_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA =
-{
- { /* ModuleData */
- (cOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MID), /* ulModuleDataId */
- (sizeof(tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA)), /* ulModuleDataSize */
- 0, /* hLogicalObj */
- 0 /* ulTimestamp */
- },
- { /* TrxId */
- 0, /* byTrxId */
- { /* abyPad */
- 0, /* abyPad[0] */
- 0, /* abyPad[1] */
- 0 /* abyPad[2] */
- }
- },
- { /* LchId */
- cOCTVC1_GSM_ID_TIMESLOT_NB_ENUM_0, /* byTimeslotNb */
- cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_0, /* bySubChannelNb */
- 0, /* bySAPI */
- 0 /* byDirection */
- },
- { /* Data */
- 0, /* ulFrameNumber */
- cOCTVC1_GSM_PAYLOAD_TYPE_ENUM_NONE, /* ulPayloadType */
- 0, /* ulDataLength */
- { /* abyDataContent */
- 0, /* abyDataContent[0] */
- 0, /* abyDataContent[1] */
- 0, /* abyDataContent[2] */
- 0, /* abyDataContent[3] */
- 0, /* abyDataContent[4] */
- 0, /* abyDataContent[5] */
- 0, /* abyDataContent[6] */
- 0, /* abyDataContent[7] */
- 0, /* abyDataContent[8] */
- 0, /* abyDataContent[9] */
- 0, /* abyDataContent[10] */
- 0, /* abyDataContent[11] */
- 0, /* abyDataContent[12] */
- 0, /* abyDataContent[13] */
- 0, /* abyDataContent[14] */
- 0, /* abyDataContent[15] */
- 0, /* abyDataContent[16] */
- 0, /* abyDataContent[17] */
- 0, /* abyDataContent[18] */
- 0, /* abyDataContent[19] */
- 0, /* abyDataContent[20] */
- 0, /* abyDataContent[21] */
- 0, /* abyDataContent[22] */
- 0, /* abyDataContent[23] */
- 0, /* abyDataContent[24] */
- 0, /* abyDataContent[25] */
- 0, /* abyDataContent[26] */
- 0, /* abyDataContent[27] */
- 0, /* abyDataContent[28] */
- 0, /* abyDataContent[29] */
- 0, /* abyDataContent[30] */
- 0, /* abyDataContent[31] */
- 0, /* abyDataContent[32] */
- 0, /* abyDataContent[33] */
- 0, /* abyDataContent[34] */
- 0, /* abyDataContent[35] */
- 0, /* abyDataContent[36] */
- 0, /* abyDataContent[37] */
- 0, /* abyDataContent[38] */
- 0, /* abyDataContent[39] */
- 0, /* abyDataContent[40] */
- 0, /* abyDataContent[41] */
- 0, /* abyDataContent[42] */
- 0, /* abyDataContent[43] */
- 0, /* abyDataContent[44] */
- 0, /* abyDataContent[45] */
- 0, /* abyDataContent[46] */
- 0, /* abyDataContent[47] */
- 0, /* abyDataContent[48] */
- 0, /* abyDataContent[49] */
- 0, /* abyDataContent[50] */
- 0, /* abyDataContent[51] */
- 0, /* abyDataContent[52] */
- 0, /* abyDataContent[53] */
- 0, /* abyDataContent[54] */
- 0, /* abyDataContent[55] */
- 0, /* abyDataContent[56] */
- 0, /* abyDataContent[57] */
- 0, /* abyDataContent[58] */
- 0, /* abyDataContent[59] */
- 0, /* abyDataContent[60] */
- 0, /* abyDataContent[61] */
- 0, /* abyDataContent[62] */
- 0, /* abyDataContent[63] */
- 0, /* abyDataContent[64] */
- 0, /* abyDataContent[65] */
- 0, /* abyDataContent[66] */
- 0, /* abyDataContent[67] */
- 0, /* abyDataContent[68] */
- 0, /* abyDataContent[69] */
- 0, /* abyDataContent[70] */
- 0, /* abyDataContent[71] */
- 0, /* abyDataContent[72] */
- 0, /* abyDataContent[73] */
- 0, /* abyDataContent[74] */
- 0, /* abyDataContent[75] */
- 0, /* abyDataContent[76] */
- 0, /* abyDataContent[77] */
- 0, /* abyDataContent[78] */
- 0, /* abyDataContent[79] */
- 0, /* abyDataContent[80] */
- 0, /* abyDataContent[81] */
- 0, /* abyDataContent[82] */
- 0, /* abyDataContent[83] */
- 0, /* abyDataContent[84] */
- 0, /* abyDataContent[85] */
- 0, /* abyDataContent[86] */
- 0, /* abyDataContent[87] */
- 0, /* abyDataContent[88] */
- 0, /* abyDataContent[89] */
- 0, /* abyDataContent[90] */
- 0, /* abyDataContent[91] */
- 0, /* abyDataContent[92] */
- 0, /* abyDataContent[93] */
- 0, /* abyDataContent[94] */
- 0, /* abyDataContent[95] */
- 0, /* abyDataContent[96] */
- 0, /* abyDataContent[97] */
- 0, /* abyDataContent[98] */
- 0, /* abyDataContent[99] */
- 0, /* abyDataContent[100] */
- 0, /* abyDataContent[101] */
- 0, /* abyDataContent[102] */
- 0, /* abyDataContent[103] */
- 0, /* abyDataContent[104] */
- 0, /* abyDataContent[105] */
- 0, /* abyDataContent[106] */
- 0, /* abyDataContent[107] */
- 0, /* abyDataContent[108] */
- 0, /* abyDataContent[109] */
- 0, /* abyDataContent[110] */
- 0, /* abyDataContent[111] */
- 0, /* abyDataContent[112] */
- 0, /* abyDataContent[113] */
- 0, /* abyDataContent[114] */
- 0, /* abyDataContent[115] */
- 0, /* abyDataContent[116] */
- 0, /* abyDataContent[117] */
- 0, /* abyDataContent[118] */
- 0, /* abyDataContent[119] */
- 0, /* abyDataContent[120] */
- 0, /* abyDataContent[121] */
- 0, /* abyDataContent[122] */
- 0, /* abyDataContent[123] */
- 0, /* abyDataContent[124] */
- 0, /* abyDataContent[125] */
- 0, /* abyDataContent[126] */
- 0, /* abyDataContent[127] */
- 0, /* abyDataContent[128] */
- 0, /* abyDataContent[129] */
- 0, /* abyDataContent[130] */
- 0, /* abyDataContent[131] */
- 0, /* abyDataContent[132] */
- 0, /* abyDataContent[133] */
- 0, /* abyDataContent[134] */
- 0, /* abyDataContent[135] */
- 0, /* abyDataContent[136] */
- 0, /* abyDataContent[137] */
- 0, /* abyDataContent[138] */
- 0, /* abyDataContent[139] */
- 0, /* abyDataContent[140] */
- 0, /* abyDataContent[141] */
- 0, /* abyDataContent[142] */
- 0, /* abyDataContent[143] */
- 0, /* abyDataContent[144] */
- 0, /* abyDataContent[145] */
- 0, /* abyDataContent[146] */
- 0, /* abyDataContent[147] */
- 0, /* abyDataContent[148] */
- 0, /* abyDataContent[149] */
- 0, /* abyDataContent[150] */
- 0, /* abyDataContent[151] */
- 0, /* abyDataContent[152] */
- 0, /* abyDataContent[153] */
- 0, /* abyDataContent[154] */
- 0, /* abyDataContent[155] */
- 0, /* abyDataContent[156] */
- 0, /* abyDataContent[157] */
- 0, /* abyDataContent[158] */
- 0, /* abyDataContent[159] */
- 0, /* abyDataContent[160] */
- 0, /* abyDataContent[161] */
- 0, /* abyDataContent[162] */
- 0, /* abyDataContent[163] */
- 0, /* abyDataContent[164] */
- 0, /* abyDataContent[165] */
- 0, /* abyDataContent[166] */
- 0, /* abyDataContent[167] */
- 0, /* abyDataContent[168] */
- 0, /* abyDataContent[169] */
- 0, /* abyDataContent[170] */
- 0, /* abyDataContent[171] */
- 0, /* abyDataContent[172] */
- 0, /* abyDataContent[173] */
- 0, /* abyDataContent[174] */
- 0, /* abyDataContent[175] */
- 0, /* abyDataContent[176] */
- 0, /* abyDataContent[177] */
- 0, /* abyDataContent[178] */
- 0, /* abyDataContent[179] */
- 0, /* abyDataContent[180] */
- 0, /* abyDataContent[181] */
- 0, /* abyDataContent[182] */
- 0, /* abyDataContent[183] */
- 0, /* abyDataContent[184] */
- 0, /* abyDataContent[185] */
- 0, /* abyDataContent[186] */
- 0, /* abyDataContent[187] */
- 0, /* abyDataContent[188] */
- 0, /* abyDataContent[189] */
- 0, /* abyDataContent[190] */
- 0, /* abyDataContent[191] */
- 0, /* abyDataContent[192] */
- 0, /* abyDataContent[193] */
- 0, /* abyDataContent[194] */
- 0, /* abyDataContent[195] */
- 0, /* abyDataContent[196] */
- 0, /* abyDataContent[197] */
- 0, /* abyDataContent[198] */
- 0, /* abyDataContent[199] */
- 0, /* abyDataContent[200] */
- 0, /* abyDataContent[201] */
- 0, /* abyDataContent[202] */
- 0, /* abyDataContent[203] */
- 0, /* abyDataContent[204] */
- 0, /* abyDataContent[205] */
- 0, /* abyDataContent[206] */
- 0, /* abyDataContent[207] */
- 0, /* abyDataContent[208] */
- 0, /* abyDataContent[209] */
- 0, /* abyDataContent[210] */
- 0, /* abyDataContent[211] */
- 0, /* abyDataContent[212] */
- 0, /* abyDataContent[213] */
- 0, /* abyDataContent[214] */
- 0, /* abyDataContent[215] */
- 0, /* abyDataContent[216] */
- 0, /* abyDataContent[217] */
- 0, /* abyDataContent[218] */
- 0, /* abyDataContent[219] */
- 0, /* abyDataContent[220] */
- 0, /* abyDataContent[221] */
- 0, /* abyDataContent[222] */
- 0, /* abyDataContent[223] */
- 0, /* abyDataContent[224] */
- 0, /* abyDataContent[225] */
- 0, /* abyDataContent[226] */
- 0, /* abyDataContent[227] */
- 0, /* abyDataContent[228] */
- 0, /* abyDataContent[229] */
- 0, /* abyDataContent[230] */
- 0, /* abyDataContent[231] */
- 0, /* abyDataContent[232] */
- 0, /* abyDataContent[233] */
- 0, /* abyDataContent[234] */
- 0, /* abyDataContent[235] */
- 0, /* abyDataContent[236] */
- 0, /* abyDataContent[237] */
- 0, /* abyDataContent[238] */
- 0, /* abyDataContent[239] */
- 0, /* abyDataContent[240] */
- 0, /* abyDataContent[241] */
- 0, /* abyDataContent[242] */
- 0, /* abyDataContent[243] */
- 0, /* abyDataContent[244] */
- 0, /* abyDataContent[245] */
- 0, /* abyDataContent[246] */
- 0, /* abyDataContent[247] */
- 0, /* abyDataContent[248] */
- 0, /* abyDataContent[249] */
- 0, /* abyDataContent[250] */
- 0, /* abyDataContent[251] */
- 0, /* abyDataContent[252] */
- 0, /* abyDataContent[253] */
- 0, /* abyDataContent[254] */
- 0, /* abyDataContent[255] */
- 0, /* abyDataContent[256] */
- 0, /* abyDataContent[257] */
- 0, /* abyDataContent[258] */
- 0, /* abyDataContent[259] */
- 0, /* abyDataContent[260] */
- 0, /* abyDataContent[261] */
- 0, /* abyDataContent[262] */
- 0, /* abyDataContent[263] */
- 0, /* abyDataContent[264] */
- 0, /* abyDataContent[265] */
- 0, /* abyDataContent[266] */
- 0, /* abyDataContent[267] */
- 0, /* abyDataContent[268] */
- 0, /* abyDataContent[269] */
- 0, /* abyDataContent[270] */
- 0, /* abyDataContent[271] */
- 0, /* abyDataContent[272] */
- 0, /* abyDataContent[273] */
- 0, /* abyDataContent[274] */
- 0, /* abyDataContent[275] */
- 0, /* abyDataContent[276] */
- 0, /* abyDataContent[277] */
- 0, /* abyDataContent[278] */
- 0, /* abyDataContent[279] */
- 0, /* abyDataContent[280] */
- 0, /* abyDataContent[281] */
- 0, /* abyDataContent[282] */
- 0, /* abyDataContent[283] */
- 0, /* abyDataContent[284] */
- 0, /* abyDataContent[285] */
- 0, /* abyDataContent[286] */
- 0, /* abyDataContent[287] */
- 0, /* abyDataContent[288] */
- 0, /* abyDataContent[289] */
- 0, /* abyDataContent[290] */
- 0, /* abyDataContent[291] */
- 0, /* abyDataContent[292] */
- 0, /* abyDataContent[293] */
- 0, /* abyDataContent[294] */
- 0, /* abyDataContent[295] */
- 0, /* abyDataContent[296] */
- 0, /* abyDataContent[297] */
- 0, /* abyDataContent[298] */
- 0, /* abyDataContent[299] */
- 0, /* abyDataContent[300] */
- 0, /* abyDataContent[301] */
- 0, /* abyDataContent[302] */
- 0, /* abyDataContent[303] */
- 0, /* abyDataContent[304] */
- 0, /* abyDataContent[305] */
- 0, /* abyDataContent[306] */
- 0, /* abyDataContent[307] */
- 0, /* abyDataContent[308] */
- 0, /* abyDataContent[309] */
- 0, /* abyDataContent[310] */
- 0, /* abyDataContent[311] */
- 0, /* abyDataContent[312] */
- 0, /* abyDataContent[313] */
- 0, /* abyDataContent[314] */
- 0, /* abyDataContent[315] */
- 0, /* abyDataContent[316] */
- 0, /* abyDataContent[317] */
- 0, /* abyDataContent[318] */
- 0, /* abyDataContent[319] */
- 0, /* abyDataContent[320] */
- 0, /* abyDataContent[321] */
- 0, /* abyDataContent[322] */
- 0, /* abyDataContent[323] */
- 0, /* abyDataContent[324] */
- 0, /* abyDataContent[325] */
- 0, /* abyDataContent[326] */
- 0, /* abyDataContent[327] */
- 0, /* abyDataContent[328] */
- 0, /* abyDataContent[329] */
- 0, /* abyDataContent[330] */
- 0, /* abyDataContent[331] */
- 0, /* abyDataContent[332] */
- 0, /* abyDataContent[333] */
- 0, /* abyDataContent[334] */
- 0, /* abyDataContent[335] */
- 0, /* abyDataContent[336] */
- 0, /* abyDataContent[337] */
- 0, /* abyDataContent[338] */
- 0, /* abyDataContent[339] */
- 0, /* abyDataContent[340] */
- 0, /* abyDataContent[341] */
- 0, /* abyDataContent[342] */
- 0, /* abyDataContent[343] */
- 0, /* abyDataContent[344] */
- 0, /* abyDataContent[345] */
- 0, /* abyDataContent[346] */
- 0, /* abyDataContent[347] */
- 0, /* abyDataContent[348] */
- 0, /* abyDataContent[349] */
- 0, /* abyDataContent[350] */
- 0, /* abyDataContent[351] */
- 0, /* abyDataContent[352] */
- 0, /* abyDataContent[353] */
- 0, /* abyDataContent[354] */
- 0, /* abyDataContent[355] */
- 0, /* abyDataContent[356] */
- 0, /* abyDataContent[357] */
- 0, /* abyDataContent[358] */
- 0, /* abyDataContent[359] */
- 0, /* abyDataContent[360] */
- 0, /* abyDataContent[361] */
- 0, /* abyDataContent[362] */
- 0, /* abyDataContent[363] */
- 0, /* abyDataContent[364] */
- 0, /* abyDataContent[365] */
- 0, /* abyDataContent[366] */
- 0, /* abyDataContent[367] */
- 0, /* abyDataContent[368] */
- 0, /* abyDataContent[369] */
- 0, /* abyDataContent[370] */
- 0, /* abyDataContent[371] */
- 0, /* abyDataContent[372] */
- 0, /* abyDataContent[373] */
- 0, /* abyDataContent[374] */
- 0, /* abyDataContent[375] */
- 0, /* abyDataContent[376] */
- 0, /* abyDataContent[377] */
- 0, /* abyDataContent[378] */
- 0, /* abyDataContent[379] */
- 0, /* abyDataContent[380] */
- 0, /* abyDataContent[381] */
- 0, /* abyDataContent[382] */
- 0, /* abyDataContent[383] */
- 0, /* abyDataContent[384] */
- 0, /* abyDataContent[385] */
- 0, /* abyDataContent[386] */
- 0, /* abyDataContent[387] */
- 0, /* abyDataContent[388] */
- 0, /* abyDataContent[389] */
- 0, /* abyDataContent[390] */
- 0, /* abyDataContent[391] */
- 0, /* abyDataContent[392] */
- 0, /* abyDataContent[393] */
- 0, /* abyDataContent[394] */
- 0, /* abyDataContent[395] */
- 0, /* abyDataContent[396] */
- 0, /* abyDataContent[397] */
- 0, /* abyDataContent[398] */
- 0, /* abyDataContent[399] */
- 0, /* abyDataContent[400] */
- 0, /* abyDataContent[401] */
- 0, /* abyDataContent[402] */
- 0, /* abyDataContent[403] */
- 0, /* abyDataContent[404] */
- 0, /* abyDataContent[405] */
- 0, /* abyDataContent[406] */
- 0, /* abyDataContent[407] */
- 0, /* abyDataContent[408] */
- 0, /* abyDataContent[409] */
- 0, /* abyDataContent[410] */
- 0, /* abyDataContent[411] */
- 0, /* abyDataContent[412] */
- 0, /* abyDataContent[413] */
- 0, /* abyDataContent[414] */
- 0, /* abyDataContent[415] */
- 0, /* abyDataContent[416] */
- 0, /* abyDataContent[417] */
- 0, /* abyDataContent[418] */
- 0, /* abyDataContent[419] */
- 0, /* abyDataContent[420] */
- 0, /* abyDataContent[421] */
- 0, /* abyDataContent[422] */
- 0, /* abyDataContent[423] */
- 0, /* abyDataContent[424] */
- 0, /* abyDataContent[425] */
- 0, /* abyDataContent[426] */
- 0, /* abyDataContent[427] */
- 0, /* abyDataContent[428] */
- 0, /* abyDataContent[429] */
- 0, /* abyDataContent[430] */
- 0, /* abyDataContent[431] */
- 0, /* abyDataContent[432] */
- 0, /* abyDataContent[433] */
- 0, /* abyDataContent[434] */
- 0, /* abyDataContent[435] */
- 0, /* abyDataContent[436] */
- 0, /* abyDataContent[437] */
- 0, /* abyDataContent[438] */
- 0, /* abyDataContent[439] */
- 0, /* abyDataContent[440] */
- 0, /* abyDataContent[441] */
- 0, /* abyDataContent[442] */
- 0, /* abyDataContent[443] */
- 0, /* abyDataContent[444] */
- 0, /* abyDataContent[445] */
- 0, /* abyDataContent[446] */
- 0, /* abyDataContent[447] */
- 0, /* abyDataContent[448] */
- 0, /* abyDataContent[449] */
- 0, /* abyDataContent[450] */
- 0, /* abyDataContent[451] */
- 0, /* abyDataContent[452] */
- 0, /* abyDataContent[453] */
- 0, /* abyDataContent[454] */
- 0, /* abyDataContent[455] */
- 0, /* abyDataContent[456] */
- 0, /* abyDataContent[457] */
- 0, /* abyDataContent[458] */
- 0 /* abyDataContent[459] */
- },
- { /* abyEgprsCrc */
- 0, /* abyEgprsCrc[0] */
- 0 /* abyEgprsCrc[1] */
- },
- { /* abyPadding */
- 0, /* abyPadding[0] */
- 0, /* abyPadding[1] */
- 0, /* abyPadding[2] */
- 0, /* abyPadding[3] */
- 0, /* abyPadding[4] */
- 0 /* abyPadding[5] */
- }
- }
-};
-
-const tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA =
- &buf_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA *g_pOctDef_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MDA; \
- }
-
-
#endif /* __OCTVC1_GSM_DEFAULT_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_default_priv.h b/octvc1/gsm/octvc1_gsm_default_priv.h
index d5e02b8..44b7b6e 100644
--- a/octvc1/gsm/octvc1_gsm_default_priv.h
+++ b/octvc1/gsm/octvc1_gsm_default_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -34,7 +34,5 @@ $Octasic_Revision: $
/***************************** COMMAND DEFAULT *****************************/
-/***************************** MODULE_DATA *************************************/
-
#endif /* __OCTVC1_GSM_DEFAULT_PRIV_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_evt.h b/octvc1/gsm/octvc1_gsm_evt.h
index a0e6984..cba77c0 100644
--- a/octvc1/gsm/octvc1_gsm_evt.h
+++ b/octvc1/gsm/octvc1_gsm_evt.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_evt_priv.h b/octvc1/gsm/octvc1_gsm_evt_priv.h
index d355722..5cb00c3 100644
--- a/octvc1/gsm/octvc1_gsm_evt_priv.h
+++ b/octvc1/gsm/octvc1_gsm_evt_priv.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_evt_priv_swap.h b/octvc1/gsm/octvc1_gsm_evt_priv_swap.h
index a2349c3..3d43940 100644
--- a/octvc1/gsm/octvc1_gsm_evt_priv_swap.h
+++ b/octvc1/gsm/octvc1_gsm_evt_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/gsm/octvc1_gsm_evt_swap.h b/octvc1/gsm/octvc1_gsm_evt_swap.h
index d84cfa0..f077e98 100644
--- a/octvc1/gsm/octvc1_gsm_evt_swap.h
+++ b/octvc1/gsm/octvc1_gsm_evt_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_GSM_EVT_SWAP_H__
diff --git a/octvc1/gsm/octvc1_gsm_id.h b/octvc1/gsm/octvc1_gsm_id.h
index e84f91b..ec0f44a 100644
--- a/octvc1/gsm/octvc1_gsm_id.h
+++ b/octvc1/gsm/octvc1_gsm_id.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -73,10 +73,8 @@ $Octasic_Revision: $
#define cOCTVC1_GSM_MSG_TRX_REQUEST_STUBB_LOOPBACK_TEST_CID ( 0x038 + cOCTVC1_GSM_CID_BASE )
#define cOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CID ( 0x039 + cOCTVC1_GSM_CID_BASE )
#define cOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CID ( 0x03a + cOCTVC1_GSM_CID_BASE )
-#define cOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CID ( 0x03b + cOCTVC1_GSM_CID_BASE )
-#define cOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CID ( 0x03c + cOCTVC1_GSM_CID_BASE )
-#define cOCTVC1_GSM_CID_MAX (( 0x03c + 1 ) & 0xFFF)
+#define cOCTVC1_GSM_CID_MAX (( 0x03a + 1 ) & 0xFFF)
/****************************************************************************
Event IDs
@@ -90,15 +88,6 @@ $Octasic_Revision: $
#define cOCTVC1_GSM_EID_MAX (( 0x0034 + 1 ) & 0xFFFF)
-/****************************************************************************
- Module Data IDs
- ****************************************************************************/
-#define cOCTVC1_GSM_MSG_TRX_UPLINK_RF_INPUT_DATA_LOGICAL_CHANNEL_MID ( 0x0000 + cOCTVC1_GSM_MID_BASE )
-#define cOCTVC1_GSM_MSG_TRX_EMPTY_FRAME_LOGICAL_CHANNEL_MID ( 0x0001 + cOCTVC1_GSM_MID_BASE )
-#define cOCTVC1_GSM_MSG_TRX_DATA_LOGICAL_CHANNEL_MID ( 0x0002 + cOCTVC1_GSM_MID_BASE )
-
-#define cOCTVC1_GSM_MID_MAX (( 0x0002 + 1 ) & 0xFFFF)
-
#endif /* __OCTVC1_GSM_ID_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_id_priv.h b/octvc1/gsm/octvc1_gsm_id_priv.h
index 85ee80c..3ebccdb 100644
--- a/octvc1/gsm/octvc1_gsm_id_priv.h
+++ b/octvc1/gsm/octvc1_gsm_id_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -40,10 +40,6 @@ $Octasic_Revision: $
Event IDs
****************************************************************************/
-/****************************************************************************
- Module Data IDs
- ****************************************************************************/
-
#endif /* __OCTVC1_GSM_ID_PRIV_H__ */
diff --git a/octvc1/gsm/octvc1_gsm_rc.h b/octvc1/gsm/octvc1_gsm_rc.h
index 0b94164..2e67b22 100644
--- a/octvc1/gsm/octvc1_gsm_rc.h
+++ b/octvc1/gsm/octvc1_gsm_rc.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -56,7 +56,11 @@ $Octasic_Revision: $
#define cOCTVC1_GSM_RC_TRX_RADIO_CONFIG ( 0x0005 + cOCTVC1_GSM_TRX_RC_BASE )
#define cOCTVC1_GSM_RC_TRX_RADIO_RESET ( 0x0006 + cOCTVC1_GSM_TRX_RC_BASE )
#define cOCTVC1_GSM_RC_TRX_RADIO_TERMINATE ( 0x0007 + cOCTVC1_GSM_TRX_RC_BASE )
-#define cOCTVC1_GSM_RC_TRX_PARAMS_INVALID ( 0x0008 + cOCTVC1_GSM_TRX_RC_BASE )
+#define cOCTVC1_GSM_RC_TRX_CENTRE_FREQ_NOT_SAME_ACROSS_TRX ( 0x0008 + cOCTVC1_GSM_TRX_RC_BASE )
+#define cOCTVC1_GSM_RC_TRX_CARRIER_OFFSET_OUTOF_RANGE ( 0x0009 + cOCTVC1_GSM_TRX_RC_BASE )
+#define cOCTVC1_GSM_RC_TRX_NOT_PROPERLY_SEPARATED ( 0x000a + cOCTVC1_GSM_TRX_RC_BASE )
+#define cOCTVC1_GSM_RC_TRX_BCCH_NOT_CONFIGURED ( 0x000b + cOCTVC1_GSM_TRX_RC_BASE )
+#define cOCTVC1_GSM_RC_TRX_CLOSE_NONPRIMARY_FIRST ( 0x000c + cOCTVC1_GSM_TRX_RC_BASE )
/****************************************************************************
PHYSICAL_CHANNEL return codes
@@ -67,7 +71,6 @@ $Octasic_Revision: $
#define cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ALREADY_ACTIVATED ( 0x0001 + cOCTVC1_GSM_PHYSICAL_CHANNEL_RC_BASE )
#define cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_NOT_ACTIVATED ( 0x0002 + cOCTVC1_GSM_PHYSICAL_CHANNEL_RC_BASE )
#define cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ID_INVALID ( 0x0003 + cOCTVC1_GSM_PHYSICAL_CHANNEL_RC_BASE )
-#define cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_PARAMS_INVALID ( 0x0004 + cOCTVC1_GSM_PHYSICAL_CHANNEL_RC_BASE )
/****************************************************************************
SUB_CHANNEL return codes
@@ -88,6 +91,7 @@ $Octasic_Revision: $
#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_ID_INVALID ( 0x0003 + cOCTVC1_GSM_LOGICAL_CHANNEL_RC_BASE )
#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DIRECTION_INVALID ( 0x0004 + cOCTVC1_GSM_LOGICAL_CHANNEL_RC_BASE )
#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_SAPI_INVALID ( 0x0005 + cOCTVC1_GSM_LOGICAL_CHANNEL_RC_BASE )
+#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_BCCH_BSIC_INVALID ( 0x0006 + cOCTVC1_GSM_LOGICAL_CHANNEL_RC_BASE )
/****************************************************************************
Validate return codes
@@ -97,8 +101,8 @@ $Octasic_Revision: $
#define cOCTVC1_GSM_RC_RF_CONFIG_INVALID_RX_GAIN_DB ( 0x1 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
#define cOCTVC1_GSM_RC_RF_CONFIG_INVALID_TX_ATTND_B ( 0x2 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
#define cOCTVC1_GSM_RC_TRX_CONFIG_INVALID_US_TSC ( 0x3 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_IQ_SAMPLE_ADDR ( 0x4 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
-#define cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_IQ_SAMPLE_ADDR_RACH ( 0x5 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__TCHFS ( 0x4 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
+#define cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__RACH ( 0x5 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_FRAME_NUMBER ( 0x6 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_DATA_LENGTH ( 0x7 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
#define cOCTVC1_GSM_RC_LOGICAL_CHANNEL_RAW_DATA_INVALID_FRAME_NUMBER ( 0x8 + cOCTVC1_GSM_AUTO_VALIDATE_RC_BASE )
diff --git a/octvc1/gsm/octvc1_gsm_rc_priv.h b/octvc1/gsm/octvc1_gsm_rc_priv.h
index 9e0b26d..56f0efb 100644
--- a/octvc1/gsm/octvc1_gsm_rc_priv.h
+++ b/octvc1/gsm/octvc1_gsm_rc_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/gsm/octvc1_gsm_version.h b/octvc1/gsm/octvc1_gsm_version.h
index 7e8f47d..40313ba 100644
--- a/octvc1/gsm/octvc1_gsm_version.h
+++ b/octvc1/gsm/octvc1_gsm_version.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $
bit[10:0]: Build number
*/
#define cOCTVC1_GSM_VERSION_MAJOR 2
-#define cOCTVC1_GSM_VERSION_MINOR 7
+#define cOCTVC1_GSM_VERSION_MINOR 5
#define cOCTVC1_GSM_VERSION_MAINTENANCE 0
-#define cOCTVC1_GSM_VERSION_BUILD 1039
+#define cOCTVC1_GSM_VERSION_BUILD 780
#define cOCTVC1_GSM_VERSION_ID ( (cOCTVC1_GSM_VERSION_MAJOR << 25) + \
(cOCTVC1_GSM_VERSION_MINOR << 18) + \
diff --git a/octvc1/hw/octvc1_hw_api.h b/octvc1/hw/octvc1_hw_api.h
index 485972c..cde7124 100644
--- a/octvc1/hw/octvc1_hw_api.h
+++ b/octvc1/hw/octvc1_hw_api.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -41,7 +41,6 @@ $Revision: $
#include "../octvc1_list.h"
#include "../octvc1_log.h"
#include "../octvc1_process.h"
-#include "../octvc1_user_id.h"
#include "../octvc1_radio.h"
#include "octvc1_hw_id.h"
@@ -174,15 +173,15 @@ typedef struct
Default: 0
Physical core index. Value 0 means no core is running for this logical
identifier.
- ulProcessUserId
- Default: cOCTVC1_USER_ID_PROCESS_ENUM_INVALID
+ ulProcessImageType
+ Default: cOCTVC1_PROCESS_TYPE_ENUM_INVALID
Process Type identifier. Value INVALID means no process running on this core.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCT_UINT32 hProcess;
- tOCT_UINT32 ulPhysicalCoreId;
- tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
+ tOCT_UINT32 hProcess;
+ tOCT_UINT32 ulPhysicalCoreId;
+ tOCTVC1_PROCESS_TYPE_ENUM ulProcessImageType;
} tOCTVC1_HW_CPU_CORE_INFO;
@@ -448,8 +447,7 @@ typedef struct
#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_FREQ_10MHZ 1
#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_FREQ_30_72MHZ 2
#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_FREQ_1HZ_EXT 3
-#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_SOFT_APP 4 /* Clock Sync Manager is driven by the software application. */
-#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_NONE 5 /* Clock Sync Manager is not initialized. */
+#define cOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_ENUM_NONE 4 /* Clock Sync Manager is not initialized. */
/* Base on config file informations. */
/*-------------------------------------------------------------------------------------
@@ -481,16 +479,13 @@ typedef struct
#define tOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM tOCT_UINT32
#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNINITIALIZE 0
-#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNUSED 1 /* Not opened. */
+#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_IDLE 1
#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_NO_EXT_CLOCK 2 /* Never detect any clock. */
#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_LOCKED 3
#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNLOCKED 4
#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_ERROR 5
-#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_DISABLE 6 /* The actual PCB does not support this service. */
+#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_DISABLE 6 /* The actual PCB does not supporte this service. */
#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_LOSS_EXT_CLOCK 7 /* No more clock detected. */
-#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_UNRESERVED 8 /* Opened, but no process has reserved. */
-#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_RESERVED 9 /* Reserved, not yet active. */
-#define cOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_ACTIVE 10
/***************************** METHODS *************************************/
/*-------------------------------------------------------------------------------------
@@ -1099,9 +1094,7 @@ typedef struct
ulState
Clock sync manager state
lClockError
- Accumulated error on the tracked clock's control loop
- lLastMeasuredError
- The last clock error that got injected in the control loop
+ Curent error on the tracked clock's control loop
lDroppedCycles
Number of cycles (at ulPllFreqHz) that have been dropped by the control loop
This occurs when there a big gaps of the reference clock in the frequency
@@ -1120,14 +1113,12 @@ typedef struct
Clock source state
ulDacValue
Curent DAC value
- ulOwnerProcessUid
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MSG_HEADER Header;
tOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM ulState;
tOCT_INT32 lClockError;
- tOCT_INT32 lLastMeasuredError;
tOCT_INT32 lDroppedCycles;
tOCT_UINT32 ulPllFreqHz;
tOCT_UINT32 ulPllFractionalFreqHz;
@@ -1135,7 +1126,6 @@ typedef struct
tOCT_UINT32 ulSyncLosseCnt;
tOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM ulSourceState;
tOCT_UINT32 ulDacValue;
- tOCTVC1_USER_ID_PROCESS_ENUM ulOwnerProcessUid;
} tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP;
diff --git a/octvc1/hw/octvc1_hw_api_priv.h b/octvc1/hw/octvc1_hw_api_priv.h
index 59398d2..6b0de19 100644
--- a/octvc1/hw/octvc1_hw_api_priv.h
+++ b/octvc1/hw/octvc1_hw_api_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/hw/octvc1_hw_api_priv_swap.h b/octvc1/hw/octvc1_hw_api_priv_swap.h
index 07afed4..6a8cdd1 100644
--- a/octvc1/hw/octvc1_hw_api_priv_swap.h
+++ b/octvc1/hw/octvc1_hw_api_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/hw/octvc1_hw_api_swap.h b/octvc1/hw/octvc1_hw_api_swap.h
index 5aa1551..a099078 100644
--- a/octvc1/hw/octvc1_hw_api_swap.h
+++ b/octvc1/hw/octvc1_hw_api_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_HW_API_SWAP_H__
@@ -99,7 +99,7 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->hProcess); \
((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->ulPhysicalCoreId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->ulPhysicalCoreId); \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->ulProcessUserId ); } \
+ { mOCTVC1_PROCESS_TYPE_ENUM_SWAP( &((tOCTVC1_HW_CPU_CORE_INFO *)pOCTVC1_HW_CPU_CORE_INFO)->ulProcessImageType ); } \
}
#else
#define mOCTVC1_HW_CPU_CORE_INFO_SWAP( pOCTVC1_HW_CPU_CORE_INFO )
@@ -652,8 +652,6 @@ extern "C" {
{ mOCTVC1_HW_CLOCK_SYNC_MGR_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulState ); } \
((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lClockError = \
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lClockError); \
- ((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lLastMeasuredError = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lLastMeasuredError); \
((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lDroppedCycles = \
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->lDroppedCycles); \
((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulPllFreqHz = \
@@ -667,7 +665,6 @@ extern "C" {
{ mOCTVC1_HW_CLOCK_SYNC_MGR_SOURCE_STATE_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulSourceState ); } \
((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulDacValue = \
mOCT_SWAP32_IF_LE(((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulDacValue); \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP *)pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP)->ulOwnerProcessUid ); } \
}
#else
#define mOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP_SWAP( pOCTVC1_HW_MSG_CLOCK_SYNC_MGR_STATS_RSP )
diff --git a/octvc1/hw/octvc1_hw_base.h b/octvc1/hw/octvc1_hw_base.h
index ea0b17f..0c2b938 100644
--- a/octvc1/hw/octvc1_hw_base.h
+++ b/octvc1/hw/octvc1_hw_base.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_default.h b/octvc1/hw/octvc1_hw_default.h
index be904cc..dfd431d 100644
--- a/octvc1/hw/octvc1_hw_default.h
+++ b/octvc1/hw/octvc1_hw_default.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_default_priv.h b/octvc1/hw/octvc1_hw_default_priv.h
index a6baeff..0482bac 100644
--- a/octvc1/hw/octvc1_hw_default_priv.h
+++ b/octvc1/hw/octvc1_hw_default_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_evt.h b/octvc1/hw/octvc1_hw_evt.h
index e87a9eb..5d2e3d9 100644
--- a/octvc1/hw/octvc1_hw_evt.h
+++ b/octvc1/hw/octvc1_hw_evt.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_evt_priv.h b/octvc1/hw/octvc1_hw_evt_priv.h
index 7424fbd..9d08cd2 100644
--- a/octvc1/hw/octvc1_hw_evt_priv.h
+++ b/octvc1/hw/octvc1_hw_evt_priv.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_evt_priv_swap.h b/octvc1/hw/octvc1_hw_evt_priv_swap.h
index 0316240..5924b3c 100644
--- a/octvc1/hw/octvc1_hw_evt_priv_swap.h
+++ b/octvc1/hw/octvc1_hw_evt_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/hw/octvc1_hw_evt_swap.h b/octvc1/hw/octvc1_hw_evt_swap.h
index ed04040..30728a8 100644
--- a/octvc1/hw/octvc1_hw_evt_swap.h
+++ b/octvc1/hw/octvc1_hw_evt_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_HW_EVT_SWAP_H__
diff --git a/octvc1/hw/octvc1_hw_id.h b/octvc1/hw/octvc1_hw_id.h
index 46cb01e..107cf70 100644
--- a/octvc1/hw/octvc1_hw_id.h
+++ b/octvc1/hw/octvc1_hw_id.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_id_priv.h b/octvc1/hw/octvc1_hw_id_priv.h
index 7d5398c..df29d51 100644
--- a/octvc1/hw/octvc1_hw_id_priv.h
+++ b/octvc1/hw/octvc1_hw_id_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_rc.h b/octvc1/hw/octvc1_hw_rc.h
index 445fd1d..3140456 100644
--- a/octvc1/hw/octvc1_hw_rc.h
+++ b/octvc1/hw/octvc1_hw_rc.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_rc_priv.h b/octvc1/hw/octvc1_hw_rc_priv.h
index 7c6e8d3..6086fa2 100644
--- a/octvc1/hw/octvc1_hw_rc_priv.h
+++ b/octvc1/hw/octvc1_hw_rc_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/hw/octvc1_hw_version.h b/octvc1/hw/octvc1_hw_version.h
index 68e9aef..37a3054 100644
--- a/octvc1/hw/octvc1_hw_version.h
+++ b/octvc1/hw/octvc1_hw_version.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $
bit[10:0]: Build number
*/
#define cOCTVC1_HW_VERSION_MAJOR 2
-#define cOCTVC1_HW_VERSION_MINOR 7
+#define cOCTVC1_HW_VERSION_MINOR 5
#define cOCTVC1_HW_VERSION_MAINTENANCE 0
-#define cOCTVC1_HW_VERSION_BUILD 1039
+#define cOCTVC1_HW_VERSION_BUILD 780
#define cOCTVC1_HW_VERSION_ID ( (cOCTVC1_HW_VERSION_MAJOR << 25) + \
(cOCTVC1_HW_VERSION_MINOR << 18) + \
diff --git a/octvc1/irsc/octvc1_irsc_api.h b/octvc1/irsc/octvc1_irsc_api.h
index b5b75d7..b555397 100644
--- a/octvc1/irsc/octvc1_irsc_api.h
+++ b/octvc1/irsc/octvc1_irsc_api.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -45,7 +45,6 @@ $Revision: $
#include "../octvc1_radio.h"
#include "../octvc1_api.h"
#include "../octvc1_module.h"
-#include "../octvc1_user_id.h"
#include "../octvc1_tap.h"
#include "octvc1_irsc_id.h"
@@ -80,45 +79,6 @@ $Revision: $
#define cOCTVC1_IRSC_IPC_PORT_STATE_ENUM_READY 4
/*-------------------------------------------------------------------------------------
- IPC port clone state.
--------------------------------------------------------------------------------------*/
-#define tOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM tOCT_UINT32
-
-#define cOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_INVALID 0 /* Ipc port not part of IPC clone */
-#define cOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_CLONE 1 /* Ipc port clone of other port */
-#define cOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_ORIGINAL 2 /* Original Ipc port cloned */
-#define cOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_REMOTE 3 /* Remote Ipc port connected to a clone port */
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_IPC_PORT_CLONE
- Ipc port clone context
-
- Members:
- ulCloneState
- Port Clone State.
- hProcess
- When ulCloneState set to CLONE: Process handle of the original port
- When ulCloneState set to ORIGINAL: Process handle of the clone port
- When ulCloneState set to REMOTE: Process handle of the original port
- ulPortId
- When ulCloneState set to CLONE: IPC port identifier of the original port
- When ulCloneState set to ORIGINAL: IPC port identifier of the clone port
- When ulCloneState set to REMOTE: IPC port identifier of the original port
- ulUserPortId
- When ulCloneState set to CLONE: IPC port user id of the original port
- When ulCloneState set to ORIGINAL: IPC port user id of the clone port
- When ulCloneState set to REMOTE: IPC port user id of the original port
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM ulCloneState;
- tOCTVC1_HANDLE_OBJECT hProcess;
- tOCTVC1_SUB_OBJECT_ID ulPortId;
- tOCT_UINT32 ulUserPortId;
-
-} tOCTVC1_IRSC_IPC_PORT_CLONE;
-
-/*-------------------------------------------------------------------------------------
API related definitions
-------------------------------------------------------------------------------------*/
@@ -220,11 +180,9 @@ typedef struct
Members:
ulModuleId
- Module Id.
+ Current number of process active in this for this module.
hProcess
Process handle where Tap is instantiate
- ulProcessUserId
- Process user identifier, connect on this interface
ulDirection
ulDataSubType
Data sub type cOCTVOCNET_PKT_SUBTYPE_UNSPECIFIED,
@@ -236,38 +194,16 @@ typedef struct
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCT_UINT32 ulModuleId;
- tOCTVC1_HANDLE_OBJECT hProcess;
- tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
- tOCTVC1_TAP_DIRECTION_ENUM ulDirection;
- tOCT_UINT32 ulDataSubType;
- tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCT_INT8 szDescription[(cOCTVC1_IRSC_APPLICATION_TAP_MAX_DESCRIPTION_BYTE_SIZE+1)];/* NOSWAPMAC */
+ tOCTVC1_MODULE_ID_ENUM ulModuleId;
+ tOCT_UINT32 hProcess;
+ tOCTVC1_TAP_DIRECTION_ENUM ulDirection;
+ tOCT_UINT32 ulDataSubType;
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+ tOCT_INT8 szDescription[(cOCTVC1_IRSC_APPLICATION_TAP_MAX_DESCRIPTION_BYTE_SIZE+1)];/* NOSWAPMAC */
} tOCTVC1_IRSC_APPLICATION_TAP_INFO;
/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_STREAM_STATS
- Stream stats
-
- Members:
- ulPacketCnt
- ulDropCnt
- ulOverflowCnt
- ulRetryCnt
- ulMissCnt
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCT_UINT32 ulPacketCnt;
- tOCT_UINT32 ulDropCnt;
- tOCT_UINT32 ulOverflowCnt;
- tOCT_UINT32 ulRetryCnt;
- tOCT_UINT32 ulMissCnt;
-
-} tOCTVC1_IRSC_STREAM_STATS;
-
-/*-------------------------------------------------------------------------------------
tOCTVC1_IRSC_APPLICATION_TAP_STATS
API Command stats
@@ -276,14 +212,12 @@ typedef struct
Default: cOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_DISABLE
ulFilterIndex
ulUserId
- Stream
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM ulState;
tOCTVC1_INDEX ulFilterIndex;
tOCT_UINT32 ulUserId;
- tOCTVC1_IRSC_STREAM_STATS Stream;
} tOCTVC1_IRSC_APPLICATION_TAP_STATS;
@@ -303,10 +237,6 @@ typedef struct
Default: cOCTVC1_INDEX_INVALID
ulUserId
Default: 0
- ulRetryEnableFlag
- Default: cOCT_FALSE
- If true, Retry events will be sent when blocks are missing.
- Blocks will be dropped to ensure they are not kept out of sequence.
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -314,148 +244,9 @@ typedef struct
tOCT_UINT32 ulMaxTransportDataSize;
tOCTVC1_INDEX ulFilterIndex;
tOCT_UINT32 ulUserId;
- tOCT_BOOL32 ulRetryEnableFlag;
} tOCTVC1_IRSC_APPLICATION_TAP_START;
-/*-------------------------------------------------------------------------------------
- IRSC Module Tap Id
--------------------------------------------------------------------------------------*/
-#define cOCTVC1_IRSC_TAP_TX_LOG ((0x0000)|(cOCTVC1_TAP_DIRECTION_ENUM_TX<<cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET)|(cOCTVC1_MODULE_APPLICATION_ID_MAIN_SYSTEM<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET))
-
-/*-------------------------------------------------------------------------------------
- IRSC Router
--------------------------------------------------------------------------------------*/
-#define cOCTVC1_IRSC_ROUTER_MAX_INTERFACE 24
-
-/*-------------------------------------------------------------------------------------
- Interface type.
--------------------------------------------------------------------------------------*/
-#define tOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM tOCT_UINT32
-
-#define cOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_UNUSE 0
-#define cOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_LOCAL 1
-#define cOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_REMOTE 2
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_ROUTER_INTERFACE_INFO
- Router interface info
-
- Members:
- ulInterfaceIndex
- Router interface index
- ulProcessUserId
- Process user identifier, connect on this interface
- ulType
- Process user identifier
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_INDEX ulInterfaceIndex;
- tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
- tOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM ulType;
-
-} tOCTVC1_IRSC_ROUTER_INTERFACE_INFO;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_ROUTER_INTERFACE_STATS
- Router interface stats
-
- Members:
- ulInterfaceIndex
- Router interface index
- ulProcessUserId
- Process user identifier, connect on this interface
- ulSentPktCnt
- Number of packet sent to ulProcessUserId
- ulRecvPktCnt
- Number of packet receive from ulProcessUserId
- ulErrSentPktCnt
- Number error when trying to sent to ulProcessUserId
- ulErrRecvPktCnt
- Number error when trying to receive from ulProcessUserId
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_INDEX ulInterfaceIndex;
- tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
- tOCT_UINT32 ulSentPktCnt;
- tOCT_UINT32 ulRecvPktCnt;
- tOCT_UINT32 ulErrSentPktCnt;
- tOCT_UINT32 ulErrRecvPktCnt;
-
-} tOCTVC1_IRSC_ROUTER_INTERFACE_STATS;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_ROUTER_INFO
- Router interface stats
-
- Members:
- ulProcessUserId
- Process user identifier where router is instanciated
- ulSafeModeFlag
- Indication if router is in safe mode or not
- ulInterfaceMaxNum
- Maximun number of interface supported by the router
- ulInterfaceNum
- Number of interface between router and process
- aInterfaceInfo
- Session event Info
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
- tOCT_BOOL32 ulSafeModeFlag;
- tOCT_UINT32 ulInterfaceMaxNum;
- tOCT_UINT32 ulInterfaceNum;
- tOCTVC1_IRSC_ROUTER_INTERFACE_INFO aInterfaceInfo[cOCTVC1_IRSC_ROUTER_MAX_INTERFACE];
-
-} tOCTVC1_IRSC_ROUTER_INFO;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_ROUTER_STATS
- Router interface stats
-
- Members:
- ulInterfaceTotalSentPktCnt
- Total packet sent to Interface (router-> process)
- ulInterfaceTotalRecvPktCnt
- Total packet receive from Interface (process -> router )
- ulInterfaceTotalErrSentPktCnt
- Total error when trying to packet (router-> process)
- ulInterfaceTotalErrRecvPktCnt
- Total error when trying to receive packet (process -> router )
- ulTotalSentPktCnt
- Total packet sent to external
- ulTotalRecvPktCnt
- Total packet receive from external
- ulSentEvtPktCnt
- Number of event sent by router
- ulModuleDataTotalRecvPktCnt
- Total module_data packet receive from external
- ulModuleDataTotalSentPktCnt
- Total module_data packet sent to external
- ulInterfaceNum
- Number of interface between router and process
- aInterfaceStats
- Session event Info
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCT_UINT32 ulInterfaceTotalSentPktCnt;
- tOCT_UINT32 ulInterfaceTotalRecvPktCnt;
- tOCT_UINT32 ulInterfaceTotalErrSentPktCnt;
- tOCT_UINT32 ulInterfaceTotalErrRecvPktCnt;
- tOCT_UINT32 ulTotalSentPktCnt;
- tOCT_UINT32 ulTotalRecvPktCnt;
- tOCT_UINT32 ulSentEvtPktCnt;
- tOCT_UINT32 ulModuleDataTotalRecvPktCnt;
- tOCT_UINT32 ulModuleDataTotalSentPktCnt;
- tOCT_UINT32 ulInterfaceNum;
- tOCTVC1_IRSC_ROUTER_INTERFACE_STATS aInterfaceStats[cOCTVC1_IRSC_ROUTER_MAX_INTERFACE];
-
-} tOCTVC1_IRSC_ROUTER_STATS;
-
/***************************** METHODS *************************************/
/*-------------------------------------------------------------------------------------
tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD
@@ -470,8 +261,8 @@ typedef struct
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hProcess;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 hProcess;
} tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD;
@@ -482,23 +273,20 @@ typedef struct
Header
OCTVC1 Message Header
hProcess
- ulUserId
- Process user identifier
szName
Process Name.
szProcessImageName
Process file name.
- ulModuleId
- Module Id.
+ ulType
+ Process Type.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hProcess;
- tOCTVC1_USER_ID_PROCESS_ENUM ulUserId;
- tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCT_INT8 szProcessImageName[(cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCT_UINT32 ulModuleId;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 hProcess;
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+ tOCT_INT8 szProcessImageName[(cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+ tOCTVC1_PROCESS_TYPE_ENUM ulType;
} tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP;
@@ -522,11 +310,11 @@ typedef struct
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hProcess;
- tOCT_BOOL32 ulResetProcessStatsFlag;
- tOCT_BOOL32 ulResetIpcStatsFlag;
- tOCT_BOOL32 ulResetTaskStatsFlag;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 hProcess;
+ tOCT_BOOL32 ulResetProcessStatsFlag;
+ tOCT_BOOL32 ulResetIpcStatsFlag;
+ tOCT_BOOL32 ulResetTaskStatsFlag;
} tOCTVC1_IRSC_MSG_PROCESS_STATS_CMD;
@@ -539,16 +327,14 @@ typedef struct
hProcess
State
Current process state.
- ulTotalCacheMissCnt
Error
Process Error
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hProcess;
+ tOCT_UINT32 hProcess;
tOCTVC1_PROCESS_STATE_ENUM State;
- tOCT_UINT32 ulTotalCacheMissCnt;
tOCTVC1_PROCESS_ERROR Error;
} tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP;
@@ -619,8 +405,6 @@ typedef struct
IPC port identifier
ulUserId
IPC port user identifier
- ulModuleId
- Module Id.
hRemoteProcess
Remote Process identifier
ulRemotePortId
@@ -635,8 +419,8 @@ typedef struct
Process Local Port Idx
ulSystemFlag
System Flag
- Clone
- Ipc Port Clone information.
+ ulGhostFlag
+ Ghost Flag. Use for internal test.
ulRecvMsgNum
Reception array message number.
ulRecvMsgSize
@@ -648,7 +432,6 @@ typedef struct
tOCTVC1_HANDLE_OBJECT hProcess;
tOCTVC1_SUB_OBJECT_ID ulPortId;
tOCT_UINT32 ulUserId;
- tOCT_UINT32 ulModuleId;
tOCTVC1_HANDLE_OBJECT hRemoteProcess;
tOCTVC1_SUB_OBJECT_ID ulRemotePortId;
tOCT_UINT32 ulRemoteUserId;
@@ -656,7 +439,7 @@ typedef struct
tOCT_UINT32 ulPortIdx;
tOCTVC1_IRSC_IPC_PORT_TYPE_ENUM ulType;
tOCT_BOOL32 ulSystemFlag;
- tOCTVC1_IRSC_IPC_PORT_CLONE Clone;
+ tOCT_BOOL32 ulGhostFlag;
tOCT_UINT32 ulRecvMsgNum;
tOCT_UINT32 ulRecvMsgSize;
@@ -779,8 +562,6 @@ typedef struct
Process identifier
ulTaskIndex
Task identifier
- ulModuleId
- Module Id.
szName
Name given to the task
-------------------------------------------------------------------------------------*/
@@ -789,7 +570,6 @@ typedef struct
tOCTVC1_MSG_HEADER Header;
tOCTVC1_HANDLE_OBJECT hProcess;
tOCTVC1_SUB_OBJECT_ID ulTaskIndex;
- tOCT_UINT32 ulModuleId;
tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];
} tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP;
@@ -1480,64 +1260,6 @@ typedef struct
} tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP;
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP
-
- Members:
- Header
- OCTVC1 Message Header
- Info
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_IRSC_ROUTER_INFO Info;
-
-} tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP
-
- Members:
- Header
- OCTVC1 Message Header
- Stats
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_IRSC_ROUTER_STATS Stats;
-
-} tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP;
-
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_irsc_evt.h"
diff --git a/octvc1/irsc/octvc1_irsc_api_priv.h b/octvc1/irsc/octvc1_irsc_api_priv.h
index ce6c670..c915900 100644
--- a/octvc1/irsc/octvc1_irsc_api_priv.h
+++ b/octvc1/irsc/octvc1_irsc_api_priv.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -39,8 +39,6 @@ $Revision: $
-
-
/***************************** METHODS *************************************/
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
diff --git a/octvc1/irsc/octvc1_irsc_api_priv_swap.h b/octvc1/irsc/octvc1_irsc_api_priv_swap.h
index b0a5857..fd1cb12 100644
--- a/octvc1/irsc/octvc1_irsc_api_priv_swap.h
+++ b/octvc1/irsc/octvc1_irsc_api_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/irsc/octvc1_irsc_api_swap.h b/octvc1/irsc/octvc1_irsc_api_swap.h
index 428f8ea..8403d85 100644
--- a/octvc1/irsc/octvc1_irsc_api_swap.h
+++ b/octvc1/irsc/octvc1_irsc_api_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IRSC_API_SWAP_H__
@@ -54,29 +54,6 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_SWAP( pType ){ \
- *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
-#else
-
-#define mOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_SWAP( pType )
-
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_IPC_PORT_CLONE_SWAP( _f_pParms ){ tOCTVC1_IRSC_IPC_PORT_CLONE * pOCTVC1_IRSC_IPC_PORT_CLONE = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_IPC_PORT_CLONE)\
- { mOCTVC1_IRSC_IPC_PORT_CLONE_STATE_ENUM_SWAP( &((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulCloneState ); } \
- ((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->hProcess = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->hProcess); \
- ((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulPortId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulPortId); \
- ((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulUserPortId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_IPC_PORT_CLONE *)pOCTVC1_IRSC_IPC_PORT_CLONE)->ulUserPortId); \
-}
-#else
-#define mOCTVC1_IRSC_IPC_PORT_CLONE_SWAP( pOCTVC1_IRSC_IPC_PORT_CLONE )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_IRSC_API_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_API_STATS * pOCTVC1_IRSC_API_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_API_STATS)\
((tOCTVC1_IRSC_API_STATS *)pOCTVC1_IRSC_API_STATS)->ulMaxProcessingTimeUs = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_API_STATS *)pOCTVC1_IRSC_API_STATS)->ulMaxProcessingTimeUs); \
@@ -142,11 +119,9 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_IRSC_APPLICATION_TAP_INFO_SWAP( _f_pParms ){ tOCTVC1_IRSC_APPLICATION_TAP_INFO * pOCTVC1_IRSC_APPLICATION_TAP_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_APPLICATION_TAP_INFO)\
- ((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulModuleId); \
+ { 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_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulProcessUserId ); } \
{ mOCTVC1_TAP_DIRECTION_ENUM_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulDirection ); } \
((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulDataSubType = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_INFO *)pOCTVC1_IRSC_APPLICATION_TAP_INFO)->ulDataSubType); \
@@ -156,30 +131,12 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_STREAM_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_STREAM_STATS * pOCTVC1_IRSC_STREAM_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_STREAM_STATS)\
- ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulPacketCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulPacketCnt); \
- ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulDropCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulDropCnt); \
- ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulOverflowCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulOverflowCnt); \
- ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulRetryCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulRetryCnt); \
- ((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulMissCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_STREAM_STATS *)pOCTVC1_IRSC_STREAM_STATS)->ulMissCnt); \
-}
-#else
-#define mOCTVC1_IRSC_STREAM_STATS_SWAP( pOCTVC1_IRSC_STREAM_STATS )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_IRSC_APPLICATION_TAP_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_APPLICATION_TAP_STATS * pOCTVC1_IRSC_APPLICATION_TAP_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_APPLICATION_TAP_STATS)\
{ mOCTVC1_IRSC_APPLICATION_TAP_STATE_ENUM_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulState ); } \
((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulFilterIndex = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulFilterIndex); \
((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulUserId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->ulUserId); \
- { mOCTVC1_IRSC_STREAM_STATS_SWAP( &((tOCTVC1_IRSC_APPLICATION_TAP_STATS *)pOCTVC1_IRSC_APPLICATION_TAP_STATS)->Stream ); } \
}
#else
#define mOCTVC1_IRSC_APPLICATION_TAP_STATS_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_STATS )
@@ -194,101 +151,12 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulFilterIndex); \
((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulUserId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulUserId); \
- ((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulRetryEnableFlag = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_APPLICATION_TAP_START *)pOCTVC1_IRSC_APPLICATION_TAP_START)->ulRetryEnableFlag); \
}
#else
#define mOCTVC1_IRSC_APPLICATION_TAP_START_SWAP( pOCTVC1_IRSC_APPLICATION_TAP_START )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_SWAP( pType ){ \
- *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
-#else
-
-#define mOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_SWAP( pType )
-
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_ROUTER_INTERFACE_INFO_SWAP( _f_pParms ){ tOCTVC1_IRSC_ROUTER_INTERFACE_INFO * pOCTVC1_IRSC_ROUTER_INTERFACE_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)\
- ((tOCTVC1_IRSC_ROUTER_INTERFACE_INFO *)pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)->ulInterfaceIndex = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_INFO *)pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)->ulInterfaceIndex); \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_ROUTER_INTERFACE_INFO *)pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)->ulProcessUserId ); } \
- { mOCTVC1_IRSC_ROUTER_INTERFACE_TYPE_ENUM_SWAP( &((tOCTVC1_IRSC_ROUTER_INTERFACE_INFO *)pOCTVC1_IRSC_ROUTER_INTERFACE_INFO)->ulType ); } \
-}
-#else
-#define mOCTVC1_IRSC_ROUTER_INTERFACE_INFO_SWAP( pOCTVC1_IRSC_ROUTER_INTERFACE_INFO )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_ROUTER_INTERFACE_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_ROUTER_INTERFACE_STATS * pOCTVC1_IRSC_ROUTER_INTERFACE_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)\
- ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulInterfaceIndex = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulInterfaceIndex); \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulProcessUserId ); } \
- ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulSentPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulSentPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulRecvPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulRecvPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulErrSentPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulErrSentPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulErrRecvPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INTERFACE_STATS *)pOCTVC1_IRSC_ROUTER_INTERFACE_STATS)->ulErrRecvPktCnt); \
-}
-#else
-#define mOCTVC1_IRSC_ROUTER_INTERFACE_STATS_SWAP( pOCTVC1_IRSC_ROUTER_INTERFACE_STATS )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_ROUTER_INFO_SWAP( _f_pParms ){ tOCTVC1_IRSC_ROUTER_INFO * pOCTVC1_IRSC_ROUTER_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_ROUTER_INFO)\
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulProcessUserId ); } \
- ((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulSafeModeFlag = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulSafeModeFlag); \
- ((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulInterfaceMaxNum = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulInterfaceMaxNum); \
- ((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulInterfaceNum = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->ulInterfaceNum); \
- { tOCT_UINT32 jOCTVC1_IRSC_ROUTER_INFO; \
- for( jOCTVC1_IRSC_ROUTER_INFO=0; \
- jOCTVC1_IRSC_ROUTER_INFO<(cOCTVC1_IRSC_ROUTER_MAX_INTERFACE);jOCTVC1_IRSC_ROUTER_INFO++ ) \
- { mOCTVC1_IRSC_ROUTER_INTERFACE_INFO_SWAP( &((tOCTVC1_IRSC_ROUTER_INFO *)pOCTVC1_IRSC_ROUTER_INFO)->aInterfaceInfo[jOCTVC1_IRSC_ROUTER_INFO] ); }} \
-}
-#else
-#define mOCTVC1_IRSC_ROUTER_INFO_SWAP( pOCTVC1_IRSC_ROUTER_INFO )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_ROUTER_STATS_SWAP( _f_pParms ){ tOCTVC1_IRSC_ROUTER_STATS * pOCTVC1_IRSC_ROUTER_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_ROUTER_STATS)\
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalSentPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalSentPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalRecvPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalRecvPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalErrSentPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalErrSentPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalErrRecvPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceTotalErrRecvPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulTotalSentPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulTotalSentPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulTotalRecvPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulTotalRecvPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulSentEvtPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulSentEvtPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulModuleDataTotalRecvPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulModuleDataTotalRecvPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulModuleDataTotalSentPktCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulModuleDataTotalSentPktCnt); \
- ((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceNum = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->ulInterfaceNum); \
- { tOCT_UINT32 jOCTVC1_IRSC_ROUTER_STATS; \
- for( jOCTVC1_IRSC_ROUTER_STATS=0; \
- jOCTVC1_IRSC_ROUTER_STATS<(cOCTVC1_IRSC_ROUTER_MAX_INTERFACE);jOCTVC1_IRSC_ROUTER_STATS++ ) \
- { mOCTVC1_IRSC_ROUTER_INTERFACE_STATS_SWAP( &((tOCTVC1_IRSC_ROUTER_STATS *)pOCTVC1_IRSC_ROUTER_STATS)->aInterfaceStats[jOCTVC1_IRSC_ROUTER_STATS] ); }} \
-}
-#else
-#define mOCTVC1_IRSC_ROUTER_STATS_SWAP( pOCTVC1_IRSC_ROUTER_STATS )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_IRSC_MSG_PROCESS_INFO_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD * pOCTVC1_IRSC_MSG_PROCESS_INFO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_PROCESS_INFO_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD *)pOCTVC1_IRSC_MSG_PROCESS_INFO_CMD)->Header ); } \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_CMD *)pOCTVC1_IRSC_MSG_PROCESS_INFO_CMD)->hProcess = \
@@ -303,9 +171,7 @@ extern "C" {
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->Header ); } \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->hProcess); \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulUserId ); } \
- ((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulModuleId); \
+ { mOCTVC1_PROCESS_TYPE_ENUM_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP)->ulType ); } \
}
#else
#define mOCTVC1_IRSC_MSG_PROCESS_INFO_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_INFO_RSP )
@@ -333,8 +199,6 @@ extern "C" {
((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->hProcess); \
{ mOCTVC1_PROCESS_STATE_ENUM_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->State ); } \
- ((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->ulTotalCacheMissCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->ulTotalCacheMissCnt); \
{ mOCTVC1_PROCESS_ERROR_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_STATS_RSP *)pOCTVC1_IRSC_MSG_PROCESS_STATS_RSP)->Error ); } \
}
#else
@@ -381,8 +245,6 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulPortId); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulUserId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulUserId); \
- ((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulModuleId); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->hRemoteProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->hRemoteProcess); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulRemotePortId = \
@@ -394,7 +256,8 @@ extern "C" {
{ mOCTVC1_IRSC_IPC_PORT_TYPE_ENUM_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulType ); } \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulSystemFlag = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulSystemFlag); \
- { mOCTVC1_IRSC_IPC_PORT_CLONE_SWAP( &((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->Clone ); } \
+ ((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulGhostFlag = \
+ mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulGhostFlag); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulRecvMsgNum = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulRecvMsgNum); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_IPC_PORT_RSP)->ulRecvMsgSize = \
@@ -475,8 +338,6 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->hProcess); \
((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->ulTaskIndex = \
mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->ulTaskIndex); \
- ((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP *)pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP)->ulModuleId); \
}
#else
#define mOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP_SWAP( pOCTVC1_IRSC_MSG_PROCESS_INFO_TASK_RSP )
@@ -880,40 +741,6 @@ extern "C" {
#define mOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_RSP )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_MSG_ROUTER_INFO_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD * pOCTVC1_IRSC_MSG_ROUTER_INFO_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_INFO_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD *)pOCTVC1_IRSC_MSG_ROUTER_INFO_CMD)->Header ); } \
-}
-#else
-#define mOCTVC1_IRSC_MSG_ROUTER_INFO_CMD_SWAP( pOCTVC1_IRSC_MSG_ROUTER_INFO_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_MSG_ROUTER_INFO_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP * pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP)->Header ); } \
- { mOCTVC1_IRSC_ROUTER_INFO_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_INFO_RSP *)pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP)->Info ); } \
-}
-#else
-#define mOCTVC1_IRSC_MSG_ROUTER_INFO_RSP_SWAP( pOCTVC1_IRSC_MSG_ROUTER_INFO_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_MSG_ROUTER_STATS_CMD_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD * pOCTVC1_IRSC_MSG_ROUTER_STATS_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_STATS_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD *)pOCTVC1_IRSC_MSG_ROUTER_STATS_CMD)->Header ); } \
-}
-#else
-#define mOCTVC1_IRSC_MSG_ROUTER_STATS_CMD_SWAP( pOCTVC1_IRSC_MSG_ROUTER_STATS_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_MSG_ROUTER_STATS_RSP_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP * pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP *)pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP)->Header ); } \
- { mOCTVC1_IRSC_ROUTER_STATS_SWAP( &((tOCTVC1_IRSC_MSG_ROUTER_STATS_RSP *)pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP)->Stats ); } \
-}
-#else
-#define mOCTVC1_IRSC_MSG_ROUTER_STATS_RSP_SWAP( pOCTVC1_IRSC_MSG_ROUTER_STATS_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
#ifdef __cplusplus
}
diff --git a/octvc1/irsc/octvc1_irsc_base.h b/octvc1/irsc/octvc1_irsc_base.h
index b0d9c1d..d3b87a0 100644
--- a/octvc1/irsc/octvc1_irsc_base.h
+++ b/octvc1/irsc/octvc1_irsc_base.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_default.h b/octvc1/irsc/octvc1_irsc_default.h
index baa24c3..27fbe5c 100644
--- a/octvc1/irsc/octvc1_irsc_default.h
+++ b/octvc1/irsc/octvc1_irsc_default.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -830,8 +830,7 @@ const tOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CMD buf_tOCTVC1_IRSC_MSG_APPLICATIO
cOCTVC1_IRSC_APPLICATION_TAP_MODE_ENUM_STREAM, /* ulMode */
cOCTVC1_IRSC_APPLICATION_TRANSPORT_MAX_DATA_SIZE, /* ulMaxTransportDataSize */
cOCTVC1_INDEX_INVALID, /* ulFilterIndex */
- 0, /* ulUserId */
- cOCT_FALSE /* ulRetryEnableFlag */
+ 0 /* ulUserId */
}
};
@@ -879,65 +878,5 @@ extern const tOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CMD *g_pOctDef_tOCTVC1_IRSC_M
}
-/*--------------------------------------------------------------------------
- tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD buf_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_IRSC_MSG_ROUTER_INFO_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- }
-};
-
-const tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD =
- &buf_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_IRSC_MSG_ROUTER_INFO_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_INFO_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD buf_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_IRSC_MSG_ROUTER_STATS_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- }
-};
-
-const tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD =
- &buf_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_IRSC_MSG_ROUTER_STATS_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_IRSC_MSG_ROUTER_STATS_CMD; \
- }
-
-
#endif /* __OCTVC1_IRSC_DEFAULT_H__ */
diff --git a/octvc1/irsc/octvc1_irsc_default_priv.h b/octvc1/irsc/octvc1_irsc_default_priv.h
index fa44cb9..f8ddaac 100644
--- a/octvc1/irsc/octvc1_irsc_default_priv.h
+++ b/octvc1/irsc/octvc1_irsc_default_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_evt.h b/octvc1/irsc/octvc1_irsc_evt.h
index f7394c2..a367259 100644
--- a/octvc1/irsc/octvc1_irsc_evt.h
+++ b/octvc1/irsc/octvc1_irsc_evt.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -44,39 +44,10 @@ $Octasic_Revision: $
typedef struct
{
tOCTVC1_EVENT_HEADER Header;
- tOCTVC1_HANDLE_OBJECT hProcess;
+ tOCT_UINT32 hProcess;
} tOCTVC1_IRSC_MSG_PROCESS_DUMP_EVT;
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT
-
- Members:
- Header
- hTapId
- ulDataSize
- hLogicalObj
- Contains an Object Handle for the Tap that has been started
- This handle will also be placed in
- DataHeader.VocNetHeader.hLogicalObj.aulHandle[0]
- of the tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER at the header of each data packet
- sent.
- ulSequenceId
- In the case of a retry, request data starting from this Sequence ID
- ulRetryFlag
- Indicates if this event is a retry request
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_EVENT_HEADER Header;
- tOCT_UINT32 hTapId;
- tOCT_UINT32 ulDataSize;
- tOCTVC1_HANDLE_OBJECT hLogicalObj;
- tOCT_UINT32 ulSequenceId;
- tOCT_BOOL32 ulRetryFlag;
-
-} tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT;
-
#endif /* __OCTVC1_IRSC_EVT_H__ */
diff --git a/octvc1/irsc/octvc1_irsc_evt_priv.h b/octvc1/irsc/octvc1_irsc_evt_priv.h
index 66de5bd..2ab4d71 100644
--- a/octvc1/irsc/octvc1_irsc_evt_priv.h
+++ b/octvc1/irsc/octvc1_irsc_evt_priv.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_evt_priv_swap.h b/octvc1/irsc/octvc1_irsc_evt_priv_swap.h
index 68779f6..b0cbfc1 100644
--- a/octvc1/irsc/octvc1_irsc_evt_priv_swap.h
+++ b/octvc1/irsc/octvc1_irsc_evt_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/irsc/octvc1_irsc_evt_swap.h b/octvc1/irsc/octvc1_irsc_evt_swap.h
index 2577310..178f6d3 100644
--- a/octvc1/irsc/octvc1_irsc_evt_swap.h
+++ b/octvc1/irsc/octvc1_irsc_evt_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IRSC_EVT_SWAP_H__
@@ -45,24 +45,6 @@ extern "C" {
#define mOCTVC1_IRSC_MSG_PROCESS_DUMP_EVT_SWAP( pOCTVC1_IRSC_MSG_PROCESS_DUMP_EVT )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT_SWAP( _f_pParms ){ tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT * pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)\
- { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->Header ); } \
- ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->hTapId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->hTapId); \
- ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulDataSize = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulDataSize); \
- ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->hLogicalObj = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->hLogicalObj); \
- ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulSequenceId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulSequenceId); \
- ((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulRetryFlag = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT *)pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT)->ulRetryFlag); \
-}
-#else
-#define mOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT_SWAP( pOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EVT )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
#ifdef __cplusplus
}
diff --git a/octvc1/irsc/octvc1_irsc_id.h b/octvc1/irsc/octvc1_irsc_id.h
index ed43af5..c53d4b7 100644
--- a/octvc1/irsc/octvc1_irsc_id.h
+++ b/octvc1/irsc/octvc1_irsc_id.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -61,18 +61,15 @@ $Octasic_Revision: $
#define cOCTVC1_IRSC_MSG_APPLICATION_STATS_TAP_CID ( 0x018 + cOCTVC1_IRSC_CID_BASE )
#define cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID ( 0x019 + cOCTVC1_IRSC_CID_BASE )
#define cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID ( 0x01a + cOCTVC1_IRSC_CID_BASE )
-#define cOCTVC1_IRSC_MSG_ROUTER_INFO_CID ( 0x01b + cOCTVC1_IRSC_CID_BASE )
-#define cOCTVC1_IRSC_MSG_ROUTER_STATS_CID ( 0x01c + cOCTVC1_IRSC_CID_BASE )
-#define cOCTVC1_IRSC_CID_MAX (( 0x01c + 1 ) & 0xFFF)
+#define cOCTVC1_IRSC_CID_MAX (( 0x01a + 1 ) & 0xFFF)
/****************************************************************************
Event IDs
****************************************************************************/
-#define cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID ( 0x0001 + cOCTVC1_IRSC_EID_BASE )
-#define cOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EID ( 0x0002 + cOCTVC1_IRSC_EID_BASE )
+#define cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID ( 0x0001 + cOCTVC1_IRSC_EID_BASE )
-#define cOCTVC1_IRSC_EID_MAX (( 0x0002 + 1 ) & 0xFFFF)
+#define cOCTVC1_IRSC_EID_MAX (( 0x0001 + 1 ) & 0xFFFF)
#endif /* __OCTVC1_IRSC_ID_H__ */
diff --git a/octvc1/irsc/octvc1_irsc_id_priv.h b/octvc1/irsc/octvc1_irsc_id_priv.h
index 12a8eca..c262ad1 100644
--- a/octvc1/irsc/octvc1_irsc_id_priv.h
+++ b/octvc1/irsc/octvc1_irsc_id_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_rc.h b/octvc1/irsc/octvc1_irsc_rc.h
index 7a9e93d..5ca9934 100644
--- a/octvc1/irsc/octvc1_irsc_rc.h
+++ b/octvc1/irsc/octvc1_irsc_rc.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -49,13 +49,6 @@ $Octasic_Revision: $
#define cOCTVC1_IRSC_RC_OBJMGR_NOT_INIT ( 0x0004 + cOCTVC1_IRSC_OBJMGR_RC_BASE )
/****************************************************************************
- ROUTER return codes
- ****************************************************************************/
-#define cOCTVC1_IRSC_ROUTER_RC_BASE ( 0x0460 + cOCTVC1_IRSC_RC_BASE )
-
-#define cOCTVC1_IRSC_RC_ROUTER_ROUTER_IF_INVALID ( 0x0001 + cOCTVC1_IRSC_ROUTER_RC_BASE )
-
-/****************************************************************************
API_COMMAND return codes
****************************************************************************/
#define cOCTVC1_IRSC_API_COMMAND_RC_BASE ( 0x0550 + cOCTVC1_IRSC_RC_BASE )
diff --git a/octvc1/irsc/octvc1_irsc_rc_priv.h b/octvc1/irsc/octvc1_irsc_rc_priv.h
index 23873f7..a88cc83 100644
--- a/octvc1/irsc/octvc1_irsc_rc_priv.h
+++ b/octvc1/irsc/octvc1_irsc_rc_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/irsc/octvc1_irsc_version.h b/octvc1/irsc/octvc1_irsc_version.h
index 1f28bc2..ffbbe55 100644
--- a/octvc1/irsc/octvc1_irsc_version.h
+++ b/octvc1/irsc/octvc1_irsc_version.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $
bit[10:0]: Build number
*/
#define cOCTVC1_IRSC_VERSION_MAJOR 2
-#define cOCTVC1_IRSC_VERSION_MINOR 7
+#define cOCTVC1_IRSC_VERSION_MINOR 5
#define cOCTVC1_IRSC_VERSION_MAINTENANCE 0
-#define cOCTVC1_IRSC_VERSION_BUILD 1039
+#define cOCTVC1_IRSC_VERSION_BUILD 780
#define cOCTVC1_IRSC_VERSION_ID ( (cOCTVC1_IRSC_VERSION_MAJOR << 25) + \
(cOCTVC1_IRSC_VERSION_MINOR << 18) + \
diff --git a/octvc1/main/octvc1_main_api.h b/octvc1/main/octvc1_main_api.h
index df8db18..cf2d952 100644
--- a/octvc1/main/octvc1_main_api.h
+++ b/octvc1/main/octvc1_main_api.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -43,7 +43,6 @@ $Revision: $
#include "../octvc1_process.h"
#include "../octvc1_api.h"
#include "../octvc1_module.h"
-#include "../octvc1_user_id.h"
#include "octvc1_main_id.h"
#include "octvc1_main_rc.h"
@@ -103,11 +102,11 @@ $Revision: $
Application Module information
Members:
- ulReserved
+ ulModuleId
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCT_UINT32 ulReserved;
+ tOCTVC1_MODULE_ID_ENUM ulModuleId;
} tOCTVC1_MAIN_APPLICATION_MODULE_INFO;
@@ -118,32 +117,14 @@ typedef struct
Members:
ulState
ulConfigState
- ulProcessCnt
+ ulProcessNum
Current number of process active in this module.
- ulIpcLinkCnt
- Current number IPC Link.
- ulIpcLinkErrCnt
- Number IPC Link open with error.
- ulStartTotalCnt
- Total Count of start attempt.
- ulStartErrCnt
- Count of start with error.
- ulStopTotalCnt
- Total Count of stop attempt.
- ulStopErrCnt
- Count of stop with error.
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM ulState;
tOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM ulConfigState;
- tOCT_UINT32 ulProcessCnt;
- tOCT_UINT32 ulIpcLinkCnt;
- tOCT_UINT32 ulIpcLinkErrCnt;
- tOCT_UINT32 ulStartTotalCnt;
- tOCT_UINT32 ulStartErrCnt;
- tOCT_UINT32 ulStopTotalCnt;
- tOCT_UINT32 ulStopErrCnt;
+ tOCT_UINT32 ulProcessNum;
} tOCTVC1_MAIN_APPLICATION_MODULE_STATS;
@@ -224,32 +205,6 @@ typedef struct
#define cOCTVC1_MAIN_FILE_OPEN_MODE_MASK_WRITE 0x2
/*-------------------------------------------------------------------------------------
- Stream related definitions
--------------------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------------------
- Stream state.
--------------------------------------------------------------------------------------*/
-#define tOCTVC1_MAIN_STREAM_STATE_ENUM tOCT_UINT32
-
-#define cOCTVC1_MAIN_STREAM_STATE_ENUM_STOP 0
-#define cOCTVC1_MAIN_STREAM_STATE_ENUM_START 1
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_STREAM_INFO
-
- Members:
- hLogicalObj
- ulState
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_HANDLE_OBJECT hLogicalObj;
- tOCTVC1_MAIN_STREAM_STATE_ENUM ulState;
-
-} tOCTVC1_MAIN_STREAM_INFO;
-
-/*-------------------------------------------------------------------------------------
LOG related sections.
-------------------------------------------------------------------------------------*/
@@ -262,7 +217,6 @@ typedef struct
#define cOCTVC1_MAIN_LOG_TRACE_STATE_ENUM_START 1
#define cOCTVC1_MAIN_LOG_MAX_NUM_FILES 32 /* Maximum total number of log files that can be logged to */
#define cOCTVC1_MAIN_LOG_FILE_PREFIX_MAX_LENGTH (cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH-2) /* Maximum length of the prefix of the log filename */
-#define cOCTVC1_MAIN_LOG_TRACE_FILTER_PROCESS_ENTRY_MAX 8 /* Max number of process entry in log trace filter */
/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_LOG_TRACE_STATS
@@ -317,31 +271,6 @@ typedef struct
} tOCTVC1_MAIN_LOG_TRACE_INFO;
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_LOG_TRACE_FILTER
-
- Members:
- ulTraceProcessAllFlag
- Default: cOCT_TRUE
- When set to cOCT_TRUE, the trace will be started for all process
- When set to cOCT_FALSE, the trace will be started only for specified process
- aTraceProcessUserId
- Default: cOCTVC1_USER_ID_PROCESS_ENUM_INVALID
- Process User ID to start trace.
- Only used, if ulTraceProcessAllFlag set to cOCT_FALSE
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCT_BOOL32 ulTraceProcessAllFlag;
- tOCTVC1_USER_ID_PROCESS_ENUM aTraceProcessUserId[cOCTVC1_MAIN_LOG_TRACE_FILTER_PROCESS_ENTRY_MAX];
-
-} tOCTVC1_MAIN_LOG_TRACE_FILTER;
-
-/*-------------------------------------------------------------------------------------
- Main Module Data Definitions
--------------------------------------------------------------------------------------*/
-#define cOCTVC1_MAIN_MODULE_DATA_IPC ((0x0001)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_MODULE_ID_BIT_OFFSET))
-
/***************************** METHODS *************************************/
/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_TARGET_RESET_CMD
@@ -539,17 +468,14 @@ typedef struct
ulFileNumber
Default: 4
The maximum number of files for tracing
- Filter
- Trace Filter
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_BOOL32 ulFullAutoStopFlag;
- tOCTVC1_LOG_TRACE_MASK ulTraceMask;
- tOCT_UINT32 ulFileSize;
- tOCT_UINT32 ulFileNumber;
- tOCTVC1_MAIN_LOG_TRACE_FILTER Filter;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_BOOL32 ulFullAutoStopFlag;
+ tOCTVC1_LOG_TRACE_MASK ulTraceMask;
+ tOCT_UINT32 ulFileSize;
+ tOCT_UINT32 ulFileNumber;
} tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD;
@@ -645,8 +571,6 @@ typedef struct
The tracing masks that are currently active
TraceStats
Trace stats structure
- Filter
- Trace Filter
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -655,7 +579,6 @@ typedef struct
tOCT_UINT32 ulFullAutoStopFlag;
tOCTVC1_LOG_TRACE_MASK ulTraceMask;
tOCTVC1_MAIN_LOG_TRACE_STATS TraceStats;
- tOCTVC1_MAIN_LOG_TRACE_FILTER Filter;
} tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP;
@@ -762,7 +685,7 @@ typedef struct
} tOCTVC1_MAIN_MSG_FILE_CLOSE_RSP;
/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD
Members:
Header
@@ -775,10 +698,10 @@ typedef struct
tOCTVC1_MSG_HEADER Header;
tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
-} tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD;
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD;
/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP
Members:
Header
@@ -791,10 +714,8 @@ typedef struct
tOCTVC1_MSG_HEADER Header;
tOCT_INT8 szFileName[(cOCTVC1_MAIN_FILE_NAME_MAX_LENGTH+1)];
-} tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP;
+} tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP;
-#define tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD /* OCTVC1_RENAMED_API */
-#define tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP /* OCTVC1_RENAMED_API */
/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_FILE_WRITE_CMD
@@ -1043,19 +964,16 @@ typedef struct
Process Name.
szProcessImageName
Process file name.
- ulModuleId
- Module Id.
- ulUserId
- Process user identifier
+ ulType
+ Process Type.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 hProcess;
- tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCT_INT8 szProcessImageName[(cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
- tOCT_UINT32 ulModuleId;
- tOCTVC1_USER_ID_PROCESS_ENUM ulUserId;
+ tOCTVC1_MSG_HEADER Header;
+ tOCT_UINT32 hProcess;
+ tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+ tOCT_INT8 szProcessImageName[(cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
+ tOCTVC1_PROCESS_TYPE_ENUM ulType;
} tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP;
@@ -1505,6 +1423,33 @@ typedef struct
} tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_RSP;
/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_START_CMD
+ This command starts the application.
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_MAIN_MSG_APPLICATION_START_CMD;
+
+/*-------------------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_START_RSP
+
+ Members:
+ Header
+ OCTVC1 Message Header
+-------------------------------------------------------------------------------------*/
+typedef struct
+{
+ tOCTVC1_MSG_HEADER Header;
+
+} tOCTVC1_MAIN_MSG_APPLICATION_START_RSP;
+
+/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD
This command stops the application.
@@ -1514,7 +1459,6 @@ typedef struct
ulQuit
Whether the app should quit after stopping. If set to cOCT_TRUE,
the app will quit after stopping.
- If set to cOCT_FALSE, the app will stop all but 'system' modules.
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -1529,16 +1473,10 @@ typedef struct
Members:
Header
OCTVC1 Message Header
- ulModuleStopCnt
- Number of module stopped.
- ulModuleStopErrCnt
- Number of module not stopped cause of errors.
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleStopCnt;
- tOCT_UINT32 ulModuleStopErrCnt;
} tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP;
@@ -1654,12 +1592,12 @@ typedef struct
Members:
Header
OCTVC1 Message Header
- ulModuleId
+ hModule
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleId;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hModule;
} tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD;
@@ -1669,7 +1607,7 @@ typedef struct
Members:
Header
OCTVC1 Message Header
- ulModuleId
+ hModule
szName
Module Name.
Info
@@ -1678,7 +1616,7 @@ typedef struct
typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleId;
+ tOCTVC1_HANDLE_OBJECT hModule;
tOCT_INT8 szName[(cOCTVC1_HANDLE_OBJECT32_NAME_MAX_LENGTH+1)];/* NOSWAPMAC */
tOCTVC1_MAIN_APPLICATION_MODULE_INFO Info;
@@ -1690,16 +1628,16 @@ typedef struct
Members:
Header
OCTVC1 Message Header
- ulModuleId
+ hModule
ulResetStatsFlag
Default: cOCT_FALSE
Statistics counters will be reset to zero after the current values are returned.
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleId;
- tOCT_BOOL32 ulResetStatsFlag;
+ tOCTVC1_MSG_HEADER Header;
+ tOCTVC1_HANDLE_OBJECT hModule;
+ tOCT_BOOL32 ulResetStatsFlag;
} tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD;
@@ -1709,14 +1647,14 @@ typedef struct
Members:
Header
OCTVC1 Message Header
- ulModuleId
+ hModule
Stats
Module stats
-------------------------------------------------------------------------------------*/
typedef struct
{
tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleId;
+ tOCTVC1_HANDLE_OBJECT hModule;
tOCTVC1_MAIN_APPLICATION_MODULE_STATS Stats;
} tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP;
@@ -1756,163 +1694,6 @@ typedef struct
} tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP;
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP
-
- Members:
- Header
- OCTVC1 Message Header
- Info
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCTVC1_MAIN_STREAM_INFO Info;
-
-} tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP
-
- Members:
- Header
- OCTVC1 Message Header
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
-
-} tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD
- This command starts the module.
-
- Members:
- Header
- OCTVC1 Message Header
- ulModuleId
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleId;
-
-} tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP
-
- Members:
- Header
- OCTVC1 Message Header
- ulModuleId
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleId;
-
-} tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD
- This command stops the module.
-
- Members:
- Header
- OCTVC1 Message Header
- ulModuleId
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleId;
-
-} tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD;
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP
-
- Members:
- Header
- OCTVC1 Message Header
- ulModuleId
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MSG_HEADER Header;
- tOCT_UINT32 ulModuleId;
-
-} tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP;
-
-
-/***************************** MODULE_DATA *************************************/
-/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_DATA_MDA
-
- Members:
- ModuleData
- OCTVC1 Module Data
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_MODULE_DATA ModuleData;
-
-} tOCTVC1_MAIN_MSG_LOG_DATA_MDA;
-
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_main_evt.h"
diff --git a/octvc1/main/octvc1_main_api_priv.h b/octvc1/main/octvc1_main_api_priv.h
index e162de3..86fb199 100644
--- a/octvc1/main/octvc1_main_api_priv.h
+++ b/octvc1/main/octvc1_main_api_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -45,12 +45,8 @@ $Revision: $
-
-
/***************************** METHODS *************************************/
-/***************************** MODULE_DATA *************************************/
-
/*************** INCLUDE FILES WITH DEPENDENCIES ON THIS FILE **************/
#include "octvc1_main_evt_priv.h"
diff --git a/octvc1/main/octvc1_main_api_priv_swap.h b/octvc1/main/octvc1_main_api_priv_swap.h
index 2b64f57..032ac53 100644
--- a/octvc1/main/octvc1_main_api_priv_swap.h
+++ b/octvc1/main/octvc1_main_api_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/main/octvc1_main_api_swap.h b/octvc1/main/octvc1_main_api_swap.h
index 2150261..f913a84 100644
--- a/octvc1/main/octvc1_main_api_swap.h
+++ b/octvc1/main/octvc1_main_api_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MAIN_API_SWAP_H__
@@ -64,8 +64,7 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_APPLICATION_MODULE_INFO_SWAP( _f_pParms ){ tOCTVC1_MAIN_APPLICATION_MODULE_INFO * pOCTVC1_MAIN_APPLICATION_MODULE_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_APPLICATION_MODULE_INFO)\
- ((tOCTVC1_MAIN_APPLICATION_MODULE_INFO *)pOCTVC1_MAIN_APPLICATION_MODULE_INFO)->ulReserved = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_INFO *)pOCTVC1_MAIN_APPLICATION_MODULE_INFO)->ulReserved); \
+ { mOCTVC1_MODULE_ID_ENUM_SWAP( &((tOCTVC1_MAIN_APPLICATION_MODULE_INFO *)pOCTVC1_MAIN_APPLICATION_MODULE_INFO)->ulModuleId ); } \
}
#else
#define mOCTVC1_MAIN_APPLICATION_MODULE_INFO_SWAP( pOCTVC1_MAIN_APPLICATION_MODULE_INFO )
@@ -75,20 +74,8 @@ extern "C" {
#define mOCTVC1_MAIN_APPLICATION_MODULE_STATS_SWAP( _f_pParms ){ tOCTVC1_MAIN_APPLICATION_MODULE_STATS * pOCTVC1_MAIN_APPLICATION_MODULE_STATS = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_APPLICATION_MODULE_STATS)\
{ mOCTVC1_MAIN_APPLICATION_MODULE_STATE_ENUM_SWAP( &((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulState ); } \
{ mOCTVC1_MAIN_APPLICATION_MODULE_CONFIG_STATE_ENUM_SWAP( &((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulConfigState ); } \
- ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulProcessCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulProcessCnt); \
- ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulIpcLinkCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulIpcLinkCnt); \
- ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulIpcLinkErrCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulIpcLinkErrCnt); \
- ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStartTotalCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStartTotalCnt); \
- ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStartErrCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStartErrCnt); \
- ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStopTotalCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStopTotalCnt); \
- ((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStopErrCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_APPLICATION_MODULE_STATS *)pOCTVC1_MAIN_APPLICATION_MODULE_STATS)->ulStopErrCnt); \
+ ((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 )
@@ -142,25 +129,6 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_STREAM_STATE_ENUM_SWAP( pType ){ \
- *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
-#else
-
-#define mOCTVC1_MAIN_STREAM_STATE_ENUM_SWAP( pType )
-
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_STREAM_INFO_SWAP( _f_pParms ){ tOCTVC1_MAIN_STREAM_INFO * pOCTVC1_MAIN_STREAM_INFO = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_STREAM_INFO)\
- ((tOCTVC1_MAIN_STREAM_INFO *)pOCTVC1_MAIN_STREAM_INFO)->hLogicalObj = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_STREAM_INFO *)pOCTVC1_MAIN_STREAM_INFO)->hLogicalObj); \
- { mOCTVC1_MAIN_STREAM_STATE_ENUM_SWAP( &((tOCTVC1_MAIN_STREAM_INFO *)pOCTVC1_MAIN_STREAM_INFO)->ulState ); } \
-}
-#else
-#define mOCTVC1_MAIN_STREAM_INFO_SWAP( pOCTVC1_MAIN_STREAM_INFO )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_LOG_TRACE_STATE_ENUM_SWAP( pType ){ \
*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
#else
@@ -196,19 +164,6 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_LOG_TRACE_FILTER_SWAP( _f_pParms ){ tOCTVC1_MAIN_LOG_TRACE_FILTER * pOCTVC1_MAIN_LOG_TRACE_FILTER = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_LOG_TRACE_FILTER)\
- ((tOCTVC1_MAIN_LOG_TRACE_FILTER *)pOCTVC1_MAIN_LOG_TRACE_FILTER)->ulTraceProcessAllFlag = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_LOG_TRACE_FILTER *)pOCTVC1_MAIN_LOG_TRACE_FILTER)->ulTraceProcessAllFlag); \
- { tOCT_UINT32 jOCTVC1_MAIN_LOG_TRACE_FILTER; \
- for( jOCTVC1_MAIN_LOG_TRACE_FILTER=0; \
- jOCTVC1_MAIN_LOG_TRACE_FILTER<(cOCTVC1_MAIN_LOG_TRACE_FILTER_PROCESS_ENTRY_MAX);jOCTVC1_MAIN_LOG_TRACE_FILTER++ ) \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_MAIN_LOG_TRACE_FILTER *)pOCTVC1_MAIN_LOG_TRACE_FILTER)->aTraceProcessUserId[jOCTVC1_MAIN_LOG_TRACE_FILTER] ); }} \
-}
-#else
-#define mOCTVC1_MAIN_LOG_TRACE_FILTER_SWAP( pOCTVC1_MAIN_LOG_TRACE_FILTER )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_TARGET_RESET_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_TARGET_RESET_CMD * pOCTVC1_MAIN_MSG_TARGET_RESET_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_TARGET_RESET_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_TARGET_RESET_CMD *)pOCTVC1_MAIN_MSG_TARGET_RESET_CMD)->Header ); } \
}
@@ -321,7 +276,6 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *)pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD)->ulFileSize); \
((tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *)pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD)->ulFileNumber = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *)pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD)->ulFileNumber); \
- { mOCTVC1_MAIN_LOG_TRACE_FILTER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *)pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD)->Filter ); } \
}
#else
#define mOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD_SWAP( pOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD )
@@ -383,7 +337,6 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP *)pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP)->ulFullAutoStopFlag); \
{ mOCTVC1_LOG_TRACE_MASK_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP *)pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP)->ulTraceMask ); } \
{ mOCTVC1_MAIN_LOG_TRACE_STATS_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP *)pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP)->TraceStats ); } \
- { mOCTVC1_MAIN_LOG_TRACE_FILTER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP *)pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP)->Filter ); } \
}
#else
#define mOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_STATS_TRACE_RSP )
@@ -453,29 +406,21 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)->Header ); } \
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD * pOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD)->Header ); } \
}
#else
-#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD )
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP)->Header ); } \
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP * pOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP *)pOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP)->Header ); } \
}
#else
-#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP )
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
- /* OCTVC1_RENAMED_API */
-#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD_SWAP mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD_SWAP
-
-
- /* OCTVC1_RENAMED_API */
-#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_RSP_SWAP mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_RSP_SWAP
-
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_FILE_WRITE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_FILE_WRITE_CMD * pOCTVC1_MAIN_MSG_FILE_WRITE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_FILE_WRITE_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_FILE_WRITE_CMD *)pOCTVC1_MAIN_MSG_FILE_WRITE_CMD)->Header ); } \
@@ -622,9 +567,7 @@ extern "C" {
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->Header ); } \
((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->hProcess); \
- ((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->ulModuleId); \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->ulUserId ); } \
+ { mOCTVC1_PROCESS_TYPE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_INFO_RSP *)pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP)->ulType ); } \
}
#else
#define mOCTVC1_MAIN_MSG_PROCESS_INFO_RSP_SWAP( pOCTVC1_MAIN_MSG_PROCESS_INFO_RSP )
@@ -889,6 +832,22 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_START_CMD * pOCTVC1_MAIN_MSG_APPLICATION_START_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_START_CMD)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_START_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_START_CMD)->Header ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_START_CMD )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_START_RSP * pOCTVC1_MAIN_MSG_APPLICATION_START_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_START_RSP)\
+ { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_START_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_START_RSP)->Header ); } \
+}
+#else
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_START_RSP )
+#endif /* _OCT_ENDIAN_TYPE_LE_ */
+
+#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD * pOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD)->Header ); } \
((tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD)->ulQuit = \
@@ -901,10 +860,6 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP * pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->ulModuleStopCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->ulModuleStopCnt); \
- ((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->ulModuleStopErrCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP)->ulModuleStopErrCnt); \
}
#else
#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STOP_RSP )
@@ -964,8 +919,8 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD)->ulModuleId); \
+ ((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 )
@@ -974,8 +929,8 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_RSP)->ulModuleId); \
+ ((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
@@ -985,8 +940,8 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->ulModuleId); \
+ ((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD)->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); \
}
@@ -997,8 +952,8 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)\
{ mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_RSP)->ulModuleId); \
+ ((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
@@ -1023,103 +978,6 @@ extern "C" {
#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP_SWAP( pOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_RSP )
#endif /* _OCT_ENDIAN_TYPE_LE_ */
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD * pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD *)pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD)->Header ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD_SWAP( pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP * pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP)->Header ); } \
- { mOCTVC1_MAIN_STREAM_INFO_SWAP( &((tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP)->Info ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_INFO_STREAM_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD * pOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD *)pOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD)->Header ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD_SWAP( pOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP * pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP)->Header ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_START_STREAM_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD * pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD *)pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD)->Header ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD_SWAP( pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP * pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP *)pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP)->Header ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP_SWAP( pOCTVC1_MAIN_MSG_LOG_STOP_STREAM_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)->ulModuleId); \
-}
-#else
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP)->ulModuleId); \
-}
-#else
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD * pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)->ulModuleId); \
-}
-#else
-#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP * pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP)\
- { mOCTVC1_MSG_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP)->Header ); } \
- ((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP)->ulModuleId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP *)pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP)->ulModuleId); \
-}
-#else
-#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP_SWAP( pOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_RSP )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_LOG_DATA_MDA_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_LOG_DATA_MDA * pOCTVC1_MAIN_MSG_LOG_DATA_MDA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_LOG_DATA_MDA)\
- { mOCTVC1_MODULE_DATA_SWAP( &((tOCTVC1_MAIN_MSG_LOG_DATA_MDA *)pOCTVC1_MAIN_MSG_LOG_DATA_MDA)->ModuleData ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_LOG_DATA_MDA_SWAP( pOCTVC1_MAIN_MSG_LOG_DATA_MDA )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
#ifdef __cplusplus
}
diff --git a/octvc1/main/octvc1_main_base.h b/octvc1/main/octvc1_main_base.h
index d2d30dd..48d240f 100644
--- a/octvc1/main/octvc1_main_base.h
+++ b/octvc1/main/octvc1_main_base.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -43,7 +43,6 @@ $Octasic_Revision: $
/* Module: MAIN */
#define cOCTVC1_MAIN_CID_BASE ( (cOCTVC1_MAIN_UID << 16) + cOCTVC1_CID_BASE )
#define cOCTVC1_MAIN_EID_BASE ( (cOCTVC1_MAIN_UID << 16) + cOCTVC1_EID_BASE )
-#define cOCTVC1_MAIN_MID_BASE ( (cOCTVC1_MAIN_UID << 24) )
#define cOCTVC1_MAIN_RC_BASE ( (cOCTVC1_MAIN_UID << 16) + cOCTVC1_RC_BASE )
#endif /* __OCTVC1_MAIN_BASE_H__ */
diff --git a/octvc1/main/octvc1_main_default.h b/octvc1/main/octvc1_main_default.h
index 75be6b6..3795a5d 100644
--- a/octvc1/main/octvc1_main_default.h
+++ b/octvc1/main/octvc1_main_default.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -231,20 +231,7 @@ const tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD buf_tOCTVC1_MAIN_MSG_LOG_START_TRACE_
cOCT_FALSE, /* ulFullAutoStopFlag */
cOCTVC1_LOG_TRACE_MASK_NONE, /* ulTraceMask */
16384, /* ulFileSize */
- 4, /* ulFileNumber */
- { /* Filter */
- cOCT_TRUE, /* ulTraceProcessAllFlag */
- { /* aTraceProcessUserId */
- cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[0] */
- cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[1] */
- cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[2] */
- cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[3] */
- cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[4] */
- cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[5] */
- cOCTVC1_USER_ID_PROCESS_ENUM_INVALID, /* aTraceProcessUserId[6] */
- cOCTVC1_USER_ID_PROCESS_ENUM_INVALID /* aTraceProcessUserId[7] */
- }
- }
+ 4 /* ulFileNumber */
};
const tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_START_TRACE_CMD =
@@ -447,16 +434,16 @@ extern const tOCTVC1_MAIN_MSG_FILE_CLOSE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_CL
/*--------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD
+ tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD
----------------------------------------------------------------------------*/
#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD =
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD =
{
{ /* Header */
- ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ ((sizeof(tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
0, /* ulTransactionId */
- ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ ((cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
0, /* ulSessionId */
0, /* ulReturnCode */
0 /* ulUserInfo */
@@ -466,19 +453,18 @@ const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD buf_tOCTVC1_MAIN_MSG_FILE_SYS
}
};
-const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD =
- &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD;
+const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD =
+ &buf_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD;
#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD;
+extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD;
#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD_DEF(pSt) \
+#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD_DEF(pSt) \
{ \
- *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD; \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD; \
}
-#define mOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CMD_DEF mOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CMD_DEF /* OCTVC1_RENAMED_API */
/*--------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_FILE_WRITE_CMD
@@ -1100,6 +1086,36 @@ extern const tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CMD *g_pOctDef
/*--------------------------------------------------------------------------
+ tOCTVC1_MAIN_MSG_APPLICATION_START_CMD
+----------------------------------------------------------------------------*/
+#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
+
+const tOCTVC1_MAIN_MSG_APPLICATION_START_CMD buf_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD =
+{
+ { /* Header */
+ ((sizeof(tOCTVC1_MAIN_MSG_APPLICATION_START_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
+ 0, /* ulTransactionId */
+ ((cOCTVC1_MAIN_MSG_APPLICATION_START_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
+ 0, /* ulSessionId */
+ 0, /* ulReturnCode */
+ 0 /* ulUserInfo */
+ }
+};
+
+const tOCTVC1_MAIN_MSG_APPLICATION_START_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD =
+ &buf_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD;
+
+#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
+extern const tOCTVC1_MAIN_MSG_APPLICATION_START_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD;
+#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
+
+#define mOCTVC1_MAIN_MSG_APPLICATION_START_CMD_DEF(pSt) \
+ { \
+ *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_CMD; \
+ }
+
+
+/*--------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_APPLICATION_STOP_CMD
----------------------------------------------------------------------------*/
#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
@@ -1239,7 +1255,7 @@ const tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICAT
0, /* ulReturnCode */
0 /* ulUserInfo */
},
- 0 /* ulModuleId */
+ 0 /* hModule */
};
const tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CMD =
@@ -1270,7 +1286,7 @@ const tOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICA
0, /* ulReturnCode */
0 /* ulUserInfo */
},
- 0, /* ulModuleId */
+ 0, /* hModule */
cOCT_FALSE /* ulResetStatsFlag */
};
@@ -1321,187 +1337,5 @@ extern const tOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CMD *g_pOctDef_tOCTVC1_MAIN_M
}
-/*--------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD buf_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- }
-};
-
-const tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD =
- &buf_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD buf_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_MAIN_MSG_LOG_START_STREAM_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- }
-};
-
-const tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD =
- &buf_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_START_STREAM_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD buf_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- }
-};
-
-const tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD =
- &buf_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- },
- 0 /* ulModuleId */
-};
-
-const tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD =
- &buf_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CMD; \
- }
-
-
-/*--------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD buf_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD =
-{
- { /* Header */
- ((sizeof(tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD)<<cOCTVC1_MSG_LENGTH_BIT_OFFSET)&cOCTVC1_MSG_LENGTH_BIT_MASK), /* ulLength */
- 0, /* ulTransactionId */
- ((cOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CID<<cOCTVC1_MSG_ID_BIT_OFFSET)&cOCTVC1_MSG_ID_BIT_MASK), /* ul_Type_R_CmdId */
- 0, /* ulSessionId */
- 0, /* ulReturnCode */
- 0 /* ulUserInfo */
- },
- 0 /* ulModuleId */
-};
-
-const tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD =
- &buf_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CMD; \
- }
-
-
-/***************************** MODULE_DATA *************************************/
-
-/*--------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_LOG_DATA_MDA
-----------------------------------------------------------------------------*/
-#ifdef OCTVC1_OPT_DECLARE_DEFAULTS
-
-const tOCTVC1_MAIN_MSG_LOG_DATA_MDA buf_tOCTVC1_MAIN_MSG_LOG_DATA_MDA =
-{
- { /* ModuleData */
- (cOCTVC1_MAIN_MSG_LOG_DATA_MID), /* ulModuleDataId */
- (sizeof(tOCTVC1_MAIN_MSG_LOG_DATA_MDA)), /* ulModuleDataSize */
- 0, /* hLogicalObj */
- 0 /* ulTimestamp */
- }
-};
-
-const tOCTVC1_MAIN_MSG_LOG_DATA_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_DATA_MDA =
- &buf_tOCTVC1_MAIN_MSG_LOG_DATA_MDA;
-
-#else /* OCTVC1_OPT_DECLARE_DEFAULTS */
-extern const tOCTVC1_MAIN_MSG_LOG_DATA_MDA *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_DATA_MDA;
-#endif /* OCTVC1_OPT_DECLARE_DEFAULTS */
-
-#define mOCTVC1_MAIN_MSG_LOG_DATA_MDA_DEF(pSt) \
- { \
- *pSt = *g_pOctDef_tOCTVC1_MAIN_MSG_LOG_DATA_MDA; \
- }
-
-
#endif /* __OCTVC1_MAIN_DEFAULT_H__ */
diff --git a/octvc1/main/octvc1_main_default_priv.h b/octvc1/main/octvc1_main_default_priv.h
index dce8d20..ce18aa3 100644
--- a/octvc1/main/octvc1_main_default_priv.h
+++ b/octvc1/main/octvc1_main_default_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -34,7 +34,5 @@ $Octasic_Revision: $
/***************************** COMMAND DEFAULT *****************************/
-/***************************** MODULE_DATA *************************************/
-
#endif /* __OCTVC1_MAIN_DEFAULT_PRIV_H__ */
diff --git a/octvc1/main/octvc1_main_evt.h b/octvc1/main/octvc1_main_evt.h
index 5ff9531..5993e00 100644
--- a/octvc1/main/octvc1_main_evt.h
+++ b/octvc1/main/octvc1_main_evt.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -48,16 +48,16 @@ $Octasic_Revision: $
Members:
Header
hProcess
- ulProcessUserId
- Process User identifier. Value INVALID means no process running on this core.
+ ulProcessImageType
+ Process Type identifier. Value INVALID means no process running on this core.
ulProcessCpuUsagePercent
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCTVC1_EVENT_HEADER Header;
- tOCT_UINT32 hProcess;
- tOCTVC1_USER_ID_PROCESS_ENUM ulProcessUserId;
- tOCT_UINT32 ulProcessCpuUsagePercent;
+ tOCTVC1_EVENT_HEADER Header;
+ tOCT_UINT32 hProcess;
+ tOCTVC1_PROCESS_TYPE_ENUM ulProcessImageType;
+ tOCT_UINT32 ulProcessCpuUsagePercent;
} tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT;
@@ -76,28 +76,6 @@ typedef struct
} tOCTVC1_MAIN_MSG_PROCESS_DUMP_EVT;
/*-------------------------------------------------------------------------------------
- tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT
-
- Members:
- Header
- OCTVC1 Event Header
- hProcess
- Process handle identifier.
- ulUserId
- Process user identifier
- ulState
- Process new state
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_EVENT_HEADER Header;
- tOCT_UINT32 hProcess;
- tOCTVC1_USER_ID_PROCESS_ENUM ulUserId;
- tOCTVC1_PROCESS_STATE_ENUM ulState;
-
-} tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT;
-
-/*-------------------------------------------------------------------------------------
tOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT
Members:
diff --git a/octvc1/main/octvc1_main_evt_priv.h b/octvc1/main/octvc1_main_evt_priv.h
index 0499ef9..99d6a85 100644
--- a/octvc1/main/octvc1_main_evt_priv.h
+++ b/octvc1/main/octvc1_main_evt_priv.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/main/octvc1_main_evt_priv_swap.h b/octvc1/main/octvc1_main_evt_priv_swap.h
index 1ed8aca..1164ff5 100644
--- a/octvc1/main/octvc1_main_evt_priv_swap.h
+++ b/octvc1/main/octvc1_main_evt_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/main/octvc1_main_evt_swap.h b/octvc1/main/octvc1_main_evt_swap.h
index dd66632..d680d70 100644
--- a/octvc1/main/octvc1_main_evt_swap.h
+++ b/octvc1/main/octvc1_main_evt_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MAIN_EVT_SWAP_H__
@@ -49,7 +49,7 @@ extern "C" {
{ mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->Header ); } \
((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->hProcess = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->hProcess); \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->ulProcessUserId ); } \
+ { mOCTVC1_PROCESS_TYPE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->ulProcessImageType ); } \
((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->ulProcessCpuUsagePercent = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT *)pOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EVT)->ulProcessCpuUsagePercent); \
}
@@ -68,18 +68,6 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT * pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)\
- { mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->Header ); } \
- ((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->hProcess = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->hProcess); \
- { mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->ulUserId ); } \
- { mOCTVC1_PROCESS_STATE_ENUM_SWAP( &((tOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT *)pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT)->ulState ); } \
-}
-#else
-#define mOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT_SWAP( pOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EVT )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT_SWAP( _f_pParms ){ tOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT * pOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT = (_f_pParms); SWAP_UNUSED(pOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT)\
{ mOCTVC1_EVENT_HEADER_SWAP( &((tOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT *)pOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT)->Header ); } \
((tOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT *)pOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EVT)->ulSessionIndex = \
diff --git a/octvc1/main/octvc1_main_id.h b/octvc1/main/octvc1_main_id.h
index 1465dae..7c929b7 100644
--- a/octvc1/main/octvc1_main_id.h
+++ b/octvc1/main/octvc1_main_id.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -48,8 +48,7 @@ $Octasic_Revision: $
#define cOCTVC1_MAIN_MSG_PROCESS_INFO_CPU_USAGE_CID ( 0x00e + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_FILE_OPEN_CID ( ( 0x00f + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
#define cOCTVC1_MAIN_MSG_FILE_CLOSE_CID ( ( 0x010 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
-#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CID ( ( 0x011 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
-#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID cOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CID /* OCTVC1_RENAMED_API */
+#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID ( ( 0x011 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
#define cOCTVC1_MAIN_MSG_FILE_WRITE_CID ( ( 0x012 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
#define cOCTVC1_MAIN_MSG_FILE_READ_CID ( 0x013 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_FILE_INFO_CID ( 0x014 + cOCTVC1_MAIN_CID_BASE )
@@ -69,20 +68,16 @@ $Octasic_Revision: $
#define cOCTVC1_MAIN_MSG_API_SYSTEM_START_SESSION_HEARTBEAT_CID ( 0x023 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID ( 0x024 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID ( 0x025 + cOCTVC1_MAIN_CID_BASE )
-#define cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID ( ( 0x027 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
+#define cOCTVC1_MAIN_MSG_APPLICATION_START_CID ( 0x026 + cOCTVC1_MAIN_CID_BASE )
+#define cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID ( 0x027 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID ( 0x028 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_INFO_SYSTEM_CID ( 0x029 + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_LIST_MODULE_CID ( 0x02a + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_INFO_MODULE_CID ( 0x02b + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID ( 0x02c + cOCTVC1_MAIN_CID_BASE )
#define cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID ( 0x02d + cOCTVC1_MAIN_CID_BASE )
-#define cOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CID ( 0x02e + cOCTVC1_MAIN_CID_BASE )
-#define cOCTVC1_MAIN_MSG_LOG_START_STREAM_CID ( 0x02f + cOCTVC1_MAIN_CID_BASE )
-#define cOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CID ( 0x030 + cOCTVC1_MAIN_CID_BASE )
-#define cOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CID ( ( 0x031 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
-#define cOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CID ( ( 0x032 + cOCTVC1_MAIN_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
-#define cOCTVC1_MAIN_CID_MAX (( 0x032 + 1 ) & 0xFFF)
+#define cOCTVC1_MAIN_CID_MAX (( 0x02d + 1 ) & 0xFFF)
/****************************************************************************
Event IDs
@@ -91,16 +86,8 @@ $Octasic_Revision: $
#define cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID ( 0x0002 + cOCTVC1_MAIN_EID_BASE )
#define cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID ( 0x0003 + cOCTVC1_MAIN_EID_BASE )
#define cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID ( 0x0004 + cOCTVC1_MAIN_EID_BASE )
-#define cOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EID ( 0x0005 + cOCTVC1_MAIN_EID_BASE )
-#define cOCTVC1_MAIN_EID_MAX (( 0x0005 + 1 ) & 0xFFFF)
-
-/****************************************************************************
- Module Data IDs
- ****************************************************************************/
-#define cOCTVC1_MAIN_MSG_LOG_DATA_MID ( 0x0000 + cOCTVC1_MAIN_MID_BASE )
-
-#define cOCTVC1_MAIN_MID_MAX (( 0x0000 + 1 ) & 0xFFFF)
+#define cOCTVC1_MAIN_EID_MAX (( 0x0004 + 1 ) & 0xFFFF)
#endif /* __OCTVC1_MAIN_ID_H__ */
diff --git a/octvc1/main/octvc1_main_id_priv.h b/octvc1/main/octvc1_main_id_priv.h
index 35f773e..bde76b1 100644
--- a/octvc1/main/octvc1_main_id_priv.h
+++ b/octvc1/main/octvc1_main_id_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -40,10 +40,6 @@ $Octasic_Revision: $
Event IDs
****************************************************************************/
-/****************************************************************************
- Module Data IDs
- ****************************************************************************/
-
#endif /* __OCTVC1_MAIN_ID_PRIV_H__ */
diff --git a/octvc1/main/octvc1_main_rc.h b/octvc1/main/octvc1_main_rc.h
index 4436c5b..d806167 100644
--- a/octvc1/main/octvc1_main_rc.h
+++ b/octvc1/main/octvc1_main_rc.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -77,12 +77,9 @@ $Octasic_Revision: $
/****************************************************************************
APPLICATION return codes
****************************************************************************/
-#define cOCTVC1_MAIN_APPLICATION_RC_BASE ( 0x0350 + cOCTVC1_MAIN_RC_BASE )
+#define cOCTVC1_MAIN_APPLICATION_RC_BASE ( 0x0350 + cOCTVC1_MAIN_RC_BASE )
-#define cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START ( 0x0001 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
-#define cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_START ( 0x0002 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
-#define cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_STOP ( 0x0003 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
-#define cOCTVC1_MAIN_RC_APPLICATION_MODULE_MAIN_CANNOT_BE_STOP ( 0x0004 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
+#define cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START ( 0x0001 + cOCTVC1_MAIN_APPLICATION_RC_BASE )
/****************************************************************************
CPU_USAGE return codes
@@ -112,8 +109,6 @@ $Octasic_Revision: $
#define cOCTVC1_MAIN_RC_LOG_INTERNAL_ERROR ( 0x0003 + cOCTVC1_MAIN_LOG_RC_BASE )
#define cOCTVC1_MAIN_RC_LOG_TRACE_ALREADY_START ( 0x0004 + cOCTVC1_MAIN_LOG_RC_BASE )
#define cOCTVC1_MAIN_RC_LOG_TRACE_NOT_START ( 0x0005 + cOCTVC1_MAIN_LOG_RC_BASE )
-#define cOCTVC1_MAIN_RC_LOG_TRACE_MASK_INVALID ( 0x0006 + cOCTVC1_MAIN_LOG_RC_BASE )
-#define cOCTVC1_MAIN_RC_LOG_TRACE_FILTER_PROCESS_EMPTY ( 0x0007 + cOCTVC1_MAIN_LOG_RC_BASE )
/****************************************************************************
Validate return codes
diff --git a/octvc1/main/octvc1_main_rc_priv.h b/octvc1/main/octvc1_main_rc_priv.h
index b0008e1..e2d98e8 100644
--- a/octvc1/main/octvc1_main_rc_priv.h
+++ b/octvc1/main/octvc1_main_rc_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/main/octvc1_main_version.h b/octvc1/main/octvc1_main_version.h
index dee2c39..4b81542 100644
--- a/octvc1/main/octvc1_main_version.h
+++ b/octvc1/main/octvc1_main_version.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $
bit[10:0]: Build number
*/
#define cOCTVC1_MAIN_VERSION_MAJOR 2
-#define cOCTVC1_MAIN_VERSION_MINOR 7
+#define cOCTVC1_MAIN_VERSION_MINOR 5
#define cOCTVC1_MAIN_VERSION_MAINTENANCE 0
-#define cOCTVC1_MAIN_VERSION_BUILD 1039
+#define cOCTVC1_MAIN_VERSION_BUILD 780
#define cOCTVC1_MAIN_VERSION_ID ( (cOCTVC1_MAIN_VERSION_MAJOR << 25) + \
(cOCTVC1_MAIN_VERSION_MINOR << 18) + \
diff --git a/octvc1/octvc1_api.h b/octvc1/octvc1_api.h
index a19fb7e..e69c7bf 100644
--- a/octvc1/octvc1_api.h
+++ b/octvc1/octvc1_api.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_api_swap.h b/octvc1/octvc1_api_swap.h
index 21f76b3..a1bba93 100644
--- a/octvc1/octvc1_api_swap.h
+++ b/octvc1/octvc1_api_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_API_SWAP_H__
diff --git a/octvc1/octvc1_app.h b/octvc1/octvc1_app.h
index 51972aa..c6090f5 100644
--- a/octvc1/octvc1_app.h
+++ b/octvc1/octvc1_app.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -39,9 +39,9 @@ $Octasic_Revision: $
#define cOCTVC1_APP_PRODUCT_SHORT_NAME "octsdr_gsm"
#define cOCTVC1_APP_PRODUCT_GOOSE_ROOT_NAME "octsdr"
#define cOCTVC1_APP_VERSION_MAJOR 2
-#define cOCTVC1_APP_VERSION_MINOR 7
+#define cOCTVC1_APP_VERSION_MINOR 5
#define cOCTVC1_APP_VERSION_MAINTENANCE 0
-#define cOCTVC1_APP_VERSION_BUILD 1039
+#define cOCTVC1_APP_VERSION_BUILD 780
#define cOCTVC1_APP_VERSION_ID ((cOCTVC1_APP_VERSION_MAJOR << 25) + \
(cOCTVC1_APP_VERSION_MINOR << 18) + \
(cOCTVC1_APP_VERSION_MAINTENANCE << 11) + \
diff --git a/octvc1/octvc1_base.h b/octvc1/octvc1_base.h
index dbc2d5d..60a250c 100644
--- a/octvc1/octvc1_base.h
+++ b/octvc1/octvc1_base.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -55,8 +55,8 @@ $Octasic_Revision: $
Module unique identifiers
****************************************************************************/
#define cOCTVC1_GENERIC_UID ( 0x00 )
-#define cOCTVC1_LICENSING_UID ( 0x04 )
#define cOCTVC1_PKT_API_UID ( 0x02 )
+#define cOCTVC1_LICENSING_UID ( 0x04 )
/****************************************************************************
Module identifier bases
diff --git a/octvc1/octvc1_buffer.h b/octvc1/octvc1_buffer.h
index 3b01098..33d9078 100644
--- a/octvc1/octvc1_buffer.h
+++ b/octvc1/octvc1_buffer.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_buffer_swap.h b/octvc1/octvc1_buffer_swap.h
index 5fa11d5..be53271 100644
--- a/octvc1/octvc1_buffer_swap.h
+++ b/octvc1/octvc1_buffer_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_BUFFER_SWAP_H__
diff --git a/octvc1/octvc1_cursor.h b/octvc1/octvc1_cursor.h
index de6110b..463adc8 100644
--- a/octvc1/octvc1_cursor.h
+++ b/octvc1/octvc1_cursor.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_cursor_swap.h b/octvc1/octvc1_cursor_swap.h
index e6ea643..fd11e1c 100644
--- a/octvc1/octvc1_cursor_swap.h
+++ b/octvc1/octvc1_cursor_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_CURSOR_SWAP_H__
diff --git a/octvc1/octvc1_eth.h b/octvc1/octvc1_eth.h
index ec7b31b..86f0ddf 100644
--- a/octvc1/octvc1_eth.h
+++ b/octvc1/octvc1_eth.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_eth_swap.h b/octvc1/octvc1_eth_swap.h
index cc073fc..4947bf9 100644
--- a/octvc1/octvc1_eth_swap.h
+++ b/octvc1/octvc1_eth_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_ETH_SWAP_H__
diff --git a/octvc1/octvc1_fifo.h b/octvc1/octvc1_fifo.h
index 4e0554e..311b9d0 100644
--- a/octvc1/octvc1_fifo.h
+++ b/octvc1/octvc1_fifo.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -31,17 +31,10 @@ $Revision: $
/************************ COMMON DEFINITIONS *******************************/
/*-------------------------------------------------------------------------------------
- Control process FIFO-ID definition
- Deprecated should use cOCTVC1_FIFO_ID_CONTROL
--------------------------------------------------------------------------------------*/
-
-#define cOCTVC1_FIFO_ID_MGW_CONTROL 0x00000000
-
-/*-------------------------------------------------------------------------------------
Control process _FIFO-ID definition
-------------------------------------------------------------------------------------*/
-#define cOCTVC1_FIFO_ID_CONTROL 0x00000000
+#define cOCTVC1_FIFO_ID_MGW_CONTROL 0x00000000
/*-------------------------------------------------------------------------------------
Invalid _FIFO-ID
diff --git a/octvc1/octvc1_file.h b/octvc1/octvc1_file.h
index ca2bfb7..333d757 100644
--- a/octvc1/octvc1_file.h
+++ b/octvc1/octvc1_file.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_file_swap.h b/octvc1/octvc1_file_swap.h
index 7016fa7..c30a7b6 100644
--- a/octvc1/octvc1_file_swap.h
+++ b/octvc1/octvc1_file_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_FILE_SWAP_H__
diff --git a/octvc1/octvc1_generic_rc.h b/octvc1/octvc1_generic_rc.h
index bbaf12d..7ce5aa9 100644
--- a/octvc1/octvc1_generic_rc.h
+++ b/octvc1/octvc1_generic_rc.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/octvc1_handle.h b/octvc1/octvc1_handle.h
index a9c828d..d1c7712 100644
--- a/octvc1/octvc1_handle.h
+++ b/octvc1/octvc1_handle.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_handle_swap.h b/octvc1/octvc1_handle_swap.h
index 18f9cbc..9aaeb95 100644
--- a/octvc1/octvc1_handle_swap.h
+++ b/octvc1/octvc1_handle_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_HANDLE_SWAP_H__
diff --git a/octvc1/octvc1_id2string.h b/octvc1/octvc1_id2string.h
index ace56c5..edb50cd 100644
--- a/octvc1/octvc1_id2string.h
+++ b/octvc1/octvc1_id2string.h
@@ -20,7 +20,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -85,8 +85,8 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId )
return "cOCTVC1_MAIN_MSG_FILE_OPEN_CID";
case ( cOCTVC1_MAIN_MSG_FILE_CLOSE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_CLOSE_CID";
- case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_REMOVE_FILE_CID";
+ case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_DELETE_FILE_CID";
case ( cOCTVC1_MAIN_MSG_FILE_WRITE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_WRITE_CID";
case ( cOCTVC1_MAIN_MSG_FILE_READ_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
@@ -125,6 +125,8 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId )
return "cOCTVC1_MAIN_MSG_API_SYSTEM_STOP_SESSION_HEARTBEAT_CID";
case ( cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_HEARTBEAT_CID";
+ case ( cOCTVC1_MAIN_MSG_APPLICATION_START_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
+ return "cOCTVC1_MAIN_MSG_APPLICATION_START_CID";
case ( cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_STOP_CID";
case ( cOCTVC1_MAIN_MSG_APPLICATION_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
@@ -139,16 +141,6 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId )
return "cOCTVC1_MAIN_MSG_APPLICATION_STATS_MODULE_CID";
case ( cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_FILE_SYSTEM_ADD_FILE_CID";
- case ( cOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_MAIN_MSG_LOG_INFO_STREAM_CID";
- case ( cOCTVC1_MAIN_MSG_LOG_START_STREAM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_MAIN_MSG_LOG_START_STREAM_CID";
- case ( cOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_MAIN_MSG_LOG_STOP_STREAM_CID";
- case ( cOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_MAIN_MSG_APPLICATION_START_MODULE_CID";
- case ( cOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_MAIN_MSG_APPLICATION_STOP_MODULE_CID";
case (cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_PROCESS_DUMP_EID";
case (cOCTVC1_MAIN_MSG_API_SYSTEM_SESSION_HEARTBEAT_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
@@ -157,8 +149,6 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId )
return "cOCTVC1_MAIN_MSG_PROCESS_CPU_USAGE_REPORT_EID";
case (cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_MAIN_MSG_APPLICATION_STATE_CHANGE_EID";
- case (cOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_MAIN_MSG_PROCESS_STATE_CHANGE_EID";
/* OCTVC1_HW */
case ( cOCTVC1_HW_MSG_PCB_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_HW_MSG_PCB_INFO_CID";
@@ -253,14 +243,8 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId )
return "cOCTVC1_IRSC_MSG_APPLICATION_START_TAP_CID";
case ( cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_APPLICATION_STOP_TAP_CID";
- case ( cOCTVC1_IRSC_MSG_ROUTER_INFO_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_IRSC_MSG_ROUTER_INFO_CID";
- case ( cOCTVC1_IRSC_MSG_ROUTER_STATS_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_IRSC_MSG_ROUTER_STATS_CID";
case (cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_IRSC_MSG_PROCESS_DUMP_EID";
- case (cOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_IRSC_MSG_APPLICATION_TAP_DATA_REQUEST_EID";
/* OCTVC1_GSM */
case ( cOCTVC1_GSM_MSG_TRX_OPEN_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_OPEN_CID";
@@ -338,10 +322,6 @@ const char * octvc1_id2string( tOCT_UINT32 f_ulId )
return "cOCTVC1_GSM_MSG_TRX_START_STUBB_LOOPBACK_TEST_CID";
case ( cOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_STOP_STUBB_LOOPBACK_TEST_CID";
- case ( cOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_GSM_MSG_TRX_MODIFY_TEST_MODE_CID";
- case ( cOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
- return "cOCTVC1_GSM_MSG_TRX_INFO_TEST_MODE_CID";
case (cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
return "cOCTVC1_GSM_MSG_TRX_TIME_INDICATION_EID";
case (cOCTVC1_GSM_MSG_TRX_STATUS_CHANGE_EID & ~( cOCTVC1_MSG_FLAGS_BIT_MASK << cOCTVC1_MSG_FLAGS_BIT_OFFSET )):
diff --git a/octvc1/octvc1_id2string_priv.h b/octvc1/octvc1_id2string_priv.h
index b3c40a8..2fd6558 100644
--- a/octvc1/octvc1_id2string_priv.h
+++ b/octvc1/octvc1_id2string_priv.h
@@ -20,7 +20,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_ip.h b/octvc1/octvc1_ip.h
index 587ab38..0bfe4c2 100644
--- a/octvc1/octvc1_ip.h
+++ b/octvc1/octvc1_ip.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_ip_swap.h b/octvc1/octvc1_ip_swap.h
index 708f941..dc3f621 100644
--- a/octvc1/octvc1_ip_swap.h
+++ b/octvc1/octvc1_ip_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_IP_SWAP_H__
diff --git a/octvc1/octvc1_ipc.h b/octvc1/octvc1_ipc.h
deleted file mode 100644
index 92afc90..0000000
--- a/octvc1/octvc1_ipc.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
-
-File: OCTVC1_IPC.h
-
-Copyright (c) 2016 Octasic Inc. All rights reserved.
-
-Description:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
-
-$Revision: $
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-
-#ifndef __OCTVC1_IPC_H__
-#define __OCTVC1_IPC_H__
-
-
-/***************************** INCLUDE FILES *******************************/
-#include "../octdev_types.h"
-
-
-/************************ COMMON DEFINITIONS *******************************/
-
-/*-------------------------------------------------------------------------------------
- Interprocess communication
--------------------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------------------
- IPC Header Definition
--------------------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IPC_MSG_FLAG_MASK :
--------------------------------------------------------------------------------------*/
-#define tOCTVC1_IPC_MSG_FLAG_MASK tOCT_UINT8
-
-#define cOCTVC1_IPC_MSG_FLAG_MASK_VALID 0x1
-#define cOCTVC1_IPC_MSG_FLAG_MASK_ERROR 0x8
-#define cOCTVC1_IPC_MSG_FLAG_BIT_OFFSET 28
-#define cOCTVC1_IPC_MSG_FLAG_BIT_MASK 0xF0000000
-
-/*-------------------------------------------------------------------------------------
- IPC Message Header sequence.
--------------------------------------------------------------------------------------*/
-#define cOCTVC1_IPC_MSG_SEQUENCE_BIT_OFFSET 20
-#define cOCTVC1_IPC_MSG_SEQUENCE_BIT_MASK 0x0FF00000
-
-/*-------------------------------------------------------------------------------------
- IPC Message Header ID.
--------------------------------------------------------------------------------------*/
-#define cOCTVC1_IPC_MSG_ID_BIT_OFFSET 0
-#define cOCTVC1_IPC_MSG_ID_BIT_MASK 0x000FFFFF
-/*-------------------------------------------------------------------------------------
- tOCTVC1_IPC_MSG_HEADER
- IPC message Header
-
- Members:
- ulFlag_Seq_Id
- bits[31:28] = Message flag tOCTVC1_IPC_MSG_FLAG_MASK_.
- bits[27:20] = Sequence number
- bits[19:0] = IPC Message Id.
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCT_UINT32 ulFlag_Seq_Id;
-
-} tOCTVC1_IPC_MSG_HEADER;
-
-
-#endif /* __OCTVC1_IPC_H__ */
-
diff --git a/octvc1/octvc1_ipc_swap.h b/octvc1/octvc1_ipc_swap.h
deleted file mode 100644
index 4f95e65..0000000
--- a/octvc1/octvc1_ipc_swap.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-
-File: octvc1_ipc_swap.h
-
-Copyright (c) 2016 Octasic Inc. All rights reserved.
-
-Description:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#ifndef __OCTVC1_IPC_SWAP_H__
-#define __OCTVC1_IPC_SWAP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/***************************** INCLUDE FILES *******************************/
-#include "octvc1_swap_hdrs.h"
-#include "octvc1_ipc.h"
-
-/********************************* MACROS **********************************/
-
-
-
-#define mOCTVC1_IPC_MSG_FLAG_MASK_SWAP( pType ) /* tOCT_UINT8 */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_IPC_MSG_HEADER_SWAP( _f_pParms ){ tOCTVC1_IPC_MSG_HEADER * pOCTVC1_IPC_MSG_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVC1_IPC_MSG_HEADER)\
- ((tOCTVC1_IPC_MSG_HEADER *)pOCTVC1_IPC_MSG_HEADER)->ulFlag_Seq_Id = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_IPC_MSG_HEADER *)pOCTVC1_IPC_MSG_HEADER)->ulFlag_Seq_Id); \
-}
-#else
-#define mOCTVC1_IPC_MSG_HEADER_SWAP( pOCTVC1_IPC_MSG_HEADER )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#ifdef __cplusplus
-}
-
-#endif
-
-#endif /* __OCTVC1_IPC_SWAP_H__ */
diff --git a/octvc1/octvc1_licensing_rc.h b/octvc1/octvc1_licensing_rc.h
index b47010b..41f0200 100644
--- a/octvc1/octvc1_licensing_rc.h
+++ b/octvc1/octvc1_licensing_rc.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/octvc1_list.h b/octvc1/octvc1_list.h
index 14c5c65..f396e49 100644
--- a/octvc1/octvc1_list.h
+++ b/octvc1/octvc1_list.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_list_swap.h b/octvc1/octvc1_list_swap.h
index 8c3ca94..fb4181a 100644
--- a/octvc1/octvc1_list_swap.h
+++ b/octvc1/octvc1_list_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_LIST_SWAP_H__
diff --git a/octvc1/octvc1_log.h b/octvc1/octvc1_log.h
index 21f9c7c..45369ce 100644
--- a/octvc1/octvc1_log.h
+++ b/octvc1/octvc1_log.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -65,7 +65,6 @@ $Revision: $
#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_DATA 0
#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_STRING 1
#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_RC 2
-#define cOCTVC1_LOG_PAYLOAD_TYPE_ENUM_MODULE_DATA 3
/*-------------------------------------------------------------------------------------
tOCTVC1_LOG_TRACE_MASK :
@@ -142,10 +141,10 @@ $Revision: $
-------------------------------------------------------------------------------------*/
typedef struct
{
- tOCT_UINT32 ulId;
- tOCT_UINT32 ulTime;
- tOCT_UINT32 hProcess;
- tOCT_UINT32 ul_Type_Info_Length;
+ tOCTVC1_LOG_ID ulId;
+ tOCT_UINT32 ulTime;
+ tOCT_UINT32 hProcess;
+ tOCT_UINT32 ul_Type_Info_Length;
} tOCTVC1_LOG_HEADER;
diff --git a/octvc1/octvc1_log_swap.h b/octvc1/octvc1_log_swap.h
index 3592b57..cb7896f 100644
--- a/octvc1/octvc1_log_swap.h
+++ b/octvc1/octvc1_log_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_LOG_SWAP_H__
@@ -73,8 +73,7 @@ extern "C" {
#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_LOG_HEADER_SWAP( _f_pParms ){ tOCTVC1_LOG_HEADER * pOCTVC1_LOG_HEADER = (_f_pParms); SWAP_UNUSED(pOCTVC1_LOG_HEADER)\
- ((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulId = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulId); \
+ { mOCTVC1_LOG_ID_SWAP( &((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulId ); } \
((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulTime = \
mOCT_SWAP32_IF_LE(((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->ulTime); \
((tOCTVC1_LOG_HEADER *)pOCTVC1_LOG_HEADER)->hProcess = \
diff --git a/octvc1/octvc1_mac.h b/octvc1/octvc1_mac.h
index e48caaf..1fe4f2d 100644
--- a/octvc1/octvc1_mac.h
+++ b/octvc1/octvc1_mac.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_macro.h b/octvc1/octvc1_macro.h
index 6fbe7a9..478a8b4 100644
--- a/octvc1/octvc1_macro.h
+++ b/octvc1/octvc1_macro.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_module.h b/octvc1/octvc1_module.h
index 0e2a2cc..98565a5 100644
--- a/octvc1/octvc1_module.h
+++ b/octvc1/octvc1_module.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -31,7 +31,6 @@ $Revision: $
/***************************** INCLUDE FILES *******************************/
#include "../octdev_types.h"
#include "octvc1_base.h"
-#include "octvc1_handle.h"
/************************ COMMON DEFINITIONS *******************************/
@@ -43,7 +42,7 @@ $Revision: $
#define cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID 5
/*-------------------------------------------------------------------------------------
- Module Data Header Definition
+ Module ID identifiers
-------------------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------------------
tOCTVC1_MODULE_ID_ENUM :
@@ -58,77 +57,27 @@ $Revision: $
#define cOCTVC1_MODULE_ID_ENUM_TEST 0x05
#define cOCTVC1_MODULE_ID_ENUM_HW 0x06
#define cOCTVC1_MODULE_ID_ENUM_IRSC 0x07
-
-/*-------------------------------------------------------------------------------------
- Application modules definitions.
--------------------------------------------------------------------------------------*/
#define cOCTVC1_MODULE_ID_ENUM_OBM 0x08
-#define cOCTVC1_MODULE_ID_ENUM_APP_TEST 0x09
#define cOCTVC1_MODULE_ID_ENUM_SDR 0x0A
#define cOCTVC1_MODULE_ID_ENUM_GSM 0x0B
#define cOCTVC1_MODULE_ID_ENUM_LTE 0x0C
#define cOCTVC1_MODULE_ID_ENUM_UMTS 0x0D
#define cOCTVC1_MODULE_ID_ENUM_RUS 0x0E
-#define cOCTVC1_MODULE_ID_ENUM_SDR_TOOLKIT 0x0F
-
-#define cOCTVC1_MODULE_ID_BIT_OFFSET 24
-#define cOCTVC1_MODULE_ID_BIT_MASK 0xFF
-
-/*-------------------------------------------------------------------------------------
- Module Application ID
--------------------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------
- tOCTVC1_MODULE_APPLICATION_ID
-
- [cOCTVC1_MODULE_ID|Value]
- [31:16] : reserved
- [15:8] : API Module ID tOCTVC1_MODULE_ID_ENUM:
- [7:0] : Index
-----------------------------------------------------------------------------*/
-typedef tOCT_UINT32 tOCTVC1_MODULE_APPLICATION_ID;
-
-
-#define cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_OFFSET 8
-#define cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_MASK 0x000000FF
-#define cOCTVC1_MODULE_APPLICATION_ID_INDEX_BIT_OFFSET 0
-#define cOCTVC1_MODULE_APPLICATION_ID_INDEX_BIT_MASK 0x000000FF
-
-/*-------------------------------------------------------------------------------------
- Main Application Module Id
--------------------------------------------------------------------------------------*/
-
-#define cOCTVC1_MODULE_APPLICATION_ID_MAIN_SYSTEM ((0x00)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_MODULE_APPLICATION_ID_MODULE_BIT_OFFSET))
-
-/*-------------------------------------------------------------------------------------
- Module Data ID
--------------------------------------------------------------------------------------*/
-
-#define cOCTVC1_MODULE_DATA_ID_BIT_OFFSET 0
-#define cOCTVC1_MODULE_DATA_ID_BIT_MASK 0x0000FFFF
/*-------------------------------------------------------------------------------------
tOCTVC1_MODULE_DATA
Format Module Data
Members:
+ ulModuleId
+ Module Id.
ulModuleDataId
- bits[31:24] = ModuleId -> cOCTVC1_MODULE_ID_ENUM_.
- bits[23:16] = Reserved
- bits[15:0] = DataId -> Module specific data exchange.
- ulModuleDataSize
- Size of Module Data structure.
- hLogicalObj
- Associated object.
- ulTimestamp
+ Module Data Id.
-------------------------------------------------------------------------------------*/
typedef struct
{
+ tOCTVC1_MODULE_ID_ENUM ulModuleId;
tOCT_UINT32 ulModuleDataId;
- tOCT_UINT32 ulModuleDataSize;
- tOCTVC1_HANDLE_OBJECT hLogicalObj;
- tOCT_UINT32 ulTimestamp;
} tOCTVC1_MODULE_DATA;
diff --git a/octvc1/octvc1_module_swap.h b/octvc1/octvc1_module_swap.h
index 5a9dc02..cd44f56 100644
--- a/octvc1/octvc1_module_swap.h
+++ b/octvc1/octvc1_module_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MODULE_SWAP_H__
@@ -45,24 +45,10 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_MODULE_APPLICATION_ID_SWAP( pType ){ \
- *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
-#else
-
-#define mOCTVC1_MODULE_APPLICATION_ID_SWAP( pType )
-
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_MODULE_DATA_SWAP( _f_pParms ){ tOCTVC1_MODULE_DATA * pOCTVC1_MODULE_DATA = (_f_pParms); SWAP_UNUSED(pOCTVC1_MODULE_DATA)\
+ { mOCTVC1_MODULE_ID_ENUM_SWAP( &((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleId ); } \
((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleDataId = \
mOCT_SWAP32_IF_LE(((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleDataId); \
- ((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleDataSize = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulModuleDataSize); \
- ((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->hLogicalObj = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->hLogicalObj); \
- ((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulTimestamp = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_MODULE_DATA *)pOCTVC1_MODULE_DATA)->ulTimestamp); \
}
#else
#define mOCTVC1_MODULE_DATA_SWAP( pOCTVC1_MODULE_DATA )
diff --git a/octvc1/octvc1_msg.h b/octvc1/octvc1_msg.h
index c7673d1..d7b2a3f 100644
--- a/octvc1/octvc1_msg.h
+++ b/octvc1/octvc1_msg.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -67,18 +67,12 @@ $Revision: $
Message identifier - Module ID
-------------------------------------------------------------------------------------*/
#define cOCTVC1_MSG_MODULE_ID_BIT_OFFSET 16
-#define cOCTVC1_MSG_MODULE_BIT_MASK 0x0000001F
-
-/*-------------------------------------------------------------------------------------
- Message identifier - SUB Module ID
--------------------------------------------------------------------------------------*/
-#define cOCTVC1_MSG_SUB_MODULE_ID_BIT_OFFSET 21
-#define cOCTVC1_MSG_SUB_MODULE_BIT_MASK 0x00000007
+#define cOCTVC1_MSG_MODULE_BIT_MASK 0x000000FF
/*-------------------------------------------------------------------------------------
Message identifier - Module and MethodID
-------------------------------------------------------------------------------------*/
-#define cOCTVC1_MSG_MODULE_AND_METHOD_BIT_MASK ((cOCTVC1_MSG_SUB_MODULE_BIT_MASK<<cOCTVC1_MSG_SUB_MODULE_ID_BIT_OFFSET)|(cOCTVC1_MSG_MODULE_BIT_MASK<<cOCTVC1_MSG_MODULE_ID_BIT_OFFSET)|(cOCTVC1_MSG_METHOD_BIT_MASK<<cOCTVC1_MSG_METHOD_ID_BIT_OFFSET))
+#define cOCTVC1_MSG_MODULE_AND_METHOD_BIT_MASK ((cOCTVC1_MSG_MODULE_BIT_MASK<<cOCTVC1_MSG_MODULE_ID_BIT_OFFSET)|(cOCTVC1_MSG_METHOD_BIT_MASK<<cOCTVC1_MSG_METHOD_ID_BIT_OFFSET))
/*-------------------------------------------------------------------------------------
Message data length
diff --git a/octvc1/octvc1_msg_swap.h b/octvc1/octvc1_msg_swap.h
index c64015f..cae17cc 100644
--- a/octvc1/octvc1_msg_swap.h
+++ b/octvc1/octvc1_msg_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_MSG_SWAP_H__
diff --git a/octvc1/octvc1_priv_swap_hdrs.h b/octvc1/octvc1_priv_swap_hdrs.h
index d2102b4..919c2d2 100644
--- a/octvc1/octvc1_priv_swap_hdrs.h
+++ b/octvc1/octvc1_priv_swap_hdrs.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_PRIV_SWAP_HDRS_H__
diff --git a/octvc1/octvc1_privacy.h b/octvc1/octvc1_privacy.h
index 1c1694c..27e9a87 100644
--- a/octvc1/octvc1_privacy.h
+++ b/octvc1/octvc1_privacy.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_process.h b/octvc1/octvc1_process.h
index 43b661d..eaf1503 100644
--- a/octvc1/octvc1_process.h
+++ b/octvc1/octvc1_process.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -53,6 +53,7 @@ $Revision: $
#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_DL ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+2) )
#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_ULIM ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+3) )
#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_ULOM ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+4) )
+#define cOCTVC1_PROCESS_TYPE_ENUM_GSM_DECOMB ((tOCT_UINT32)(cOCTVC1_PROCESS_LAST_OADF_PROCESS_TYPE_ENUM_ID+5) )
#define cOCTVC1_PROCESS_IMAGE_NAME_MAX_LENGTH 63 /* Process image string length restriction. */
/*-------------------------------------------------------------------------------------
@@ -126,8 +127,6 @@ typedef struct
Task's maximum cache miss in one execution
ulLastExecCacheMissCnt
Task's last execution cache miss count
- ulTotalCacheMissCnt
- Task's last execution cache miss count
ulExecCnt
Number of times the task has been executed
ulDoneCnt
@@ -144,7 +143,6 @@ typedef struct
tOCT_UINT32 ulLastExecTimeUs;
tOCT_UINT32 ulMaxExecCacheMissCnt;
tOCT_UINT32 ulLastExecCacheMissCnt;
- tOCT_UINT32 ulTotalCacheMissCnt;
tOCT_UINT32 ulExecCnt;
tOCT_UINT32 ulDoneCnt;
tOCT_UINT32 ulErrorCnt;
diff --git a/octvc1/octvc1_process_swap.h b/octvc1/octvc1_process_swap.h
index 2c69280..eee1859 100644
--- a/octvc1/octvc1_process_swap.h
+++ b/octvc1/octvc1_process_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_PROCESS_SWAP_H__
@@ -95,8 +95,6 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulMaxExecCacheMissCnt); \
((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulLastExecCacheMissCnt = \
mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulLastExecCacheMissCnt); \
- ((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulTotalCacheMissCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulTotalCacheMissCnt); \
((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulExecCnt = \
mOCT_SWAP32_IF_LE(((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulExecCnt); \
((tOCTVC1_PROCESS_TASK_STATS *)pOCTVC1_PROCESS_TASK_STATS)->ulDoneCnt = \
diff --git a/octvc1/octvc1_radio.h b/octvc1/octvc1_radio.h
index 6fb6000..f3011fc 100644
--- a/octvc1/octvc1_radio.h
+++ b/octvc1/octvc1_radio.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -45,7 +45,6 @@ $Revision: $
#define cOCTVC1_RADIO_STANDARD_ENUM_GSM 0
#define cOCTVC1_RADIO_STANDARD_ENUM_UMTS 1
#define cOCTVC1_RADIO_STANDARD_ENUM_LTE 2
-#define cOCTVC1_RADIO_STANDARD_ENUM_CUSTOM 3
#define cOCTVC1_RADIO_STANDARD_ENUM_INVALID 0xCAFEDECA
/*-------------------------------------------------------------------------------------
@@ -173,37 +172,10 @@ $Revision: $
#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_42 41
#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_43 42
#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_44 43
-#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_45 44
-#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_46 45
-#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_65 46
-#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_66 47
-#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_67 48
-#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_252 49
-#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_255 50
-#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_LAST 51
+#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_LAST 44
#define cOCTVC1_RADIO_STANDARD_FREQ_BAND_LTE_ENUM_INVALID 0xCAFEDECA
/*-------------------------------------------------------------------------------------
- Radio Standard Frequency Band Identifiers
--------------------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------
- tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID
-
- Members:
- ulStandard
- Radio standard
- ulBandNumber
- Default: 0
- Band number value.
--------------------------------------------------------------------------------------*/
-typedef struct
-{
- tOCTVC1_RADIO_STANDARD_ENUM ulStandard;
- tOCT_UINT32 ulBandNumber;
-
-} tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID;
-
-/*-------------------------------------------------------------------------------------
Radio Configiguration Script Identifiers
-------------------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------------------
diff --git a/octvc1/octvc1_radio_swap.h b/octvc1/octvc1_radio_swap.h
index 6a530c9..c465a93 100644
--- a/octvc1/octvc1_radio_swap.h
+++ b/octvc1/octvc1_radio_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_RADIO_SWAP_H__
@@ -72,16 +72,6 @@ extern "C" {
#endif /* _OCT_ENDIAN_TYPE_LE_ */
#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_RADIO_STANDARD_FREQ_BAND_ID_SWAP( _f_pParms ){ tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID * pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID = (_f_pParms); SWAP_UNUSED(pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID)\
- { mOCTVC1_RADIO_STANDARD_ENUM_SWAP( &((tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID *)pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID)->ulStandard ); } \
- ((tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID *)pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID)->ulBandNumber = \
- mOCT_SWAP32_IF_LE(((tOCTVC1_RADIO_STANDARD_FREQ_BAND_ID *)pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID)->ulBandNumber); \
-}
-#else
-#define mOCTVC1_RADIO_STANDARD_FREQ_BAND_ID_SWAP( pOCTVC1_RADIO_STANDARD_FREQ_BAND_ID )
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
#define mOCTVC1_RADIO_CONFIG_SCRIPT_TYPE_ENUM_SWAP( pType ){ \
*((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
#else
diff --git a/octvc1/octvc1_rc2string.h b/octvc1/octvc1_rc2string.h
index b741d77..9b30dec 100644
--- a/octvc1/octvc1_rc2string.h
+++ b/octvc1/octvc1_rc2string.h
@@ -20,7 +20,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -248,12 +248,6 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc )
return "cOCTVC1_MAIN_RC_FILE_SYSTEM_INFO_NO_MORE_FILE";
case cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START:
return "cOCTVC1_MAIN_RC_APPLICATION_ALREADY_START";
- case cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_START:
- return "cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_START";
- case cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_STOP:
- return "cOCTVC1_MAIN_RC_APPLICATION_MODULE_ALREADY_STOP";
- case cOCTVC1_MAIN_RC_APPLICATION_MODULE_MAIN_CANNOT_BE_STOP:
- return "cOCTVC1_MAIN_RC_APPLICATION_MODULE_MAIN_CANNOT_BE_STOP";
case cOCTVC1_MAIN_RC_CPU_USAGE_HANDLE_INVALID:
return "cOCTVC1_MAIN_RC_CPU_USAGE_HANDLE_INVALID";
case cOCTVC1_MAIN_RC_CPU_USAGE_THRESHOLD_INVALID:
@@ -276,10 +270,6 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc )
return "cOCTVC1_MAIN_RC_LOG_TRACE_ALREADY_START";
case cOCTVC1_MAIN_RC_LOG_TRACE_NOT_START:
return "cOCTVC1_MAIN_RC_LOG_TRACE_NOT_START";
- case cOCTVC1_MAIN_RC_LOG_TRACE_MASK_INVALID:
- return "cOCTVC1_MAIN_RC_LOG_TRACE_MASK_INVALID";
- case cOCTVC1_MAIN_RC_LOG_TRACE_FILTER_PROCESS_EMPTY:
- return "cOCTVC1_MAIN_RC_LOG_TRACE_FILTER_PROCESS_EMPTY";
case cOCTVC1_MAIN_RC_PROCESS_CPU_USAGE_MONITOR_INVALID_ALARM_THRESHOLD_HIGH_PERCENT:
return "cOCTVC1_MAIN_RC_PROCESS_CPU_USAGE_MONITOR_INVALID_ALARM_THRESHOLD_HIGH_PERCENT";
case cOCTVC1_MAIN_RC_PROCESS_CPU_USAGE_MONITOR_INVALID_ALARM_THRESHOLD_LOW_PERCENT:
@@ -328,8 +318,6 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc )
return "cOCTVC1_IRSC_RC_OBJMGR_INTERNAL_ERROR";
case cOCTVC1_IRSC_RC_OBJMGR_NOT_INIT:
return "cOCTVC1_IRSC_RC_OBJMGR_NOT_INIT";
- case cOCTVC1_IRSC_RC_ROUTER_ROUTER_IF_INVALID:
- return "cOCTVC1_IRSC_RC_ROUTER_ROUTER_IF_INVALID";
case cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_DISABLE:
return "cOCTVC1_IRSC_RC_API_COMMAND_MONITORING_DISABLE";
case cOCTVC1_IRSC_RC_API_COMMAND_MAX_REACHED:
@@ -356,8 +344,16 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc )
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_TRX_PARAMS_INVALID:
- return "cOCTVC1_GSM_RC_TRX_PARAMS_INVALID";
+ case cOCTVC1_GSM_RC_TRX_CENTRE_FREQ_NOT_SAME_ACROSS_TRX:
+ return "cOCTVC1_GSM_RC_TRX_CENTRE_FREQ_NOT_SAME_ACROSS_TRX";
+ case cOCTVC1_GSM_RC_TRX_CARRIER_OFFSET_OUTOF_RANGE:
+ return "cOCTVC1_GSM_RC_TRX_CARRIER_OFFSET_OUTOF_RANGE";
+ case cOCTVC1_GSM_RC_TRX_NOT_PROPERLY_SEPARATED:
+ return "cOCTVC1_GSM_RC_TRX_NOT_PROPERLY_SEPARATED";
+ case cOCTVC1_GSM_RC_TRX_BCCH_NOT_CONFIGURED:
+ return "cOCTVC1_GSM_RC_TRX_BCCH_NOT_CONFIGURED";
+ case cOCTVC1_GSM_RC_TRX_CLOSE_NONPRIMARY_FIRST:
+ return "cOCTVC1_GSM_RC_TRX_CLOSE_NONPRIMARY_FIRST";
case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_RESOURCE_UNAVAILABLE:
return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_RESOURCE_UNAVAILABLE";
case cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_ALREADY_ACTIVATED:
@@ -366,8 +362,6 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc )
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_PHYSICAL_CHANNEL_PARAMS_INVALID:
- return "cOCTVC1_GSM_RC_PHYSICAL_CHANNEL_PARAMS_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:
@@ -384,16 +378,18 @@ const char * octvc1_rc2string( tOCT_UINT32 f_ulRc )
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_LOGICAL_CHANNEL_BCCH_BSIC_INVALID:
+ return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_BCCH_BSIC_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_BUFF_ADDR_INVALID_IQ_SAMPLE_ADDR:
- return "cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_IQ_SAMPLE_ADDR";
- case cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_IQ_SAMPLE_ADDR_RACH:
- return "cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_IQ_SAMPLE_ADDR_RACH";
+ case cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__TCHFS:
+ return "cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__TCHFS";
+ case cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__RACH:
+ return "cOCTVC1_GSM_RC_BUFF_ADDR_INVALID_BUFF_ADDR__RACH";
case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_FRAME_NUMBER:
return "cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_FRAME_NUMBER";
case cOCTVC1_GSM_RC_LOGICAL_CHANNEL_DATA_INVALID_DATA_LENGTH:
diff --git a/octvc1/octvc1_swap_hdrs.h b/octvc1/octvc1_swap_hdrs.h
index 60b9d32..d44ca6c 100644
--- a/octvc1/octvc1_swap_hdrs.h
+++ b/octvc1/octvc1_swap_hdrs.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_SWAP_HDRS_H__
@@ -53,9 +53,7 @@ extern "C" {
#include "octvc1_file_swap.h"
#include "octvc1_module_swap.h"
#include "octvc1_tap_swap.h"
-#include "octvc1_ipc_swap.h"
#include "octvc1_process_swap.h"
-#include "octvc1_user_id_swap.h"
#include "octvc1_radio_swap.h"
#include "octvc1_api_swap.h"
#include "ctrl/octvc1_ctrl_api_swap.h"
diff --git a/octvc1/octvc1_tap.h b/octvc1/octvc1_tap.h
index 9a50bd5..16788cc 100644
--- a/octvc1/octvc1_tap.h
+++ b/octvc1/octvc1_tap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -46,21 +46,21 @@ $Revision: $
#define cOCTVC1_TAP_DIRECTION_ENUM_RX 1
/*-------------------------------------------------------------------------------------
- tOCTVC1_TAP_ID : TAP_ID : [ApplicationModuleId|Direction|Index].
- ModuleId (16bits)-> Application Module Id[tOCTVC1_MODULE_ID_ENUM|index] .
+ 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 0x0000FFFF
-#define cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET 16
+#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<<cOCTVC1_TAP_ID_MASK_MODULE_ID_BIT_OFFSET) )
#define cOCTVC1_TAP_ID_MASK_DIRECTION_BIT 0x000000FF
-#define cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET 8
+#define cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET 16
#define cOCTVC1_TAP_ID_MASK_DIRECTION ((tOCT_UINT32)(cOCTVC1_TAP_ID_MASK_DIRECTION_BIT<<cOCTVC1_TAP_ID_MASK_DIRECTION_BIT_OFFSET) )
-#define cOCTVC1_TAP_ID_MASK_INDEX_BIT 0x000000FF
+#define cOCTVC1_TAP_ID_MASK_INDEX_BIT 0x0000FFFF
#define cOCTVC1_TAP_ID_MASK_INDEX_BIT_OFFSET 0
#define cOCTVC1_TAP_ID_MASK_INDEX ((tOCT_UINT32)(cOCTVC1_TAP_ID_MASK_INDEX_BIT<<cOCTVC1_TAP_ID_MASK_INDEX_BIT_OFFSET) )
diff --git a/octvc1/octvc1_tap_swap.h b/octvc1/octvc1_tap_swap.h
index b175157..df894ab 100644
--- a/octvc1/octvc1_tap_swap.h
+++ b/octvc1/octvc1_tap_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_TAP_SWAP_H__
diff --git a/octvc1/octvc1_udp.h b/octvc1/octvc1_udp.h
index fe46acf..c012f0a 100644
--- a/octvc1/octvc1_udp.h
+++ b/octvc1/octvc1_udp.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_user_id.h b/octvc1/octvc1_user_id.h
deleted file mode 100644
index 14670c6..0000000
--- a/octvc1/octvc1_user_id.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\
-
-File: OCTVC1_USER_ID.h
-
-Copyright (c) 2016 Octasic Inc. All rights reserved.
-
-Description:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
-
-$Revision: $
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-
-#ifndef __OCTVC1_USER_ID_H__
-#define __OCTVC1_USER_ID_H__
-
-
-/***************************** INCLUDE FILES *******************************/
-#include "../octdev_types.h"
-#include "octvc1_base.h"
-#include "octvc1_module.h"
-
-
-/************************ COMMON DEFINITIONS *******************************/
-
-#define cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT 24 /* Number of bit the module id is shifted in user id. */
-
-/*-------------------------------------------------------------------------------------
- Base process user id.
- Octadf_internal Process user id.
--------------------------------------------------------------------------------------*/
-#define tOCTVC1_USER_ID_PROCESS_ENUM tOCT_UINT32
-
-#define cOCTVC1_USER_ID_PROCESS_ENUM_INVALID 0x00000000
-#define cOCTVC1_USER_ID_PROCESS_ENUM_MAIN_APP ((tOCT_UINT32)((0x00000000)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
-#define cOCTVC1_USER_ID_PROCESS_ENUM_MAIN_ROUTER ((tOCT_UINT32)((0x00000001)|(cOCTVC1_MODULE_ID_ENUM_MAIN<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
-#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_DL_0 ((tOCT_UINT32)((0x00000100)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
-#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_ULIM_0 ((tOCT_UINT32)((0x00000200)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
-#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_ULOM_0 ((tOCT_UINT32)((0x00000300)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
-#define cOCTVC1_USER_ID_PROCESS_ENUM_GSM_SCHED_0 ((tOCT_UINT32)((0x00000400)|(cOCTVC1_MODULE_ID_ENUM_GSM<<cOCTVC1_USER_ID_MODULE_ID_BIT_SHIFT)) )
-
-
-#endif /* __OCTVC1_USER_ID_H__ */
-
diff --git a/octvc1/octvc1_user_id_swap.h b/octvc1/octvc1_user_id_swap.h
deleted file mode 100644
index 9b03fa1..0000000
--- a/octvc1/octvc1_user_id_swap.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
-
-File: octvc1_user_id_swap.h
-
-Copyright (c) 2016 Octasic Inc. All rights reserved.
-
-Description:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
-
-\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
-#ifndef __OCTVC1_USER_ID_SWAP_H__
-#define __OCTVC1_USER_ID_SWAP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/***************************** INCLUDE FILES *******************************/
-#include "octvc1_swap_hdrs.h"
-#include "octvc1_user_id.h"
-
-/********************************* MACROS **********************************/
-
-
-#if defined( _OCT_ENDIAN_TYPE_LE_ )
-#define mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( pType ){ \
- *((tOCT_UINT32 *)pType) = mOCT_SWAP32_IF_LE( *((tOCT_UINT32 *)pType) ); }
-#else
-
-#define mOCTVC1_USER_ID_PROCESS_ENUM_SWAP( pType )
-
-#endif /* _OCT_ENDIAN_TYPE_LE_ */
-
-#ifdef __cplusplus
-}
-
-#endif
-
-#endif /* __OCTVC1_USER_ID_SWAP_H__ */
diff --git a/octvc1/octvc1_vlan.h b/octvc1/octvc1_vlan.h
index bbbb69c..31a8ba5 100644
--- a/octvc1/octvc1_vlan.h
+++ b/octvc1/octvc1_vlan.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/octvc1_vlan_swap.h b/octvc1/octvc1_vlan_swap.h
index 664ae48..1aac5cd 100644
--- a/octvc1/octvc1_vlan_swap.h
+++ b/octvc1/octvc1_vlan_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_VLAN_SWAP_H__
diff --git a/octvc1/octvocnet_pkt.h b/octvc1/octvocnet_pkt.h
index 0810254..73ed0c7 100644
--- a/octvc1/octvocnet_pkt.h
+++ b/octvc1/octvocnet_pkt.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
@@ -63,7 +63,6 @@ $Revision: $
#define cOCTVOCNET_PKT_FORMAT_CTRL 0x00
#define cOCTVOCNET_PKT_FORMAT_F 0x01
#define cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT 0x02
-#define cOCTVOCNET_PKT_FORMAT_MODULE_DATA 0x03 /* Use to send OCTVC1 MODULE DATA */
/*-------------------------------------------------------------------------------------
VocalloNet Format Control Bit Shifted
@@ -71,10 +70,9 @@ $Revision: $
#define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_CTRL (cOCTVOCNET_PKT_FORMAT_CTRL<<cOCTVOCNET_PKT_FORMAT_BIT_OFFSET)
#define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_F (cOCTVOCNET_PKT_FORMAT_F<<cOCTVOCNET_PKT_FORMAT_BIT_OFFSET)
#define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_DATA_FRAGMENT (cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT<<cOCTVOCNET_PKT_FORMAT_BIT_OFFSET)
-#define cOCTVOCNET_PKT_BITSHIFTED_FORMAT_MODULE_DATA (cOCTVOCNET_PKT_FORMAT_MODULE_DATA<<cOCTVOCNET_PKT_FORMAT_BIT_OFFSET)
/*-------------------------------------------------------------------------------------
- VocalloNet Packet F sub-type Values
+ VocalloNet Packet sub-type Values
-------------------------------------------------------------------------------------*/
#define cOCTVOCNET_PKT_SUBTYPE_UNSPECIFIED 0x0
#define cOCTVOCNET_PKT_SUBTYPE_API_EVENT 0x1
@@ -158,7 +156,7 @@ typedef struct
ulTimestamp
bits[31:0] = Timestamp
ulSubType
- bits[31:0] = SubType
+ bits[31:4] = Reserved, bits[3:0] = SubType
-------------------------------------------------------------------------------------*/
typedef struct
{
@@ -177,11 +175,11 @@ typedef struct
ulSequenceId
Sequence id.
ulTransfertTotalSize
- Total byte transert for that ulSequenceId (for all ulFragmentTotalCnt fragment).
+ Total byte transert for that ulSequenceId (for all ulFragmentTotalNum fragment).
If ulTransfertTotalSize set 0, the total ulTransfertTotalSize is unknown
- ulFragmentTotalCnt
- Total count of fragment.
- If ulFragmentTotalCnt set 0, the total ulFragmentTotalCnt is unknown
+ ulFragmentTotalNum
+ Total number of fragment.
+ If ulFragmentTotalNum set 0, the total ulFragmentTotalNum is unknown
ulFragmentId
Fragment id.
ulFragmentDataOffset
@@ -196,7 +194,7 @@ typedef struct
tOCTVOCNET_PKT_DATA_F_HEADER DataHeader;
tOCT_UINT32 ulSequenceId;
tOCT_UINT32 ulTransfertTotalSize;
- tOCT_UINT32 ulFragmentTotalCnt;
+ tOCT_UINT32 ulFragmentTotalNum;
tOCT_UINT32 ulFragmentId;
tOCT_UINT32 ulFragmentDataOffset;
tOCT_UINT32 ulFragmentDataSize;
diff --git a/octvc1/octvocnet_pkt_swap.h b/octvc1/octvocnet_pkt_swap.h
index 7e0e6ff..011dcc5 100644
--- a/octvc1/octvocnet_pkt_swap.h
+++ b/octvc1/octvocnet_pkt_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVOCNET_PKT_SWAP_H__
@@ -83,8 +83,8 @@ extern "C" {
mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulSequenceId); \
((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulTransfertTotalSize = \
mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulTransfertTotalSize); \
- ((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentTotalCnt = \
- mOCT_SWAP32_IF_LE(((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->ulFragmentTotalCnt); \
+ ((tOCTVOCNET_PKT_DATA_FRAGMENT_HEADER *)pOCTVOCNET_PKT_DATA_FRAGMENT_HEADER)->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 = \
diff --git a/octvc1/pkt_api/octvc1_pkt_api.h b/octvc1/pkt_api/octvc1_pkt_api.h
index e778d18..e56793a 100644
--- a/octvc1/pkt_api/octvc1_pkt_api.h
+++ b/octvc1/pkt_api/octvc1_pkt_api.h
@@ -2,7 +2,7 @@
File: OCTVC1_PKT_API.h
-Copyright (c) 2016 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
Description:
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: Octasic Application Development Framework OCTADF-04.05.01-B2637 (2016/07/11)
+Release: Octasic Application Development Framework OCTADF-04.01.00-B1993 (2015/09/16)
$Revision: $
diff --git a/octvc1/pkt_api/octvc1_pkt_api_default.h b/octvc1/pkt_api/octvc1_pkt_api_default.h
index ea3329f..3e23d35 100644
--- a/octvc1/pkt_api/octvc1_pkt_api_default.h
+++ b/octvc1/pkt_api/octvc1_pkt_api_default.h
@@ -2,7 +2,7 @@
File: OCTVC1_PKT_API.h
-Copyright (c) 2016 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
Description:
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: Octasic Application Development Framework OCTADF-04.05.01-B2637 (2016/07/11)
+Release: Octasic Application Development Framework OCTADF-04.01.00-B1993 (2015/09/16)
$Revision: $
@@ -264,7 +264,7 @@ extern "C" {
{ \
tOCTVC1_PKT_API_SESS_OPEN_PARMS * _pParms; \
_pParms = (_f_pParms); \
- _pParms->ulControlProcessFifoId = cOCTVC1_FIFO_ID_CONTROL; \
+ _pParms->ulControlProcessFifoId = cOCTVC1_FIFO_ID_MGW_CONTROL; \
_pParms->pUserSessionContext = NULL; \
_pParms->pSession = NULL; \
}
@@ -329,7 +329,7 @@ extern "C" {
{ \
tOCTVC1_PKT_API_DATA_SEND_PARMS * _pParms; \
_pParms = (_f_pParms); \
- _pParms->ulFormat = cOCTVOCNET_PKT_FORMAT_MODULE_DATA; \
+ _pParms->ulFormat = cOCTVOCNET_PKT_FORMAT_DATA_FRAGMENT; \
_pParms->ulLength = 0; \
_pParms->pData = NULL; \
}
diff --git a/octvc1/pkt_api/octvc1_pkt_api_rc.h b/octvc1/pkt_api/octvc1_pkt_api_rc.h
index 8873a21..5c4a634 100644
--- a/octvc1/pkt_api/octvc1_pkt_api_rc.h
+++ b/octvc1/pkt_api/octvc1_pkt_api_rc.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/pkt_api/octvc1_pkt_api_version.h b/octvc1/pkt_api/octvc1_pkt_api_version.h
index 7145394..8bfc2ad 100644
--- a/octvc1/pkt_api/octvc1_pkt_api_version.h
+++ b/octvc1/pkt_api/octvc1_pkt_api_version.h
@@ -2,7 +2,7 @@
File: OCTVC1_PKT_API_VERSION.h
-Copyright (c) 2016 Octasic Inc. All rights reserved.
+Copyright (c) 2015 Octasic Inc. All rights reserved.
Description:
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: Octasic Application Development Framework OCTADF-04.05.01-B2637 (2016/07/11)
+Release: Octasic Application Development Framework OCTADF-04.01.00-B1993 (2015/09/16)
$Revision: $
@@ -48,9 +48,9 @@ extern "C" {
bit[10:0]: Build number
*/
#define cOCTVC1_PKT_API_VERSION_MAJOR 4
-#define cOCTVC1_PKT_API_VERSION_MINOR 5
-#define cOCTVC1_PKT_API_VERSION_MAINTENANCE 1
-#define cOCTVC1_PKT_API_VERSION_BUILD 2637
+#define cOCTVC1_PKT_API_VERSION_MINOR 1
+#define cOCTVC1_PKT_API_VERSION_MAINTENANCE 0
+#define cOCTVC1_PKT_API_VERSION_BUILD 1993
#define cOCTVC1_PKT_API_VERSION_ID ( (cOCTVC1_PKT_API_VERSION_MAJOR << 25) + \
(cOCTVC1_PKT_API_VERSION_MINOR << 18) + \
diff --git a/octvc1/test/octvc1_test_api.h b/octvc1/test/octvc1_test_api.h
index fea8b7e..4bdef10 100644
--- a/octvc1/test/octvc1_test_api.h
+++ b/octvc1/test/octvc1_test_api.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/test/octvc1_test_api_priv.h b/octvc1/test/octvc1_test_api_priv.h
index 7eba378..0ebdbb2 100644
--- a/octvc1/test/octvc1_test_api_priv.h
+++ b/octvc1/test/octvc1_test_api_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Revision: $
diff --git a/octvc1/test/octvc1_test_api_priv_swap.h b/octvc1/test/octvc1_test_api_priv_swap.h
index d7cdaa2..d3ef238 100644
--- a/octvc1/test/octvc1_test_api_priv_swap.h
+++ b/octvc1/test/octvc1_test_api_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/test/octvc1_test_api_swap.h b/octvc1/test/octvc1_test_api_swap.h
index aabe025..0da7854 100644
--- a/octvc1/test/octvc1_test_api_swap.h
+++ b/octvc1/test/octvc1_test_api_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_TEST_API_SWAP_H__
diff --git a/octvc1/test/octvc1_test_base.h b/octvc1/test/octvc1_test_base.h
index 83837b4..82bd92b 100644
--- a/octvc1/test/octvc1_test_base.h
+++ b/octvc1/test/octvc1_test_base.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_default.h b/octvc1/test/octvc1_test_default.h
index 0d28979..3ead580 100644
--- a/octvc1/test/octvc1_test_default.h
+++ b/octvc1/test/octvc1_test_default.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_default_priv.h b/octvc1/test/octvc1_test_default_priv.h
index f20b57c..c99450e 100644
--- a/octvc1/test/octvc1_test_default_priv.h
+++ b/octvc1/test/octvc1_test_default_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_evt.h b/octvc1/test/octvc1_test_evt.h
index a65a683..3ae4382 100644
--- a/octvc1/test/octvc1_test_evt.h
+++ b/octvc1/test/octvc1_test_evt.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_evt_priv.h b/octvc1/test/octvc1_test_evt_priv.h
index 6bf2bd4..d733e41 100644
--- a/octvc1/test/octvc1_test_evt_priv.h
+++ b/octvc1/test/octvc1_test_evt_priv.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_evt_priv_swap.h b/octvc1/test/octvc1_test_evt_priv_swap.h
index 916e3c3..b57cb91 100644
--- a/octvc1/test/octvc1_test_evt_priv_swap.h
+++ b/octvc1/test/octvc1_test_evt_priv_swap.h
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
diff --git a/octvc1/test/octvc1_test_evt_swap.h b/octvc1/test/octvc1_test_evt_swap.h
index 5ee6bf5..8689991 100644
--- a/octvc1/test/octvc1_test_evt_swap.h
+++ b/octvc1/test/octvc1_test_evt_swap.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
\*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
#ifndef __OCTVC1_TEST_EVT_SWAP_H__
diff --git a/octvc1/test/octvc1_test_id.h b/octvc1/test/octvc1_test_id.h
index c5ae9bd..ac21cf2 100644
--- a/octvc1/test/octvc1_test_id.h
+++ b/octvc1/test/octvc1_test_id.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_id_priv.h b/octvc1/test/octvc1_test_id_priv.h
index 69b2f0c..11fba12 100644
--- a/octvc1/test/octvc1_test_id_priv.h
+++ b/octvc1/test/octvc1_test_id_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -41,15 +41,15 @@ $Octasic_Revision: $
#define cOCTVC1_TEST_MSG_DESCR_STATS_CID ( 0x004 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_CID ( 0x010 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_CID ( 0x011 + cOCTVC1_TEST_CID_BASE )
-#define cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID ( ( 0x012 + cOCTVC1_TEST_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
-#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID ( ( 0x013 + cOCTVC1_TEST_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
+#define cOCTVC1_TEST_MSG_RUNNER_SERVER_START_CID ( 0x012 + cOCTVC1_TEST_CID_BASE )
+#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_CID ( 0x013 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_ADD_TEST_CID ( 0x020 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_REMOVE_TEST_CID ( 0x021 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_LIST_TEST_CID ( 0x022 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_INFO_TEST_CID ( 0x023 + cOCTVC1_TEST_CID_BASE )
#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STATS_TEST_CID ( 0x024 + cOCTVC1_TEST_CID_BASE )
-#define cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID ( ( 0x025 + cOCTVC1_TEST_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
-#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID ( ( 0x026 + cOCTVC1_TEST_CID_BASE )| cOCTVC1_MSG_LONG_PROCESSING_FLAG )
+#define cOCTVC1_TEST_MSG_RUNNER_SERVER_START_TEST_CID ( 0x025 + cOCTVC1_TEST_CID_BASE )
+#define cOCTVC1_TEST_MSG_RUNNER_SERVER_STOP_TEST_CID ( 0x026 + cOCTVC1_TEST_CID_BASE )
#endif /* __OCTVC1_TEST_ID_PRIV_H__ */
diff --git a/octvc1/test/octvc1_test_rc.h b/octvc1/test/octvc1_test_rc.h
index b3b329a..9e5effa 100644
--- a/octvc1/test/octvc1_test_rc.h
+++ b/octvc1/test/octvc1_test_rc.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_rc_priv.h b/octvc1/test/octvc1_test_rc_priv.h
index 0324d7f..9f42665 100644
--- a/octvc1/test/octvc1_test_rc_priv.h
+++ b/octvc1/test/octvc1_test_rc_priv.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
diff --git a/octvc1/test/octvc1_test_version.h b/octvc1/test/octvc1_test_version.h
index a22dcc1..ed8481d 100644
--- a/octvc1/test/octvc1_test_version.h
+++ b/octvc1/test/octvc1_test_version.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Release: OCTSDR Software Development Kit OCTSDR_GSM-02.07.00-B1039 (2016/07/22)
+Release: OCTSDR Software Development Kit OCTSDR_GSM-02.05.00-B780 (2016/01/14)
$Octasic_Revision: $
@@ -36,9 +36,9 @@ $Octasic_Revision: $
bit[10:0]: Build number
*/
#define cOCTVC1_TEST_VERSION_MAJOR 1
-#define cOCTVC1_TEST_VERSION_MINOR 7
+#define cOCTVC1_TEST_VERSION_MINOR 5
#define cOCTVC1_TEST_VERSION_MAINTENANCE 0
-#define cOCTVC1_TEST_VERSION_BUILD 1039
+#define cOCTVC1_TEST_VERSION_BUILD 780
#define cOCTVC1_TEST_VERSION_ID ( (cOCTVC1_TEST_VERSION_MAJOR << 25) + \
(cOCTVC1_TEST_VERSION_MINOR << 18) + \