<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18526">View Change</a></p><div style="white-space:pre-wrap">Approvals:
neels: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/L1CTL_PortType: refactor L1CTL channel establishment<br><br> - Get rid of f_L1CTL_DM_EST_REQ, it's not really needed.<br> - Derive ts_L1CTL_DM_EST_REQ_H0 from ts_L1CTL_DM_EST_REQ.<br> - Turn all its params into (value) templates.<br> - Turn it into a (value) template itself.<br> - Pass GsmArfcn directly to ts_L1CTL_DM_EST_REQ_H0.<br><br>Change-Id: I4f275e22d4309a23b4ed301a0779c4ecb92023a8<br>Related: OS#4546<br>---<br>M bts/BTS_Tests.ttcn<br>M library/L1CTL_PortType.ttcn<br>M library/L1CTL_Types.ttcn<br>M library/LAPDm_RAW_PT.ttcn<br>4 files changed, 29 insertions(+), 22 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 6811e38..0f89ec6 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -1093,7 +1093,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, act_type := t_RSL_IE_ActType_HO_ASYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL, {false, mp_trx0_arfcn }, g_pars.chan_nr, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* Verify that no DL SACCH is being received */</span><br><span> f_sacch_missing(?);</span><br><span>@@ -1111,7 +1111,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_ASYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL, {false, mp_trx0_arfcn }, g_pars.chan_nr, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* Verify that DL SACCH is being received */</span><br><span> f_sacch_present(si5);</span><br><span>@@ -1149,7 +1149,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, act_type := t_RSL_IE_ActType_HO_SYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL, {false, mp_trx0_arfcn }, g_pars.chan_nr, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* Verify that no DL SACCH is being received */</span><br><span> f_sacch_missing(?);</span><br><span>@@ -1167,7 +1167,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL, {false, mp_trx0_arfcn }, g_pars.chan_nr, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* Verify that no DL SACCH is being received */</span><br><span> f_sacch_missing(?);</span><br><span>@@ -1185,7 +1185,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL, {false, mp_trx0_arfcn }, g_pars.chan_nr, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* Verify that no DL SACCH is being received */</span><br><span> f_sacch_missing(?);</span><br><span>@@ -1204,7 +1204,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL, {false, mp_trx0_arfcn }, g_pars.chan_nr, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* Verify that DL SACCH is being received */</span><br><span> f_sacch_present(si5);</span><br><span>@@ -1538,7 +1538,7 @@</span><br><span> </span><br><span> /* Switch the MS side (e.g. trxcon) to a dedicated channel without</span><br><span> * waiting for Immediate Assignment and sending Access Burst */</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL, { false, mp_trx0_arfcn }, g_pars.chan_nr, 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* Send handover Access Burst */</span><br><span> fn := f_L1CTL_RACH(L1CTL, ho_ref, chan_nr := g_pars.chan_nr);</span><br><span>@@ -4312,9 +4312,7 @@</span><br><span> f_TC_pcu_act_req(0, 0, 7, true);</span><br><span> </span><br><span> /* Tune trxcon to that PDCH channel */</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ(arfcn := { false, mp_trx0_arfcn },</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr := valueof(ts_RslChanNr_PDCH(7)),</span><br><span style="color: hsl(0, 100%, 40%);">- tsc := 7));</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(ts_RslChanNr_PDCH(7), 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* Verify PTCCH/U: send several access bursts, make sure they're received */</span><br><span> for (var integer i := 0; i < 16; i := i + 1) {</span><br><span>@@ -4575,8 +4573,7 @@</span><br><span> f_TC_pcu_act_req(0, 0, 7, true);</span><br><span> </span><br><span> /* Tune trxcon to that PDCH channel on TS7 */</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL, { false, mp_trx0_arfcn },</span><br><span style="color: hsl(0, 100%, 40%);">- valueof(ts_RslChanNr_PDCH(7)), 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(ts_RslChanNr_PDCH(7), 7, mp_trx0_arfcn));</span><br><span> </span><br><span> /* C/I in centiBels, test range: -256 .. +1280, step 128 */</span><br><span> for (var int16_t i := -256; i <= 1280; i := i + 128) {</span><br><span>diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn</span><br><span>index c595b03..cc2ff93 100644</span><br><span>--- a/library/L1CTL_PortType.ttcn</span><br><span>+++ b/library/L1CTL_PortType.ttcn</span><br><span>@@ -201,14 +201,12 @@</span><br><span> }</span><br><span> T.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- function f_L1CTL_DM_EST_REQ(L1CTL_PT pt, Arfcn arfcn, RslChannelNr chan_nr, GsmTsc tsc) {</span><br><span style="color: hsl(0, 100%, 40%);">- pt.send(ts_L1CTL_DM_EST_REQ(arfcn, chan_nr, tsc));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> /* Send DM_EST_REQ from parameters derived from IMM ASS */</span><br><span> function f_L1CTL_DM_EST_REQ_IA(L1CTL_PT pt, ImmediateAssignment imm_ass) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(pt, { false, imm_ass.chan_desc.arfcn }, imm_ass.chan_desc.chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- imm_ass.chan_desc.tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+ pt.send(ts_L1CTL_DM_EST_REQ_H0(imm_ass.chan_desc.chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ imm_ass.chan_desc.tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ imm_ass.chan_desc.arfcn));</span><br><span> }</span><br><span> </span><br><span> /* Send DM_REL_REQ from parameters derived from IMM ASS */</span><br><span>diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn</span><br><span>index e939f72..0870a20 100644</span><br><span>--- a/library/L1CTL_Types.ttcn</span><br><span>+++ b/library/L1CTL_Types.ttcn</span><br><span>@@ -548,7 +548,9 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- template L1ctlUlMessage ts_L1CTL_DM_EST_REQ(Arfcn arfcn, RslChannelNr chan_nr, GsmTsc tsc) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Base template to be inherited by ts_L1CTL_DM_EST_REQ_H0 and ts_L1CTL_DM_EST_REQ_H1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ private template (value) L1ctlUlMessage ts_L1CTL_DM_EST_REQ(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) GsmTsc tsc) := {</span><br><span> header := ts_L1ctlHeader(L1CTL_DM_EST_REQ),</span><br><span> ul_info := {</span><br><span> chan_nr := chan_nr,</span><br><span>@@ -560,15 +562,25 @@</span><br><span> payload := {</span><br><span> dm_est_req := {</span><br><span> tsc := tsc,</span><br><span style="color: hsl(0, 100%, 40%);">- h := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn := arfcn,</span><br><span style="color: hsl(0, 100%, 40%);">- hopping := omit,</span><br><span> tch_mode := 0,</span><br><span> audio_mode := t_L1CTL_AudioModeNone</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) L1ctlUlMessage ts_L1CTL_DM_EST_REQ_H0(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) GsmTsc tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) GsmArfcn arfcn)</span><br><span style="color: hsl(120, 100%, 40%);">+ modifies ts_L1CTL_DM_EST_REQ := {</span><br><span style="color: hsl(120, 100%, 40%);">+ payload := {</span><br><span style="color: hsl(120, 100%, 40%);">+ dm_est_req := {</span><br><span style="color: hsl(120, 100%, 40%);">+ h := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn := { false, arfcn },</span><br><span style="color: hsl(120, 100%, 40%);">+ hopping := 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%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> template L1ctlUlMessage ts_L1CTL_DM_REL_REQ(RslChannelNr chan_nr) := {</span><br><span> header := ts_L1ctlHeader(L1CTL_DM_REL_REQ),</span><br><span> ul_info := {</span><br><span>diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn</span><br><span>index 75d18d9..394deab 100644</span><br><span>--- a/library/LAPDm_RAW_PT.ttcn</span><br><span>+++ b/library/LAPDm_RAW_PT.ttcn</span><br><span>@@ -246,7 +246,7 @@</span><br><span> set_ph_state(PH_STATE_TUNING_DCH);</span><br><span> /* store/save channel description */</span><br><span> chan_desc.chan_nr := chan_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_EST_REQ(L1CTL,arfcn, chan_nr, tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(chan_nr, tsc, arfcn.arfcn));</span><br><span> set_ph_state(PH_STATE_DCH);</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/+/18526">change 18526</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/+/18526"/><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: I4f275e22d4309a23b4ed301a0779c4ecb92023a8 </div>
<div style="display:none"> Gerrit-Change-Number: 18526 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>