<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/GSM_RR_Types: share send templates for ChannelDescription<br><br>They're going to be used in other modules too, not only in BTS_Tests.<br>Also, take a chance to rearrange the list of arguments, so the ones<br>with default values are placed after mandatory ones.<br><br>Change-Id: Ia33ebf2e680f16f774a981fc33422dfe5036637f<br>---<br>M bts/BTS_Tests.ttcn<br>M library/GSM_RR_Types.ttcn<br>2 files changed, 23 insertions(+), 23 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 47f8a29..1582fae 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -2005,9 +2005,9 @@</span><br><span> </span><br><span> /* Craft channel description (with or without frequency hopping parameters) */</span><br><span> if (ispresent(g_pars.maio_hsn)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, maio_hsn := g_pars.maio_hsn));</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.maio_hsn));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx0_arfcn));</span><br><span> }</span><br><span> </span><br><span> /* Send IMM.ASS via CCHAN */</span><br><span>@@ -3476,26 +3476,6 @@</span><br><span> ma := ''B</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) uint3_t tsc := 7,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) uint12_t arfcn := mp_trx0_arfcn) := {</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr := chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- tsc := tsc,</span><br><span style="color: hsl(0, 100%, 40%);">- h := false,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn := arfcn,</span><br><span style="color: hsl(0, 100%, 40%);">- maio_hsn := omit</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-private template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) uint3_t tsc := 7,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) MaioHsn maio_hsn) := {</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr := chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- tsc := tsc,</span><br><span style="color: hsl(0, 100%, 40%);">- h := true,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- maio_hsn := maio_hsn</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> private function f_fmt_ia_stats(integer num_tx, integer num_rx, integer num_del) return charstring {</span><br><span> return int2str(num_tx) & " sent, "</span><br><span> & int2str(num_rx) & " received, "</span><br><span>@@ -3516,7 +3496,7 @@</span><br><span> f_l1_tune(L1CTL);</span><br><span> </span><br><span> for (var integer i := 0; i < num_total; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- var ChannelDescription ch_desc := valueof(ts_ChanDescH0(valueof(t_RslChanNr_SDCCH4(0, 0))));</span><br><span style="color: hsl(120, 100%, 40%);">+ var ChannelDescription ch_desc := valueof(ts_ChanDescH0(t_RslChanNr_SDCCH4(0, 0), mp_trx0_arfcn));</span><br><span> var GsmRrMessage ia := valueof(ts_IMM_ASS(42, i, 5, ch_desc, c_MA_null));</span><br><span> var octetstring ia_enc := enc_GsmRrMessage(ia);</span><br><span> RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_IMM_ASSIGN(ia_enc, 0)));</span><br><span>diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn</span><br><span>index d0d5d8e..bf650b2 100644</span><br><span>--- a/library/GSM_RR_Types.ttcn</span><br><span>+++ b/library/GSM_RR_Types.ttcn</span><br><span>@@ -1082,4 +1082,24 @@</span><br><span> ext_ra := ext_ra</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) ChannelDescription ts_ChanDescH0(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) uint12_t arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) uint3_t tsc := 7) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_nr := chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc := tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ h := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn := arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ maio_hsn := omit</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%);">+ template (value) ChannelDescription ts_ChanDescH1(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) MaioHsn maio_hsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) uint3_t tsc := 7) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_nr := chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc := tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ h := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ maio_hsn := maio_hsn</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> } with { encode "RAW" ; variant "FIELDORDER(msb)" }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19252">change 19252</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/+/19252"/><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: Ia33ebf2e680f16f774a981fc33422dfe5036637f </div>
<div style="display:none"> Gerrit-Change-Number: 19252 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>