<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19317">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests: introduce and use as_pcuif_check_pdch_mask()<br><br>This altstep would reduce code duplication.<br><br>Change-Id: Ic66598e3d2706da7caca7b27b9880562b0fcb9bd<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 17 insertions(+), 32 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/17/19317/1</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 574d47b..1c8127b 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -5438,9 +5438,21 @@</span><br><span> * Osmocom Style Dynamic Timeslot Support</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_dyn_osmo_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_pcuif_check_pdch_mask(integer pcu_conn_id, BIT1 exp,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer bts_nr, integer trx_nr)</span><br><span> runs on ConnHdlr {</span><br><span> var PCUIF_send_data sd;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd {</span><br><span style="color: hsl(120, 100%, 40%);">+ var bitstring pdch_mask := sd.data.u.info_ind.trx[trx_nr].pdch_mask;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (substr(pdch_mask, g_chan_nr.tn, 1) != exp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_dyn_osmo_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on ConnHdlr {</span><br><span> /* Expect BTS to immediately acknowledge activation as PDCH */</span><br><span> PCU.clear;</span><br><span> f_rsl_chan_act(g_pars.chan_mode);</span><br><span>@@ -5448,13 +5460,7 @@</span><br><span> timer T_wait := 2.0;</span><br><span> T_wait.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd {</span><br><span style="color: hsl(0, 100%, 40%);">- if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("PCUIF_INFO_IND PDCH_MASK not yet '1' after PDCH ACT on TS", g_chan_nr.tn,</span><br><span style="color: hsl(0, 100%, 40%);">- " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask);</span><br><span style="color: hsl(0, 100%, 40%);">- repeat;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_pcuif_check_pdch_mask(pcu_conn_id, '1'B, bts_nr, trx_nr);</span><br><span> [] PCU.receive { repeat; }</span><br><span> [] T_wait.timeout {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,</span><br><span>@@ -5468,7 +5474,6 @@</span><br><span> </span><br><span> private function f_dyn_osmo_pdch_deact(integer pcu_conn_id, integer bts_nr, integer trx_nr)</span><br><span> runs on ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- var PCUIF_send_data sd;</span><br><span> /* Send RSL CHAN REL (deactivate) */</span><br><span> PCU.clear;</span><br><span> RSL.send(ts_RSL_RF_CHAN_REL(g_chan_nr));</span><br><span>@@ -5476,13 +5481,7 @@</span><br><span> timer T_wait := 2.0;</span><br><span> T_wait.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd {</span><br><span style="color: hsl(0, 100%, 40%);">- if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("PCUIF_INFO_IND PDCH_MASK not yet '0' after PDCH DEACT on TS", g_chan_nr.tn,</span><br><span style="color: hsl(0, 100%, 40%);">- " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask);</span><br><span style="color: hsl(0, 100%, 40%);">- repeat;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_pcuif_check_pdch_mask(pcu_conn_id, '0'B, bts_nr, trx_nr);</span><br><span> [] PCU.receive { repeat; }</span><br><span> [] T_wait.timeout {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,</span><br><span>@@ -5638,7 +5637,6 @@</span><br><span> </span><br><span> private function f_dyn_ipa_pdch_act(integer pcu_conn_id, integer bts_nr, integer trx_nr)</span><br><span> runs on ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- var PCUIF_send_data sd;</span><br><span> /* Expect BTS to immediately acknowledge activation as PDCH */</span><br><span> PCU.clear;</span><br><span> RSL.send(ts_RSL_IPA_PDCH_ACT(g_chan_nr));</span><br><span>@@ -5646,13 +5644,7 @@</span><br><span> timer T_wait := 2.0;</span><br><span> T_wait.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd {</span><br><span style="color: hsl(0, 100%, 40%);">- if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '1'B) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("PCUIF_INFO_IND PDCH_MASK not yet '1' after PDCH ACT on TS", g_chan_nr.tn,</span><br><span style="color: hsl(0, 100%, 40%);">- " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask);</span><br><span style="color: hsl(0, 100%, 40%);">- repeat;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_pcuif_check_pdch_mask(pcu_conn_id, '1'B, bts_nr, trx_nr);</span><br><span> [] PCU.receive { repeat; }</span><br><span> [] T_wait.timeout {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,</span><br><span>@@ -5668,7 +5660,6 @@</span><br><span> </span><br><span> private function f_dyn_ipa_pdch_deact(integer pcu_conn_id, integer bts_nr, integer trx_nr)</span><br><span> runs on ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- var PCUIF_send_data sd;</span><br><span> /* Send RSL CHAN REL (deactivate) */</span><br><span> RSL.send(ts_RSL_IPA_PDCH_DEACT(g_chan_nr));</span><br><span> PCU.clear;</span><br><span>@@ -5676,13 +5667,7 @@</span><br><span> timer T_wait := 2.0;</span><br><span> T_wait.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU.receive(t_SD_PCUIF(pcu_conn_id, tr_PCUIF_INFO_IND(bts_nr, ?))) -> value sd {</span><br><span style="color: hsl(0, 100%, 40%);">- if (substr(sd.data.u.info_ind.trx[trx_nr].pdch_mask, g_chan_nr.tn, 1) != '0'B) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("PCUIF_INFO_IND PDCH_MASK not yet '0' after PDCH DEACT on TS", g_chan_nr.tn,</span><br><span style="color: hsl(0, 100%, 40%);">- " mask:", sd.data.u.info_ind.trx[trx_nr].pdch_mask);</span><br><span style="color: hsl(0, 100%, 40%);">- repeat;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_pcuif_check_pdch_mask(pcu_conn_id, '0'B, bts_nr, trx_nr);</span><br><span> [] PCU.receive { repeat; }</span><br><span> [] T_wait.timeout {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19317">change 19317</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/+/19317"/><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: Ic66598e3d2706da7caca7b27b9880562b0fcb9bd </div>
<div style="display:none"> Gerrit-Change-Number: 19317 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>