<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14205">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix use of osmocom-extended RSL Channel Numbers<br><br>Bring our TTCN-3 view of how RSL channel numbers are defined in sync<br>with that of our other implementations (BTS, libosmocore, trxcon, ...)<br><br>Change-Id: I48908058ac2501a3b5ae7c74e4e8527cbaee1b01<br>Related: OS#4027<br>---<br>M bts/BTS_Tests_SMSCB.ttcn<br>M library/GSM_Types.ttcn<br>2 files changed, 20 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>index c02522b..4d357ba 100644</span><br><span>--- a/bts/BTS_Tests_SMSCB.ttcn</span><br><span>+++ b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>@@ -321,8 +321,17 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function t_cbch_chan_nr(CbchTestPars pars, template uint8_t tn) return template RslChannelNr {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pars.use_sdcch4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return t_RslChanNr_CBCH4(tn);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ return t_RslChanNr_CBCH8(tn);</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%);">+</span><br><span> /* shared function doing the heavy lifting for most CBCH tests */</span><br><span> private function f_TC_smscb(CbchTestPars pars) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */</span><br><span> var L1ctlDlMessage dl;</span><br><span> var integer msg_count;</span><br><span> timer T;</span><br><span>@@ -344,8 +353,7 @@</span><br><span> T.start(5.0 + 3.0 * int2float(msg_count));</span><br><span> /* Expect this to show up exactly once on the basic CBCH (four blocks) */</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: Channel Nr for SDCCH/8 */</span><br><span style="color: hsl(0, 100%, 40%);">- [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_CBCH(0))) -> value dl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {</span><br><span> var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr);</span><br><span> var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload);</span><br><span> log("Tb=", tb, ", CBCH: ", dl, ", block: ", cb);</span><br><span>@@ -378,6 +386,7 @@</span><br><span> }</span><br><span> </span><br><span> private function f_TC_smscb_default_only(CbchTestPars pars) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */</span><br><span> var L1ctlDlMessage dl;</span><br><span> timer T := 5.0;</span><br><span> </span><br><span>@@ -389,7 +398,7 @@</span><br><span> </span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_CBCH(0))) -> value dl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {</span><br><span> var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr);</span><br><span> log("CBCH: ", dl);</span><br><span> var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload);</span><br><span>@@ -658,6 +667,7 @@</span><br><span> basic := valueof(t_CbchPC(msgs_1m_3b_default)),</span><br><span> extended := omit</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RslChannelNr t_chan_nr := t_RslChanNr_CBCH4(0);</span><br><span> var L1ctlDlMessage dl;</span><br><span> timer T := 5.0;</span><br><span> </span><br><span>@@ -672,7 +682,7 @@</span><br><span> </span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_CBCH(0))) -> value dl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {</span><br><span> log("CBCH: ", dl);</span><br><span> var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload);</span><br><span> /* detect the proper CBCH messages; check frame number */</span><br><span>diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn</span><br><span>index 3e24f81..ec74ce5 100644</span><br><span>--- a/library/GSM_Types.ttcn</span><br><span>+++ b/library/GSM_Types.ttcn</span><br><span>@@ -68,7 +68,8 @@</span><br><span> RSL_CHAN_NR_RACH ('10001'B),</span><br><span> RSL_CHAN_NR_PCH_AGCH ('10010'B),</span><br><span> RSL_CHAN_NR_OSMO_PDCH ('11000'B),</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CHAN_NR_OSMO_CBCH ('11001'B)</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_NR_OSMO_CBCH4 ('11001'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_NR_OSMO_CBCH8 ('11010'B)</span><br><span> } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" };</span><br><span> </span><br><span> type record RslChanNr2 {</span><br><span>@@ -115,7 +116,8 @@</span><br><span> template RslChannelNr t_RslChanNr_PCH_AGCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH);</span><br><span> template RslChannelNr t_RslChanNr_Bm(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH);</span><br><span> template RslChannelNr t_RslChanNr_PDCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH);</span><br><span style="color: hsl(0, 100%, 40%);">- template RslChannelNr t_RslChanNr_CBCH(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ template RslChannelNr t_RslChanNr_CBCH4(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4);</span><br><span style="color: hsl(120, 100%, 40%);">+ template RslChannelNr t_RslChanNr_CBCH8(template uint3_t tn) := t_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8);</span><br><span> template RslChannelNr t_RslChanNr_Lm(template uint3_t tn, template uint1_t sub_slot) := {</span><br><span> u := { lm := { tag := '0001'B, sub_chan := sub_slot } },</span><br><span> tn := tn</span><br><span>@@ -138,7 +140,8 @@</span><br><span> template (value) RslChannelNr ts_RslChanNr_PCH_AGCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_PCH_AGCH);</span><br><span> template (value) RslChannelNr ts_RslChanNr_Bm(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_Bm_ACCH);</span><br><span> template (value) RslChannelNr ts_RslChanNr_PDCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_PDCH);</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) RslChannelNr ts_RslChanNr_CBCH(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH);</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RslChannelNr ts_RslChanNr_CBCH4(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH4);</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RslChannelNr ts_RslChanNr_CBCH8(uint3_t tn) := ts_RslChanNr0(tn, RSL_CHAN_NR_OSMO_CBCH8);</span><br><span> template (value) RslChannelNr ts_RslChanNr_Lm(uint3_t tn, uint1_t sub_slot) := {</span><br><span> u := { lm := { tag := '0001'B, sub_chan := sub_slot } },</span><br><span> tn := tn</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14205">change 14205</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/14205"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I48908058ac2501a3b5ae7c74e4e8527cbaee1b01 </div>
<div style="display:none"> Gerrit-Change-Number: 14205 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>