Change in osmo-ttcn3-hacks[master]: BTS_Tests: turn 'l1ctl_ma_def' into 'c_arfcn_list'

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21147 )

Change subject: BTS_Tests: turn 'l1ctl_ma_def' into 'c_arfcn_list'
......................................................................

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
---
M bts/BTS_Tests.ttcn
1 file changed, 8 insertions(+), 5 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index fc714fe..462e2d5 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -584,7 +584,8 @@
 			/* 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 @@
 			"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 @@
 		enabled := false,
 		maio_hsn := ts_HsnMaio(0, 0),
 		ma_map := c_MA_null,
-		ma := l1ctl_ma_def
+		ma := { }
 	}
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21147
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I392299eea9a82168f893a72d06872c280b6fbdce
Gerrit-Change-Number: 21147
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201114/28a1221f/attachment.htm>