<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18185">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library: enrich tr_RLCMAC_DATA_RRBP, rename to tr_RLCMAC_DATA_GPRS<br><br>Let's make this template more flexible, so it can be used to match<br>any GPRS DL data blocks, not only those with rrbp_valid == true.<br><br>Note that behavior of f_rx_rlcmac_dl_block_exp_data() is<br>intentionally left unchanged, and will be fixed later.<br><br>Change-Id: I3940216368cdbb58fe89420675d1d8d5f5e49b05<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, 8 insertions(+), 5 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/85/18185/1</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 f2945eb..675a081 100644</span><br><span>--- a/library/RLCMAC_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_Templates.ttcn</span><br><span>@@ -497,14 +497,16 @@</span><br><span>            }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   template RlcmacDlBlock tr_RLCMAC_DATA_RRBP := {</span><br><span style="color: hsl(120, 100%, 40%);">+       template RlcmacDlBlock tr_RLCMAC_DATA_GPRS(template (present) boolean rrbp_valid := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                   template (present) MacRrbp rrbp := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                 template (present) uint3_t usf := ?) := {</span><br><span>                 data := {</span><br><span>                    mac_hdr := {</span><br><span>                                 mac_hdr := {</span><br><span>                                         payload_type := MAC_PT_RLC_DATA,</span><br><span style="color: hsl(0, 100%, 40%);">-                                        rrbp := ?,</span><br><span style="color: hsl(0, 100%, 40%);">-                                      rrbp_valid := true,</span><br><span style="color: hsl(0, 100%, 40%);">-                                     usf := ?</span><br><span style="color: hsl(120, 100%, 40%);">+                                      rrbp := rrbp,</span><br><span style="color: hsl(120, 100%, 40%);">+                                 rrbp_valid := rrbp_valid,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     usf := usf</span><br><span>                           },</span><br><span>                           hdr_ext := ?</span><br><span>                         },</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index eff20f7..3d194a9 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -686,7 +686,8 @@</span><br><span>        var PCUIF_Message pcu_msg;</span><br><span>   var uint32_t dl_fn;</span><br><span>  var boolean is_egprs := false;</span><br><span style="color: hsl(0, 100%, 40%);">-  var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP;</span><br><span style="color: hsl(120, 100%, 40%);">+        /* FIXME: for some reason, this template expects blocks with 'rrbp_valid' flag set */</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_GPRS(rrbp_valid := true);</span><br><span>   dl_template.data.blocks := ?;</span><br><span> </span><br><span>    f_rx_rlcmac_dl_block(dl_block, dl_fn);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18185">change 18185</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/+/18185"/><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: I3940216368cdbb58fe89420675d1d8d5f5e49b05 </div>
<div style="display:none"> Gerrit-Change-Number: 18185 </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-MessageType: newchange </div>