Change in ...osmo-ttcn3-hacks[master]: IPA_Emulation: Fix building without CTRL support
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230 )
Change subject: IPA_Emulation: Fix building without CTRL support
..
IPA_Emulation: Fix building without CTRL support
Back in JUne, Change-Id I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7
attempted to introduce compilation of IPA_Emulation without CTRL but
it failed to cover all references to CTRL with the correspondign
ifdef/endif blocks. Let's fix this.
Change-Id: I68349b32f613aacced84011601121f2265243600
---
M library/IPA_Emulation.ttcnpp
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp
index 2305b7b..7b80c2d 100644
--- a/library/IPA_Emulation.ttcnpp
+++ b/library/IPA_Emulation.ttcnpp
@@ -51,8 +51,9 @@
import from RSPRO_Types all;
#endif
-
+#ifdef IPA_EMULATION_CTRL
import from Osmocom_CTRL_Types all;
+#endif
modulepar {
/* Use Osmocom extended IPA mux header */
@@ -146,10 +147,12 @@
} with { extension "internal" }
#endif
+#ifdef IPA_EMULATION_CTRL
/* Client port for CTRL inside IPA */
type port IPA_CTRL_PT message {
inout CtrlMessage, ASP_IPA_Event;
} with { extension "internal" }
+#endif
#ifdef IPA_EMULATION_GSUP
/* Client port for CTRL inside IPA */
@@ -550,8 +553,10 @@
var ASP_Event asp_evt;
var Socket_API_Definitions.PortEvent port_evt;
var octetstring payload;
- var CtrlMessage ctrl_msg;
var ASP_IPA_Unitdata ipa_ud;
+#ifdef IPA_EMULATION_CTRL
+ var CtrlMessage ctrl_msg;
+#endif
#ifdef IPA_EMULATION_SCCP
var ASP_MTP3_TRANSFERreq mtp_req;
#endif
@@ -631,9 +636,11 @@
f_mgcp_to_user(ipa_rx.msg);
}
#endif
+#ifdef IPA_EMULATION_CTRL
case (IPAC_PROTO_EXT_CTRL) {
f_ctrl_to_user(ipa_rx.msg);
}
+#endif
#ifdef IPA_EMULATION_GSUP
case (IPAC_PROTO_EXT_GSUP) {
f_gsup_to_user(ipa_rx.msg);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I68349b32f613aacced84011601121f2265243600
Gerrit-Change-Number: 15230
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: IPA_Emulation: Fix building without CTRL support
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230
Change subject: IPA_Emulation: Fix building without CTRL support
..
IPA_Emulation: Fix building without CTRL support
Back in JUne, Change-Id I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7
attempted to introduce compilation of IPA_Emulation without CTRL but
it failed to cover all references to CTRL with the correspondign
ifdef/endif blocks. Let's fix this.
Change-Id: I68349b32f613aacced84011601121f2265243600
---
M library/IPA_Emulation.ttcnpp
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/30/15230/1
diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp
index 2305b7b..7b80c2d 100644
--- a/library/IPA_Emulation.ttcnpp
+++ b/library/IPA_Emulation.ttcnpp
@@ -51,8 +51,9 @@
import from RSPRO_Types all;
#endif
-
+#ifdef IPA_EMULATION_CTRL
import from Osmocom_CTRL_Types all;
+#endif
modulepar {
/* Use Osmocom extended IPA mux header */
@@ -146,10 +147,12 @@
} with { extension "internal" }
#endif
+#ifdef IPA_EMULATION_CTRL
/* Client port for CTRL inside IPA */
type port IPA_CTRL_PT message {
inout CtrlMessage, ASP_IPA_Event;
} with { extension "internal" }
+#endif
#ifdef IPA_EMULATION_GSUP
/* Client port for CTRL inside IPA */
@@ -550,8 +553,10 @@
var ASP_Event asp_evt;
var Socket_API_Definitions.PortEvent port_evt;
var octetstring payload;
- var CtrlMessage ctrl_msg;
var ASP_IPA_Unitdata ipa_ud;
+#ifdef IPA_EMULATION_CTRL
+ var CtrlMessage ctrl_msg;
+#endif
#ifdef IPA_EMULATION_SCCP
var ASP_MTP3_TRANSFERreq mtp_req;
#endif
@@ -631,9 +636,11 @@
f_mgcp_to_user(ipa_rx.msg);
}
#endif
+#ifdef IPA_EMULATION_CTRL
case (IPAC_PROTO_EXT_CTRL) {
f_ctrl_to_user(ipa_rx.msg);
}
+#endif
#ifdef IPA_EMULATION_GSUP
case (IPAC_PROTO_EXT_GSUP) {
f_gsup_to_user(ipa_rx.msg);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15230
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I68349b32f613aacced84011601121f2265243600
Gerrit-Change-Number: 15230
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
