library/RSL_Types: fix CHAN ACT templates for dynamic timeslots
* t_RSL_IE_ActType_PDCH is actually a constant, not a template.
* tr_RSL_CHAN_ACT_PDCH makes no use of parameter 'mode'.
* Accomplish tr_RSL_CHAN_ACT_PDCH with a send template.
* Use 'present' qualifier for receive template parameters.
Change-Id: Ie62a92daaacf4de5f05dd1f3f5b4a2a5e4ee6dd6
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 0c71581..5276ed9 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -7374,7 +7374,7 @@
log("TCH/F_TCH/H_PDCH pchan starts out in disabled mode:");
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, NONE_MODE);
/* The BSC will activate the dynamic PDCH by default, so confirm that */
- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));
+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));
f_sleep(1.0);
@@ -7403,7 +7403,7 @@
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, NONE_MODE);
/* The BSC will activate the dynamic PDCH by default, so confirm that */
- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));
+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));
/* NACK this activation and expect the "show timeslot" mode still to be NONE */
f_ipa_tx(0, ts_RSL_CHAN_ACT_NACK(chan_nr, RSL_ERR_EQUIPMENT_FAIL));
@@ -7435,7 +7435,7 @@
log("TCH/F_TCH/H_SDCCH8_PDCH pchan starts out in disabled mode:");
f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, NONE_MODE);
/* The BSC will activate the dynamic PDCH by default, so confirm that */
- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));
+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));
f_sleep(1.0);
@@ -7473,7 +7473,7 @@
f_exp_chan_rel_and_clear(dt, 0);
/* The BSC will switch the TS back to PDCH once the only lchan using it is released: */
- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));
+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));
f_sleep(1.0);
f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE);
@@ -7505,7 +7505,7 @@
/* The dyn TS want to activate PDCH mode, ACK that. */
var RslChannelNr chan_nr;
chan_nr := valueof(t_RslChanNr_PDCH(2));
- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));
+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));
f_sleep(1.0);
@@ -7559,7 +7559,7 @@
log("TCH/F_TCH/H_SDCCH8_PDCH pchan starts out in disabled mode:");
f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, NONE_MODE);
/* The BSC will activate the dynamic PDCH by default, so confirm that */
- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));
+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));
f_sleep(1.0);
@@ -7597,7 +7597,7 @@
f_exp_chan_rel_and_clear(dt, 0);
/* The BSC will switch the TS back to PDCH once the only lchan using it is released: */
- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));
+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));
f_sleep(1.0);
f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE);
@@ -7629,7 +7629,7 @@
log("TCH/F_TCH/H_SDCCH8_PDCH pchan starts out in disabled mode:");
f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, NONE_MODE);
/* The BSC will activate the dynamic PDCH by default, so confirm that */
- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));
+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));
f_sleep(1.0);
@@ -7662,7 +7662,7 @@
/* FIXME? Currently the TS stays in state BORKEN: */
/* The BSC will switch the TS back to PDCH once the only lchan using it is released: */
- /* rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));
+ /* rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));
* f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));
* f_sleep(1.0);
* f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE)
@@ -10319,7 +10319,7 @@
var RslChannelNr chan_nr := valueof(t_RslChanNr_PDCH(6));
/* The BSC will activate the dynamic PDCH by default, so confirm that */
- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));
+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2323));
/* clean up timeslot 6 config, will only take effect when the OML drops the next time */
@@ -10391,7 +10391,7 @@
var RslChannelNr chan_nr := valueof(t_RslChanNr_PDCH(6));
/* The BSC will activate the dynamic PDCH by default, so confirm that */
- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));
+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2323));
/* clean up timeslot 6 config, will only take effect when the OML drops the next time */
@@ -10723,7 +10723,7 @@
/* The dyn TS wants to activate PDCH mode, ACK that. */
var RslChannelNr chan_nr;
chan_nr := valueof(t_RslChanNr_PDCH(2));
- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));
+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));
/* Exhaust all dedicated SDCCH lchans.
@@ -10781,7 +10781,7 @@
/* All SDCCH on the dyn TS are released, the dyn TS wants to activate PDCH again */
chan_nr := valueof(t_RslChanNr_PDCH(2));
- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));
+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));
/* Now all channels are occupied except the dyn TS, so expecting only the static counters to increment */