<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests: implement optional frequency hopping support<br><br>Change-Id: If0318fd320d4f112341465844555bf8d65b5f88f<br>Depends: I7822c3581fccba3277a63577e740e7486307635d<br>Related: SYS#4868, OS#4546<br>---<br>M bts/BTS_Tests.ttcn<br>M bts/BTS_Tests_LAPDm.ttcn<br>2 files changed, 58 insertions(+), 0 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 1cecf4e..7c6886d 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -111,6 +111,10 @@</span><br><span> boolean mp_l1_supports_gprs := false;</span><br><span> /* how many transceivers do we expect to connect */</span><br><span> integer mp_transceiver_num := 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* frequency hopping status */</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean mp_freq_hop_enabled := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* frequency hopping parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ FreqHopConfig mp_fh_config;</span><br><span> }</span><br><span> </span><br><span> type record of RslChannelNr ChannelNrs;</span><br><span>@@ -510,6 +514,49 @@</span><br><span> </span><br><span> private type function void_fn(charstring id) runs on ConnHdlr;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private type record length(8) of FreqHopGroups FreqHopConfig;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private type record of FreqHopGroup FreqHopGroups;</span><br><span style="color: hsl(120, 100%, 40%);">+private type record FreqHopGroup {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint6_t hsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ FreqHopGroupItems trx_maio</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%);">+private type record of FreqHopGroupItem FreqHopGroupItems;</span><br><span style="color: hsl(120, 100%, 40%);">+private type record FreqHopGroupItem {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trx_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint6_t maio</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%);">+friend function f_resolve_fh_params(inout ConnHdlrPars pars, uint8_t trx_nr := 0)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ var FreqHopGroups groups := mp_fh_config[pars.chan_nr.tn];</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i, j;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < lengthof(groups); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var FreqHopGroup g := groups[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ for (j := 0; j < lengthof(g.trx_maio); j := j + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var FreqHopGroupItem gi := g.trx_maio[j];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gi.trx_nr == trx_nr) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.maio_hsn := valueof(ts_HsnMaio(g.hsn, gi.maio));</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.ma := { }; /* to be composed below */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ if (ispresent(pars.maio_hsn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Compose the Mobile Allocation */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (j := 0; j < lengthof(g.trx_maio); j := j + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var FreqHopGroupItem gi := g.trx_maio[j];</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.ma := pars.ma & { l1ctl_ma_def[gi.trx_nr] };</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%);">+ log("Freq. hopping parameters: ", pars.maio_hsn, pars.ma);</span><br><span style="color: hsl(120, 100%, 40%);">+ break; /* We're done */</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> /* create a new test component */</span><br><span> friend function f_start_handler(void_fn fn, ConnHdlrPars pars,</span><br><span> boolean pcu_comp := false,</span><br><span>@@ -535,6 +582,11 @@</span><br><span> map(vc_conn:BTS_TRXC, system:BTS_TRXC);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Obtain frequency hopping parameters for a given timeslot */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_freq_hop_enabled and mp_transceiver_num > 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_resolve_fh_params(pars);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vc_conn.start(f_handler_init(fn, id, pars));</span><br><span> return vc_conn;</span><br><span> }</span><br><span>diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>index 4d4a988..4242502 100644</span><br><span>--- a/bts/BTS_Tests_LAPDm.ttcn</span><br><span>+++ b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>@@ -228,6 +228,12 @@</span><br><span> /* undo what f_start_handler is doing and pull LAPDm_CT into the loop */</span><br><span> unmap(self:L1CTL, system:L1CTL);</span><br><span> f_lapdm_init();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Obtain frequency hopping parameters for a given timeslot */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp_freq_hop_enabled and mp_transceiver_num > 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_resolve_fh_params(g_pars);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* activate the channel on the BTS side */</span><br><span> f_rsl_chan_act(g_pars.chan_mode, false, {});</span><br><span> /* activate the channel on the MS side */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19245">change 19245</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/+/19245"/><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: If0318fd320d4f112341465844555bf8d65b5f88f </div>
<div style="display:none"> Gerrit-Change-Number: 19245 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>