<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13749">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RAN_Adapter: Rename functions from f_bssap_* to f_ran_adapter_*<br><br>Change-Id: I73818247f1dfc71c8ece11660e6c18f5f153d186<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/RAN_Adapter.ttcnpp<br>M msc/MSC_Tests.ttcn<br>3 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/13749/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 720669b..fb43d5e 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -316,12 +316,12 @@</span><br><span> /* Call a function of our 'parent component' RAN_Adapter_CT to start the</span><br><span> * MSC-side BSSAP emulation */</span><br><span> if (handler_mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", MSC_RanOps);</span><br><span style="color: hsl(0, 100%, 40%);">- f_bssap_start(g_bssap);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_init(g_bssap, mp_bssap_cfg, "VirtMSC", MSC_RanOps);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_start(g_bssap);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", omit);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_init(g_bssap, mp_bssap_cfg, "VirtMSC", omit);</span><br><span> connect(self:BSSAP, g_bssap.vc_SCCP:SCCP_SP_PORT);</span><br><span style="color: hsl(0, 100%, 40%);">- f_bssap_start(g_bssap);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_start(g_bssap);</span><br><span> f_legacy_bssap_reset();</span><br><span> }</span><br><span> </span><br><span>diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp</span><br><span>index 43b4988..a96c6ef 100644</span><br><span>--- a/library/RAN_Adapter.ttcnpp</span><br><span>+++ b/library/RAN_Adapter.ttcnpp</span><br><span>@@ -76,7 +76,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_bssap_init(inout RAN_Adapter ba, in RAN_Configuration cfg, charstring id,</span><br><span style="color: hsl(120, 100%, 40%);">+function f_ran_adapter_init(inout RAN_Adapter ba, in RAN_Configuration cfg, charstring id,</span><br><span> template RanOps ops) {</span><br><span> init_pars(ba, cfg);</span><br><span> ops.sccp_addr_local := ba.sccp_addr_own;</span><br><span>@@ -157,7 +157,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_bssap_start(inout RAN_Adapter ba) {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_ran_adapter_start(inout RAN_Adapter ba) {</span><br><span> ba.vc_SCCP.start(SCCPStart(ba.sccp_pars));</span><br><span> }</span><br><span> </span><br><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 9a37fb0..b2503b7 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -277,8 +277,8 @@</span><br><span> </span><br><span> for (var integer i := 0; i < num_bsc; i := i + 1) {</span><br><span> if (isbound(mp_bssap_cfg[i])) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_bssap_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_RanOps);</span><br><span style="color: hsl(0, 100%, 40%);">- f_bssap_start(g_bssap[i]);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_RanOps);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_start(g_bssap[i]);</span><br><span> } else {</span><br><span> testcase.stop("missing BSSAP configuration");</span><br><span> }</span><br><span>@@ -311,7 +311,7 @@</span><br><span> * to f_init() when the high level functions of the BSC_ConnectionHandler are</span><br><span> * not needed. */</span><br><span> function f_init_bssap_direct() runs on MTC_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_bssap_init(g_bssap[0], mp_bssap_cfg[0], "MSC_Test", omit);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_init(g_bssap[0], mp_bssap_cfg[0], "MSC_Test", omit);</span><br><span> connect(g_bssap[0].vc_SCCP:SCCP_SP_PORT, self:BSSAP_DIRECT);</span><br><span> </span><br><span> /* Start guard timer and activate it as default */</span><br><span>@@ -1860,7 +1860,7 @@</span><br><span> var boolean reset_ack_seen := false;</span><br><span> f_init_bssap_direct();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_bssap_start(g_bssap[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ran_adapter_start(g_bssap[0]);</span><br><span> </span><br><span> f_sleep(3.0);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13749">change 13749</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13749"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I73818247f1dfc71c8ece11660e6c18f5f153d186 </div>
<div style="display:none"> Gerrit-Change-Number: 13749 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>