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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU: introduce f_rrbp_ack_fn(), fix poll frame number calculation<br><br>The resulting frame number shall be within the period of TDMA hyperframe.<br><br>Change-Id: I794a14f69293cbbc937d62d09dd5794956b882db<br>Signed-off-by: Vadim Yanitskiy <axilirator@gmail.com><br>---<br>M library/RLCMAC_Templates.ttcn<br>M pcu/PCU_Tests.ttcn<br>2 files changed, 10 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn</span><br><span>index 38147f3..bcd2b23 100644</span><br><span>--- a/library/RLCMAC_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_Templates.ttcn</span><br><span>@@ -29,6 +29,11 @@</span><br><span>            return 0;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ function f_rrbp_ack_fn(uint32_t current_fn, MacRrbp rrbp)</span><br><span style="color: hsl(120, 100%, 40%);">+     return uint32_t {</span><br><span style="color: hsl(120, 100%, 40%);">+             return (current_fn + f_rrbp_fn_delay(rrbp)) mod 2715648;</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  function f_rlcmac_mcs2headertype(CodingScheme mcs) return EgprsHeaderType {</span><br><span>          select (mcs) {</span><br><span>               case (MCS_0) { return RLCMAC_HDR_TYPE_3; }</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 32df39e..eff20f7 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -547,7 +547,7 @@</span><br><span>                f_shutdown(__BFILE__, __LINE__);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+       poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp);</span><br><span> }</span><br><span> </span><br><span> private function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block)</span><br><span>@@ -571,7 +571,7 @@</span><br><span>           f_shutdown(__BFILE__, __LINE__);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+       poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp);</span><br><span> }</span><br><span> </span><br><span> private function f_rx_rlcmac_dl_block_exp_pkt_ul_ass(out RlcmacDlBlock dl_block, out uint32_t poll_fn)</span><br><span>@@ -584,7 +584,7 @@</span><br><span>                f_shutdown(__BFILE__, __LINE__);</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        poll_fn := dl_fn + f_rrbp_fn_delay(dl_block.ctrl.mac_hdr.rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+      poll_fn := f_rrbp_ack_fn(dl_fn, dl_block.ctrl.mac_hdr.rrbp);</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -606,7 +606,7 @@</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span>         log("verifying dl data block (gprs): ", dl_block);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        ack_fn := dl_fn + f_rrbp_fn_delay(dl_block.data.mac_hdr.mac_hdr.rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+        ack_fn := f_rrbp_ack_fn(dl_fn, dl_block.data.mac_hdr.mac_hdr.rrbp);</span><br><span> </span><br><span>      if (not match(dl_block.data.mac_hdr.hdr_ext.bsn, exp_bsn)) {</span><br><span>                 setverdict(fail, "DL block BSN doesn't match: ",</span><br><span>@@ -645,7 +645,7 @@</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span>    log("verifying dl data block (egprs): ", dl_block);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       ack_fn := dl_fn + f_rrbp_fn_delay(dl_block.data_egprs.mac_hdr.rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+  ack_fn := f_rrbp_ack_fn(dl_fn, dl_block.data_egprs.mac_hdr.rrbp);</span><br><span> </span><br><span>        if (not match(dl_block.data_egprs.mac_hdr.bsn1, exp_bsn)) {</span><br><span>          setverdict(fail, "DL block BSN doesn't match: ",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18183">change 18183</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/+/18183"/><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: I794a14f69293cbbc937d62d09dd5794956b882db </div>
<div style="display:none"> Gerrit-Change-Number: 18183 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>