Fix use of osmocom-extended RSL Channel Numbers
Bring our TTCN-3 view of how RSL channel numbers are defined in sync
with that of our other implementations (BTS, libosmocore, trxcon, ...)
Change-Id: I48908058ac2501a3b5ae7c74e4e8527cbaee1b01
Related: OS#4027
diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn
index c02522b..4d357ba 100644
--- a/bts/BTS_Tests_SMSCB.ttcn
+++ b/bts/BTS_Tests_SMSCB.ttcn
@@ -321,8 +321,17 @@
}
}
+private function t_cbch_chan_nr(CbchTestPars pars, template uint8_t tn) return template RslChannelNr {
+ if (pars.use_sdcch4) {
+ return t_RslChanNr_CBCH4(tn);
+ } else {
+ return t_RslChanNr_CBCH8(tn);
+ }
+}
+
/* shared function doing the heavy lifting for most CBCH tests */
private function f_TC_smscb(CbchTestPars pars) runs on test_CT {
+ var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */
var L1ctlDlMessage dl;
var integer msg_count;
timer T;
@@ -344,8 +353,7 @@
T.start(5.0 + 3.0 * int2float(msg_count));
/* Expect this to show up exactly once on the basic CBCH (four blocks) */
alt {
- /* FIXME: Channel Nr for SDCCH/8 */
- [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_CBCH(0))) -> value dl {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {
var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr);
var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload);
log("Tb=", tb, ", CBCH: ", dl, ", block: ", cb);
@@ -378,6 +386,7 @@
}
private function f_TC_smscb_default_only(CbchTestPars pars) runs on test_CT {
+ var template RslChannelNr t_chan_nr := t_cbch_chan_nr(pars, 0); /* FIXME: TS number */
var L1ctlDlMessage dl;
timer T := 5.0;
@@ -389,7 +398,7 @@
T.start;
alt {
- [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_CBCH(0))) -> value dl {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {
var integer tb := f_cbch_fn2tb(dl.dl_info.frame_nr);
log("CBCH: ", dl);
var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload);
@@ -658,6 +667,7 @@
basic := valueof(t_CbchPC(msgs_1m_3b_default)),
extended := omit
};
+ var template RslChannelNr t_chan_nr := t_RslChanNr_CBCH4(0);
var L1ctlDlMessage dl;
timer T := 5.0;
@@ -672,7 +682,7 @@
T.start;
alt {
- [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_CBCH(0))) -> value dl {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(t_chan_nr)) -> value dl {
log("CBCH: ", dl);
var CBCH_Block cb := dec_CBCH_Block(dl.payload.data_ind.payload);
/* detect the proper CBCH messages; check frame number */