<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20702">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU_Tests: fix readability of code using t_RLCMAC_UL_DATA_TLLI<br><br>Change-Id: I175f8ce2606050c6b4ea54eae4e00846291d462f<br>---<br>M pcu/PCU_Tests.ttcn<br>1 file changed, 22 insertions(+), 15 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/02/20702/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 34dd035..b6026b4 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -899,6 +899,8 @@</span><br><span> var uint32_t dl_fn, sched_fn;</span><br><span> var octetstring payload;</span><br><span> var template (value) RlcmacUlBlock ul_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) LlcBlockHdr blk_hdr;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) LlcBlocks blocks;</span><br><span> var GprsMS ms;</span><br><span> </span><br><span> /* Initialize NS/BSSGP side */</span><br><span>@@ -920,14 +922,15 @@</span><br><span> /* Send one UL block (with TLLI since we are in One-Phase Access</span><br><span> contention resoultion) and make sure it is ACKED fine. */</span><br><span> payload := f_rnd_octstring(16); /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */</span><br><span style="color: hsl(120, 100%, 40%);">+ blk_hdr := t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload),</span><br><span style="color: hsl(120, 100%, 40%);">+ more := false, e := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ blocks := { t_RLCMAC_LLCBLOCK(payload, blk_hdr) };</span><br><span> /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */</span><br><span> ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi,</span><br><span style="color: hsl(0, 100%, 40%);">- cv := 15,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn := ms.ul_tbf.bsn,</span><br><span style="color: hsl(0, 100%, 40%);">- blocks := { t_RLCMAC_LLCBLOCK(payload,</span><br><span style="color: hsl(0, 100%, 40%);">- t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), more := false, e := true))</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- tlli := ms.tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ cv := 15,</span><br><span style="color: hsl(120, 100%, 40%);">+ bsn := ms.ul_tbf.bsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ blocks := blocks,</span><br><span style="color: hsl(120, 100%, 40%);">+ tlli := ms.tlli);</span><br><span> f_ultbf_inc_bsn(ms.ul_tbf);</span><br><span> f_ms_tx_ul_block(ms, ul_data);</span><br><span> </span><br><span>@@ -951,13 +954,14 @@</span><br><span> }</span><br><span> </span><br><span> payload := f_rnd_octstring(i);</span><br><span style="color: hsl(120, 100%, 40%);">+ blk_hdr := t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload),</span><br><span style="color: hsl(120, 100%, 40%);">+ more := false, e := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ blocks := { t_RLCMAC_LLCBLOCK(payload, blk_hdr) };</span><br><span> /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */</span><br><span> ul_data := t_RLCMAC_UL_DATA(tfi := ms.ul_tbf.tfi,</span><br><span> cv := cv,</span><br><span> bsn := ms.ul_tbf.bsn,</span><br><span style="color: hsl(0, 100%, 40%);">- blocks := { t_RLCMAC_LLCBLOCK(payload,</span><br><span style="color: hsl(0, 100%, 40%);">- t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), more := false, e := true))</span><br><span style="color: hsl(0, 100%, 40%);">- });</span><br><span style="color: hsl(120, 100%, 40%);">+ blocks := blocks);</span><br><span> f_ultbf_inc_bsn(ms.ul_tbf);</span><br><span> f_ms_tx_ul_block(ms, ul_data);</span><br><span> </span><br><span>@@ -986,6 +990,8 @@</span><br><span> function f_TC_ul_data_toolong_fills_padding_cs(inout GprsMS ms, CodingScheme cs, integer cv) runs on RAW_PCU_Test_CT {</span><br><span> var octetstring payload;</span><br><span> var template (value) RlcmacUlBlock ul_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) LlcBlockHdr blk_hdr;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) LlcBlocks blocks;</span><br><span> var integer block_len, max_valid_data_len;</span><br><span> timer T;</span><br><span> </span><br><span>@@ -995,13 +1001,14 @@</span><br><span> * indicator, -1 for spare bits octet at the end */</span><br><span> max_valid_data_len := block_len - 4 - 3 - 1 - 1;</span><br><span> payload := f_rnd_octstring(max_valid_data_len + 1); /* +1 to write LLC data on last padding octet */</span><br><span style="color: hsl(120, 100%, 40%);">+ blk_hdr := t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload),</span><br><span style="color: hsl(120, 100%, 40%);">+ more := false, e := true);</span><br><span style="color: hsl(120, 100%, 40%);">+ blocks := { t_RLCMAC_LLCBLOCK(payload, blk_hdr) };</span><br><span> ul_data := t_RLCMAC_UL_DATA_TLLI(tfi := ms.ul_tbf.tfi,</span><br><span style="color: hsl(0, 100%, 40%);">- cv := cv,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn := ms.ul_tbf.bsn,</span><br><span style="color: hsl(0, 100%, 40%);">- blocks := { t_RLCMAC_LLCBLOCK(payload,</span><br><span style="color: hsl(0, 100%, 40%);">- t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), more := false, e := true))</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- tlli := ms.tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ cv := cv,</span><br><span style="color: hsl(120, 100%, 40%);">+ bsn := ms.ul_tbf.bsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ blocks := blocks,</span><br><span style="color: hsl(120, 100%, 40%);">+ tlli := ms.tlli);</span><br><span> f_ultbf_inc_bsn(ms.ul_tbf);</span><br><span> f_ms_tx_data_ind(ms, enc_RlcmacUlBlock(valueof(ul_data)));</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20702">change 20702</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/+/20702"/><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: I175f8ce2606050c6b4ea54eae4e00846291d462f </div>
<div style="display:none"> Gerrit-Change-Number: 20702 </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>