<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Introduce helpers to update AckNackDescription<br><br>Change-Id: Ic62ab9e4a854239b95c434068543d95c5352f1c6<br>---<br>M pcu/PCU_Tests_RAW.ttcn<br>1 file changed, 41 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn</span><br><span>index bc0cb7f..cf630d3 100644</span><br><span>--- a/pcu/PCU_Tests_RAW.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW.ttcn</span><br><span>@@ -574,6 +574,38 @@</span><br><span> BTS.receive(tr_RAW_PCU_EV(BTS_EV_SI13_NEGO));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template AckNackDescription t_AckNackDescription_init := {</span><br><span style="color: hsl(120, 100%, 40%);">+ final_ack := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ starting_seq_nr := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B</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%);">+/* TS 44.060 sec 12.3 Ack/Nack Description */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_acknackdesc_ack_block(inout AckNackDescription desc, uint7_t bsn, BIT1 final_ack := '0'B)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer inc := bsn - desc.starting_seq_nr + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Filling hole? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsn < desc.starting_seq_nr) {</span><br><span style="color: hsl(120, 100%, 40%);">+ desc.receive_block_bitmap[lengthof(desc.receive_block_bitmap) - (desc.starting_seq_nr - bsn)] := int2bit(1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</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%);">+ /* SSN is increased, and so RBB values need to be moved */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < lengthof(desc.receive_block_bitmap) - inc; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ desc.receive_block_bitmap[i] := desc.receive_block_bitmap[i + inc];</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := lengthof(desc.receive_block_bitmap) - inc; i < lengthof(desc.receive_block_bitmap) - 1; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ desc.receive_block_bitmap[i] := int2bit(0, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now we can set current bit and update SSN */</span><br><span style="color: hsl(120, 100%, 40%);">+ desc.starting_seq_nr := bsn + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ desc.receive_block_bitmap[lengthof(desc.receive_block_bitmap) - 1] := int2bit(1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Finally update the final_ack bit as requested: */</span><br><span style="color: hsl(120, 100%, 40%);">+ desc.final_ack := final_ack;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* FIXME: properly encode RA (see TS 24.060, table 11.2.5.2) */</span><br><span> private function f_establish_tbf(out GsmRrMessage rr_imm_ass, uint8_t bts_nr := 0,</span><br><span> uint16_t ra := oct2int('3A'O), uint8_t is_11bit := 0,</span><br><span>@@ -765,7 +797,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data)</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_rx_rlcmac_dl_block_exp_data(out RlcmacDlBlock dl_block, out uint32_t ack_fn, octetstring data, template (present) uint7_t exp_bsn := ?)</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span> var PCUIF_Message pcu_msg;</span><br><span> var uint32_t dl_fn;</span><br><span>@@ -780,6 +812,11 @@</span><br><span> </span><br><span> ack_fn := dl_fn + f_rrbp_fn_delay(dl_block.data.mac_hdr.mac_hdr.rrbp);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(dl_block.data.mac_hdr.hdr_ext.bsn, exp_bsn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "DL block BSN doesn't match: ",</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_block.data.blocks[0].hdr.length_ind, " vs exp ", exp_bsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (lengthof(dl_block.data.blocks) < 1) {</span><br><span> setverdict(fail, "DL block has no LLC payload: ", dl_block);</span><br><span> mtc.stop;</span><br><span>@@ -1378,12 +1415,7 @@</span><br><span> var boolean ok;</span><br><span> var uint32_t sched_fn;</span><br><span> var OCT4 tlli := '00000001'O;</span><br><span style="color: hsl(0, 100%, 40%);">- var AckNackDescription ack_nack_desc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ack_nack_desc.final_ack := '0'B;</span><br><span style="color: hsl(0, 100%, 40%);">- ack_nack_desc.starting_seq_nr := 0;</span><br><span style="color: hsl(0, 100%, 40%);">- ack_nack_desc.receive_block_bitmap := '0000000000000000000000000000000000000000000000000000000000000000'B;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ var AckNackDescription ack_nack_desc := valueof(t_AckNackDescription_init);</span><br><span> </span><br><span> /* Initialize NS/BSSGP side */</span><br><span> f_init_bssgp();</span><br><span>@@ -1428,9 +1460,10 @@</span><br><span> </span><br><span> /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */</span><br><span> f_sleep(X2002);</span><br><span style="color: hsl(0, 100%, 40%);">- f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rx_rlcmac_dl_block_exp_data(dl_block, sched_fn, data, 0);</span><br><span> </span><br><span> /* ACK the DL block */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_acknackdesc_ack_block(ack_nack_desc, dl_block.data.mac_hdr.hdr_ext.bsn, '1'B);</span><br><span> f_tx_rlcmac_ul_block(ts_RLCMAC_DL_ACK_NACK(dl_block.data.mac_hdr.hdr_ext.tfi, ack_nack_desc), 0, sched_fn);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16502">change 16502</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/+/16502"/><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: Ic62ab9e4a854239b95c434068543d95c5352f1c6 </div>
<div style="display:none"> Gerrit-Change-Number: 16502 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>