<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcu: Add infra to handle multitrx and multits envs<br><br>ARFCNs are allocated sequentially, so that conversion between<br>arfcn<->trx_nr is easily done.<br><br>Some helper functions are introduced to be able to submit and expect<br>messages on a given TRX+TS, which is required for setups with several<br>TRX and PDCH-enabled TS different than the default. These new APIs<br>will be used in PCU_Tests.ttcn in subsequent patches.<br><br>Change-Id: I28430e6d8c77d2b7dc630d186d425a5d82587b82<br>---<br>M library/PCUIF_Types.ttcn<br>M pcu/GPRS_Components.ttcn<br>M pcu/PCU_Tests.ttcn<br>3 files changed, 82 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/20968/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn</span><br><span>index b50e4c5..935f82b 100644</span><br><span>--- a/library/PCUIF_Types.ttcn</span><br><span>+++ b/library/PCUIF_Types.ttcn</span><br><span>@@ -815,21 +815,21 @@</span><br><span> </span><br><span> template (value) PCUIF_InfoV09Trx ts_PCUIF_InfoV09TrxNULL := ts_PCUIF_InfoV09Trx(0, '00000000'B, '00'O);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV09Trxs_def := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV09Trxs_def(uint16_t base_arfcn) := {</span><br><span> v09 := {</span><br><span style="color: hsl(0, 100%, 40%);">- ts_PCUIF_InfoV09Trx, ts_PCUIF_InfoV09TrxNULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_PCUIF_InfoV09Trx(arfcn := base_arfcn + 0), ts_PCUIF_InfoV09TrxNULL,</span><br><span> ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL,</span><br><span> ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL,</span><br><span> ts_PCUIF_InfoV09TrxNULL, ts_PCUIF_InfoV09TrxNULL</span><br><span> }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV10Trxs_def := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) PCUIF_InfoTrxs ts_PCUIF_InfoV10Trxs_def(uint16_t base_arfcn) := {</span><br><span> v10 := {</span><br><span style="color: hsl(0, 100%, 40%);">- ts_PCUIF_InfoV10Trx(arfcn := 871), ts_PCUIF_InfoV10Trx(arfcn := 872),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_PCUIF_InfoV10Trx(arfcn := 873), ts_PCUIF_InfoV10Trx(arfcn := 874),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_PCUIF_InfoV10Trx(arfcn := 875), ts_PCUIF_InfoV10Trx(arfcn := 876),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_PCUIF_InfoV10Trx(arfcn := 877), ts_PCUIF_InfoV10Trx(arfcn := 878)</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 0), ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 2), ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 3),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 4), ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 5),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 6), ts_PCUIF_InfoV10Trx(arfcn := base_arfcn + 7)</span><br><span> }</span><br><span> };</span><br><span> </span><br><span>@@ -972,12 +972,12 @@</span><br><span> </span><br><span> </span><br><span> /* TODO: remove this as soon as we drop version 9 support */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_PCUIF_ver_INFO_Trxs()</span><br><span style="color: hsl(120, 100%, 40%);">+function f_PCUIF_ver_INFO_Trxs(uint16_t base_arfcn)</span><br><span> return PCUIF_InfoTrxs {</span><br><span> if (PCUIF_Types.mp_pcuif_version >= 10) {</span><br><span style="color: hsl(0, 100%, 40%);">- return valueof(ts_PCUIF_InfoV10Trxs_def);</span><br><span style="color: hsl(120, 100%, 40%);">+ return valueof(ts_PCUIF_InfoV10Trxs_def(base_arfcn));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- return valueof(ts_PCUIF_InfoV09Trxs_def);</span><br><span style="color: hsl(120, 100%, 40%);">+ return valueof(ts_PCUIF_InfoV09Trxs_def(base_arfcn));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn</span><br><span>index c460e25..5ca32dd 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -44,6 +44,11 @@</span><br><span> import from Native_Functions all;</span><br><span> import from SGSN_Components all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+modulepar {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ARFCN of 1st TRX. Subsequent TRX are allocated incrementing ARFCNs. Nth TRX => base_arfcn + N-1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ GsmArfcn mp_base_arfcn := 871;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record TsTrxBtsNum {</span><br><span> uint3_t ts_nr,</span><br><span> uint3_t trx_nr,</span><br><span>@@ -201,6 +206,18 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_arfcn2trxnr(uint10_t arfcn) runs on MS_BTS_IFACE_CT return uint3_t {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (arfcn < mp_base_arfcn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Unable to find TRX NR for arfcn ", arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return arfcn - mp_base_arfcn;</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%);">+function f_trxnr2arfcn(uint3_t trx_nr) return uint10_t {</span><br><span style="color: hsl(120, 100%, 40%);">+ return mp_base_arfcn + trx_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_ultbf_new_from_rr_imm_ass(in GsmRrMessage rr_imm_ass)</span><br><span> runs on MS_BTS_IFACE_CT return UlTbf {</span><br><span> var UlTbf ul_tbf := valueof(t_UlTbf_def);</span><br><span>@@ -394,12 +411,62 @@</span><br><span> return dl_tbf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_ms_tx_TsTrxBtsNum(inout GprsMS ms)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on MS_BTS_IFACE_CT return TsTrxBtsNum {</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint3_t ts_nr := f_ultbf_next_ts(ms.ul_tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint3_t trx_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms.ul_tbf.arfcn != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_nr := f_arfcn2trxnr(ms.ul_tbf.arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: implement search by hsn+maio+ma when freq hopping is enabled */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_nr := 7;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return valueof(ts_TsTrxBtsNum(ts_nr, 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%);">+function f_dltbf_num_slots(inout DlTbf dl_tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on MS_BTS_IFACE_CT return uint3_t {</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint3_t n := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(dl_tbf.ts_mask); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dl_tbf.ts_mask[i] == '1'B) {</span><br><span style="color: hsl(120, 100%, 40%);">+ n := n + 1;</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%);">+ return n;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_ultbf_inc_bsn(inout UlTbf ul_tbf)</span><br><span> runs on MS_BTS_IFACE_CT {</span><br><span> ul_tbf.bsn := ul_tbf.bsn + 1;</span><br><span> ul_tbf.bsn := ul_tbf.bsn mod 128; /* FIXME: EGPRS SNS: 2048 */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_ultbf_next_ts(inout UlTbf ul_tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on MS_BTS_IFACE_CT return uint3_t {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: in the future we probably want to store last used internally</span><br><span style="color: hsl(120, 100%, 40%);">+ /* and continue from there */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(ul_tbf.ts_mask); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ul_tbf.ts_mask[i] == '1'B) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return i;</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%);">+ setverdict(fail, "No TS available for tx!");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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%);">+function f_ultbf_num_slots(inout UlTbf ul_tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on MS_BTS_IFACE_CT return uint3_t {</span><br><span style="color: hsl(120, 100%, 40%);">+ var uint3_t n := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(ul_tbf.ts_mask); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ul_tbf.ts_mask[i] == '1'B) {</span><br><span style="color: hsl(120, 100%, 40%);">+ n := n + 1;</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%);">+ return n;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_ms_use_ra(inout GprsMS ms, uint16_t ra, uint8_t ra_is_11bit := 0)</span><br><span> runs on MS_BTS_IFACE_CT {</span><br><span> ms.ra_is_11bit := ra_is_11bit;</span><br><span>@@ -706,7 +773,7 @@</span><br><span> BTS.send(ts_PCUIF_RACH_IND(nr.bts_nr, nr.trx_nr, ts_nr := 0,</span><br><span> ra := ra, is_11bit := is_11bit,</span><br><span> burst_type := burst_type,</span><br><span style="color: hsl(0, 100%, 40%);">- fn := fn, arfcn := 871,</span><br><span style="color: hsl(120, 100%, 40%);">+ fn := fn, arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)),</span><br><span> qta := ta * 4));</span><br><span> </span><br><span> /* 3GPP TS 44.018, table 9.1.8.1, note 2b: Request Reference shall be set to 127</span><br><span>@@ -725,7 +792,8 @@</span><br><span> var template RAW_PCU_EventParam ev_param := {tdma_fn := ? };</span><br><span> BTS.send(ts_PCUIF_DATA_IND(nr.bts_nr, nr.trx_nr, nr.ts_nr, nr.blk_nr,</span><br><span> sapi := PCU_IF_SAPI_PDTCH, data := data,</span><br><span style="color: hsl(0, 100%, 40%);">- fn := fn, arfcn := 871, lqual_cb := lqual_cb));</span><br><span style="color: hsl(120, 100%, 40%);">+ fn := fn, arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)),</span><br><span style="color: hsl(120, 100%, 40%);">+ lqual_cb := lqual_cb));</span><br><span> if (fn != 0) {</span><br><span> ev_param := {tdma_fn := fn };</span><br><span> }</span><br><span>@@ -738,7 +806,7 @@</span><br><span> runs on MS_BTS_IFACE_CT {</span><br><span> BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr,</span><br><span> sapi := PCU_IF_SAPI_PDTCH, fn := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn := 871, block_nr := nr.blk_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr));</span><br><span> BTS.receive(tr_PCUIF_DATA_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr,</span><br><span> sapi := PCU_IF_SAPI_PDTCH)) -> value pcu_msg;</span><br><span> }</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index ff8a355..4e2feb6 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -70,7 +70,7 @@</span><br><span> friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default := {</span><br><span> version := PCUIF_Types.mp_pcuif_version,</span><br><span> flags := c_PCUIF_Flags_default,</span><br><span style="color: hsl(0, 100%, 40%);">- trx := f_PCUIF_ver_INFO_Trxs(),</span><br><span style="color: hsl(120, 100%, 40%);">+ trx := f_PCUIF_ver_INFO_Trxs(GPRS_Components.mp_base_arfcn),</span><br><span> bsic := 7,</span><br><span> mcc := 262,</span><br><span> mnc := 42,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968">change 20968</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/+/20968"/><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: I28430e6d8c77d2b7dc630d186d425a5d82587b82 </div>
<div style="display:none"> Gerrit-Change-Number: 20968 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>