<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21316">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;">BTS_Tests: make Training Sequence Code configurable<br><br>Change-Id: Ifc09d4192584048d39ebfa22824eda69320fa2c5<br>---<br>M bts/BTS_Tests.ttcn<br>M bts/BTS_Tests_LAPDm.ttcn<br>M bts/BTS_Tests_SMSCB.ttcn<br>3 files changed, 17 insertions(+), 13 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 68503dd..32a110a 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -116,6 +116,8 @@</span><br><span> FreqHopConfig mp_fh_config;</span><br><span> /* configuration for each individual transceiver */</span><br><span> TrxPars mp_trx_pars; /* see BTS_Tests.default */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* default Training Sequence Code */</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmTsc mp_tsc_def := 7;</span><br><span> }</span><br><span> </span><br><span> type record of RslChannelNr ChannelNrs;</span><br><span>@@ -285,6 +287,8 @@</span><br><span> RSL_IE_EncryptionInfo encr optional,</span><br><span> BtsBand bts0_band optional,</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Training Sequence Code */</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmTsc tsc,</span><br><span> /* Frequency hopping parameters */</span><br><span> FreqHopPars fhp</span><br><span> };</span><br><span>@@ -795,6 +799,7 @@</span><br><span> spec := omit,</span><br><span> encr := omit,</span><br><span> bts0_band := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc := mp_tsc_def,</span><br><span> fhp := {</span><br><span> enabled := false,</span><br><span> maio_hsn := ts_HsnMaio(0, 0),</span><br><span>@@ -2177,12 +2182,10 @@</span><br><span> /* Tune to a dedicated channel: L1CTL only */</span><br><span> private function f_l1ctl_est_dchan(L1CTL_PT pt, ConnHdlrPars pars) {</span><br><span> if (not pars.fhp.enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- pt.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- 7 /* TODO: mp_tsc */,</span><br><span style="color: hsl(120, 100%, 40%);">+ pt.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, pars.tsc,</span><br><span> mp_trx_pars[0].arfcn));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- pt.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- 7 /* TODO: mp_tsc */,</span><br><span style="color: hsl(120, 100%, 40%);">+ pt.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, pars.tsc,</span><br><span> pars.fhp.maio_hsn.hsn,</span><br><span> pars.fhp.maio_hsn.maio,</span><br><span> pars.fhp.ma));</span><br><span>@@ -2204,9 +2207,9 @@</span><br><span> </span><br><span> /* Craft channel description (with or without frequency hopping parameters) */</span><br><span> if (g_pars.fhp.enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn));</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn, g_pars.tsc));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn, g_pars.tsc));</span><br><span> }</span><br><span> </span><br><span> /* Send IMM.ASS via CCHAN */</span><br><span>@@ -3764,7 +3767,8 @@</span><br><span> </span><br><span> for (var integer i := 0; i < num_total; i := i+1) {</span><br><span> var ChannelDescription ch_desc := valueof(ts_ChanDescH0(ts_RslChanNr_SDCCH4(0, 0),</span><br><span style="color: hsl(0, 100%, 40%);">- mp_trx_pars[0].arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ mp_trx_pars[0].arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ mp_tsc_def));</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/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>index a4fa2e8..6d252e0 100644</span><br><span>--- a/bts/BTS_Tests_LAPDm.ttcn</span><br><span>+++ b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>@@ -50,11 +50,13 @@</span><br><span> /* Craft channel description (with or without frequency hopping parameters) */</span><br><span> if (g_pars.fhp.enabled) {</span><br><span> sw_req.chan_desc := valueof(ts_ChanDescH1(g_pars.chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.fhp.maio_hsn));</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.fhp.maio_hsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.tsc));</span><br><span> sw_req.ma := g_pars.fhp.ma;</span><br><span> } else {</span><br><span> sw_req.chan_desc := valueof(ts_ChanDescH0(g_pars.chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- mp_trx_pars[0].arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ mp_trx_pars[0].arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.tsc));</span><br><span> sw_req.ma := omit;</span><br><span> }</span><br><span> </span><br><span>diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>index 5f06f04..102e2ac 100644</span><br><span>--- a/bts/BTS_Tests_SMSCB.ttcn</span><br><span>+++ b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>@@ -259,14 +259,12 @@</span><br><span> f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED);</span><br><span> </span><br><span> if (pars.fhp.enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- 7 /* TODO: mp_tsc */,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, mp_tsc_def,</span><br><span> pars.fhp.maio_hsn.hsn,</span><br><span> pars.fhp.maio_hsn.maio,</span><br><span> pars.fhp.ma));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- 7 /* TODO: mp_tsc */,</span><br><span style="color: hsl(120, 100%, 40%);">+ L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, mp_tsc_def,</span><br><span> mp_trx_pars[0].arfcn));</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/+/21316">change 21316</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/+/21316"/><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: Ifc09d4192584048d39ebfa22824eda69320fa2c5 </div>
<div style="display:none"> Gerrit-Change-Number: 21316 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>