<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14290">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;">library/RSL_Types.ttcn: t(r|)s_RSL_CHAN_RQD: make chan_nr configurable<br><br>Change-Id: I89e9286e86b09ed54eb7749d107f5d8d57b93644<br>---<br>M bts/BTS_Tests.ttcn<br>M library/RSL_Types.ttcn<br>2 files changed, 11 insertions(+), 6 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 7aa74d2..edf056a 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -1245,10 +1245,10 @@</span><br><span> timer T := 5.0;</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn, t_RslChanNr_RACH(0)))) {</span><br><span> T.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?, ?, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?, ?, ?, ?))) {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected CHAN RQD");</span><br><span> }</span><br><span> [] RSL_CCHAN.receive { repeat; }</span><br><span>diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn</span><br><span>index ef3f45b..7f37720 100644</span><br><span>--- a/library/RSL_Types.ttcn</span><br><span>+++ b/library/RSL_Types.ttcn</span><br><span>@@ -1532,21 +1532,26 @@</span><br><span> </span><br><span> </span><br><span> /* 8.5.3 BTS -> BSC */</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) RSL_Message ts_RSL_CHAN_RQD(OCT1 ra, GsmFrameNumber fn, uint8_t acc_del := 0) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RSL_Message ts_RSL_CHAN_RQD(OCT1 ra, GsmFrameNumber fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RslChannelNr chan_nr := ts_RslChanNr_RACH(0),</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t acc_del := 0) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_CCHAN, false),</span><br><span> msg_type := RSL_MT_CHAN_RQD,</span><br><span> ies := {</span><br><span style="color: hsl(0, 100%, 40%);">- t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := ts_RslChanNr_RACH(0)}),</span><br><span style="color: hsl(120, 100%, 40%);">+ t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}),</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: we may need to have optional RSL_IE_LINK_IDENT IE here */</span><br><span> t_RSL_IE(RSL_IE_REQ_REFERENCE, RSL_IE_Body:{req_ref := ts_RSL_IE_ReqRef(ra, fn)}),</span><br><span> t_RSL_IE(RSL_IE_ACCESS_DELAY, RSL_IE_Body:{access_delay := acc_del})</span><br><span> }</span><br><span> }</span><br><span> template RSL_Message tr_RSL_CHAN_RQD(template OCT1 ra, template GsmFrameNumber fn := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- template uint8_t acc_del := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template RslChannelNr chan_nr := ts_RslChanNr_RACH(0),</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint8_t acc_del := ?) := {</span><br><span> msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false),</span><br><span> msg_type := RSL_MT_CHAN_RQD,</span><br><span> ies := {</span><br><span style="color: hsl(0, 100%, 40%);">- tr_RSL_IE(RSL_IE_Body:{chan_nr := t_RslChanNr_RACH(0)}),</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}),</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: we may need to have optional RSL_IE_LINK_IDENT IE here */</span><br><span> tr_RSL_IE(RSL_IE_Body:{req_ref := tr_RSL_IE_ReqRef(ra, fn)}),</span><br><span> tr_RSL_IE(RSL_IE_Body:{access_delay := acc_del})</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14290">change 14290</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/+/14290"/><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: I89e9286e86b09ed54eb7749d107f5d8d57b93644 </div>
<div style="display:none"> Gerrit-Change-Number: 14290 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>