diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2020-11-14 21:40:41 +0700 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-11-14 21:38:15 +0000 |
| commit | 2b991b6469a66eec632dadb9145d781d6570dc7d (patch) | |
| tree | 306eee190b5a4cdb708174ca429a654addf85556 | |
| parent | ab5769cd74f58fb42f5abeea4be1959b6cf6085d (diff) | |
BTS_Tests: turn 'l1ctl_ma_def' into 'c_arfcn_list'
It will be easier to use this list / array in non-L1CTL specific
records and templates, e.g. in (RR) Immediate Assignment.
Change-Id: I392299eea9a82168f893a72d06872c280b6fbdce
| -rw-r--r-- | bts/BTS_Tests.ttcn | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fc714fe1..462e2d54 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -584,7 +584,8 @@ friend function f_resolve_fh_params(inout FreqHopPars fhp, uint8_t tn, /* Compose the actual Mobile Allocation and the bitmask */ for (j := 0; j < lengthof(g.trx_maio); j := j + 1) { var FreqHopGroupItem gi := g.trx_maio[j]; - fhp.ma := fhp.ma & { l1ctl_ma_def[gi.trx_nr] }; + var GsmArfcn arfcn := c_arfcn_list[gi.trx_nr]; + fhp.ma := fhp.ma & { { false, arfcn } }; fhp.ma_map.ma[gi.trx_nr] := '1'B; } @@ -725,9 +726,11 @@ friend function f_rsl_chan_deact() runs on ConnHdlr { "RF CHAN REL", true); } -/* Default Mobile Allocation to be used for frequency hopping */ -private const L1ctlMA l1ctl_ma_def := { { false, mp_trx0_arfcn }, { false, mp_trx1_arfcn }, - { false, mp_trx2_arfcn }, { false, mp_trx3_arfcn } }; +/* TODO: move this to module parameters */ +private const GsmArfcn c_arfcn_list[4] := { + mp_trx0_arfcn, mp_trx1_arfcn, + mp_trx2_arfcn, mp_trx3_arfcn +}; friend template ConnHdlrPars t_Pars(template RslChannelNr chan_nr, template RSL_IE_ChannelMode chan_mode, @@ -761,7 +764,7 @@ friend template ConnHdlrPars t_Pars(template RslChannelNr chan_nr, enabled := false, maio_hsn := ts_HsnMaio(0, 0), ma_map := c_MA_null, - ma := l1ctl_ma_def + ma := { } } } |