<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14231">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">L1CTL_Types.ttcn: accept SacchL1Header in ts_L1CTL_DATA_REQ_SACCH<br><br>In BTS_Tests.ttcn we used to compose L1ctlDataReq manually. This<br>can be done by ts_L1CTL_DATA_REQ_SACCH() template itself, so<br>let's abstract BTS_Tests.ttcn from doing that.<br><br>Change-Id: I1ae948bd0314cdf15c21ce4b6346d5e32f1fcf95<br>---<br>M bts/BTS_Tests.ttcn<br>M library/L1CTL_Types.ttcn<br>2 files changed, 26 insertions(+), 19 deletions(-)<br><br></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 37a5e3c..7aa74d2 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -1523,12 +1523,15 @@</span><br><span> var LapdmFrameAB lb := valueof(ts_LAPDm_AB(0, false, false, enc_GsmRrL3Message(meas_rep)));</span><br><span> log("LAPDm: ", lb);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- var L1ctlDataReq data_req := {</span><br><span style="color: hsl(0, 100%, 40%);">- l1header := valueof(ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)),</span><br><span style="color: hsl(0, 100%, 40%);">- l2_payload := f_pad_oct(enc_LapdmFrameAB(lb), 21, '2B'O)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- log("Sending Measurement Report: ", data_req);</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), data_req));</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) SacchL1Header l1h := ts_SacchL1Header(</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.l1_pars.ms_power_level, false,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.l1_pars.ms_actual_ta);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: we can use an extension of TTCN-3 for that, i.e. PADDING('2B'O) */</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring l2 := f_pad_oct(enc_LapdmFrameAB(lb), 21, '2B'O);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Sending Measurement Report: ", l1h, l2);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2));</span><br><span> repeat;</span><br><span> }</span><br><span> }</span><br><span>@@ -4522,19 +4525,16 @@</span><br><span> private function f_tx_lapdm(template (value) LapdmFrame l,</span><br><span> template (value) RslLinkId link_id) runs on ConnHdlr {</span><br><span> var octetstring l2 := enc_LapdmFrame(valueof(l));</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (value) SacchL1Header l1h;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: we can use an extension of TTCN-3 for padding, i.e. PADDING('2B'O) */</span><br><span> if (valueof(link_id.c) == SACCH) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* prepend dummy L1 header */</span><br><span style="color: hsl(0, 100%, 40%);">- var L1ctlDataReq l1hl2 := {</span><br><span style="color: hsl(0, 100%, 40%);">- l1header := valueof(ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta)),</span><br><span style="color: hsl(0, 100%, 40%);">- l2_payload := f_pad_oct(l2, 21, '2B'O)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, link_id, l1hl2));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Compose dummy L1 header */</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, link_id, l1h, f_pad_oct(l2, 21, '2B'O)));</span><br><span> } else {</span><br><span> /* If required, pad L2 frame with constant 0x2b filling */</span><br><span style="color: hsl(0, 100%, 40%);">- l2 := f_pad_oct(l2, 23, '2B'O);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- log("encoding ", l, " to ", l2);</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, l2));</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, f_pad_oct(l2, 23, '2B'O)));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn</span><br><span>index f59d194..2a97099 100644</span><br><span>--- a/library/L1CTL_Types.ttcn</span><br><span>+++ b/library/L1CTL_Types.ttcn</span><br><span>@@ -594,13 +594,17 @@</span><br><span> ul_info_tbf := omit,</span><br><span> ul_info_abs := omit,</span><br><span> payload := {</span><br><span style="color: hsl(0, 100%, 40%);">- other := l2_data</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req := {</span><br><span style="color: hsl(120, 100%, 40%);">+ l1header := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ l2_payload := l2_data</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> template (value) L1ctlUlMessage ts_L1CTL_DATA_REQ_SACCH(template (value) RslChannelNr chan_nr,</span><br><span> template (value) RslLinkId link_id,</span><br><span style="color: hsl(0, 100%, 40%);">- L1ctlDataReq data_req) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) SacchL1Header l1h,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring l2_data) := {</span><br><span> header := ts_L1ctlHeader(L1CTL_DATA_REQ),</span><br><span> ul_info := {</span><br><span> chan_nr := chan_nr,</span><br><span>@@ -610,7 +614,10 @@</span><br><span> ul_info_tbf := omit,</span><br><span> ul_info_abs := omit,</span><br><span> payload := {</span><br><span style="color: hsl(0, 100%, 40%);">- data_req := data_req</span><br><span style="color: hsl(120, 100%, 40%);">+ data_req := {</span><br><span style="color: hsl(120, 100%, 40%);">+ l1header := l1h,</span><br><span style="color: hsl(120, 100%, 40%);">+ l2_payload := l2_data</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</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/+/14231">change 14231</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/+/14231"/><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: I1ae948bd0314cdf15c21ce4b6346d5e32f1fcf95 </div>
<div style="display:none"> Gerrit-Change-Number: 14231 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: merged </div>