<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25668">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">f_TRXC_transceive(): accept 'template (value)' parameter<br><br>Change-Id: I98012607f3e9da71234333aac77d59936cd3ee20<br>Related: OS#5245<br>---<br>M bts/BTS_Tests.ttcn<br>M library/TRXC_CodecPort.ttcn<br>2 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 616ca34..44d9de4 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -584,10 +584,10 @@</span><br><span>                 f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id);</span><br><span> </span><br><span>           /* Start with a default moderate timing offset equalling TA=2, and RSSI=-60 */</span><br><span style="color: hsl(0, 100%, 40%);">-          ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256)));</span><br><span style="color: hsl(0, 100%, 40%);">-            ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(-60)));</span><br><span style="color: hsl(120, 100%, 40%);">+              ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(2*256));</span><br><span style="color: hsl(120, 100%, 40%);">+           ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_RSSI(-60));</span><br><span>              /* OsmoBTS may have different AB / NB threshold (see MIN_QUAL_NORM, MIN_QUAL_RACH) */</span><br><span style="color: hsl(0, 100%, 40%);">-           ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_CI(60)));</span><br><span style="color: hsl(120, 100%, 40%);">+         ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(60));</span><br><span>         }</span><br><span> </span><br><span>        /* Wait some extra time to make sure the BTS emits a stable carrier.</span><br><span>@@ -708,12 +708,12 @@</span><br><span> </span><br><span> private function f_trxc_fake_rssi(TRXC_RSSI rssi) runs on ConnHdlr {</span><br><span>     var TrxcMessage ret;</span><br><span style="color: hsl(0, 100%, 40%);">-    ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(rssi)));</span><br><span style="color: hsl(120, 100%, 40%);">+     ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_RSSI(rssi));</span><br><span> }</span><br><span> </span><br><span> private function f_trxc_fake_toffs256(int16_t toffs256) runs on ConnHdlr {</span><br><span>      var TrxcMessage ret;</span><br><span style="color: hsl(0, 100%, 40%);">-    ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256)));</span><br><span style="color: hsl(120, 100%, 40%);">+       ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(toffs256));</span><br><span> }</span><br><span> </span><br><span> /* first function started in ConnHdlr component */</span><br><span>@@ -1729,7 +1729,7 @@</span><br><span> private function f_rach_toffs(int16_t toffs256, boolean expect_pass) runs on test_CT {</span><br><span>      var TrxcMessage ret;</span><br><span>         /* tell fake_trx to use a given timing offset for all bursts */</span><br><span style="color: hsl(0, 100%, 40%);">- ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256)));</span><br><span style="color: hsl(120, 100%, 40%);">+       ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(toffs256));</span><br><span>       f_sleep(0.5);</span><br><span> </span><br><span>    /* Transmit RACH request + wait for confirmation */</span><br><span>@@ -5391,8 +5391,7 @@</span><br><span>  for (var int16_t i := -256; i <= 1280; i := i + 128) {</span><br><span>            var TrxcMessage ret;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">-                                   valueof(ts_TRXC_FAKE_CI(i)));</span><br><span style="color: hsl(120, 100%, 40%);">+                ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(i));</span><br><span> </span><br><span>              /* FIXME: OsmoBTS may have different threshold (see MIN_QUAL_NORM) */</span><br><span>                f_TC_pcu_data_ind_lqual_cb(i, thresh := 0);</span><br><span>diff --git a/library/TRXC_CodecPort.ttcn b/library/TRXC_CodecPort.ttcn</span><br><span>index 09b2977..bb2193f 100644</span><br><span>--- a/library/TRXC_CodecPort.ttcn</span><br><span>+++ b/library/TRXC_CodecPort.ttcn</span><br><span>@@ -59,7 +59,8 @@</span><br><span>     msg := msg</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_TRXC_transceive(TRXC_CODEC_PT pt, ConnectionId conn_id, TrxcMessage tx,</span><br><span style="color: hsl(120, 100%, 40%);">+function f_TRXC_transceive(TRXC_CODEC_PT pt, ConnectionId conn_id,</span><br><span style="color: hsl(120, 100%, 40%);">+                        template (value) TrxcMessage tx,</span><br><span>                     template TrxcMessage tr := ?) return TrxcMessage {</span><br><span>        var TRXC_RecvFrom rf;</span><br><span>        timer T := 3.0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25668">change 25668</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/c/osmo-ttcn3-hacks/+/25668"/><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-Change-Id: I98012607f3e9da71234333aac77d59936cd3ee20 </div>
<div style="display:none"> Gerrit-Change-Number: 25668 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>