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/library/RSL_Types.ttcn b/library/RSL_Types.ttcn
index 70fb398..ccd43e6 100644
--- a/library/RSL_Types.ttcn
+++ b/library/RSL_Types.ttcn
@@ -318,7 +318,7 @@
}
/* osmocom-style dynamic PDCH */
- const RSL_IE_ActivationType t_RSL_IE_ActType_PDCH := {
+ const RSL_IE_ActivationType c_RSL_IE_ActType_PDCH := {
reactivation := false,
reserved := 1,
a_bits := ACT_REL_TO_OSMO_PDCH
@@ -1400,13 +1400,23 @@
*
}
}
- template RSL_Message tr_RSL_CHAN_ACT_PDCH(template RslChannelNr chan_nr,
- template RSL_IE_ChannelMode mode) := {
+
+ template (value) RSL_Message
+ ts_RSL_CHAN_ACT_PDCH(template (value) RslChannelNr chan_nr) := {
+ msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),
+ msg_type := RSL_MT_CHAN_ACTIV,
+ ies :={
+ t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}),
+ t_RSL_IE(RSL_IE_ACT_TYPE, RSL_IE_Body:{act_type := c_RSL_IE_ActType_PDCH})
+ }
+ }
+ template RSL_Message
+ tr_RSL_CHAN_ACT_PDCH(template (present) RslChannelNr chan_nr) := {
msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false),
msg_type := RSL_MT_CHAN_ACTIV,
ies :={
tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}),
- tr_RSL_IE(RSL_IE_Body:{act_type := t_RSL_IE_ActType_PDCH}),
+ tr_RSL_IE(RSL_IE_Body:{act_type := c_RSL_IE_ActType_PDCH}),
/* lots of optional IEs */
*
}
@@ -2320,14 +2330,16 @@
}
- template (value) RSL_Message ts_RSL_IPA_PDCH_ACT(RslChannelNr chan_nr) := {
+ template (value) RSL_Message
+ ts_RSL_IPA_PDCH_ACT(template (value) RslChannelNr chan_nr) := {
msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),
msg_type := RSL_MT_IPAC_PDCH_ACT,
ies := {
t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr})
}
}
- template RSL_Message tr_RSL_IPA_PDCH_ACT(template RslChannelNr chan_nr) := {
+ template RSL_Message
+ tr_RSL_IPA_PDCH_ACT(template (present) RslChannelNr chan_nr) := {
msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),
msg_type := RSL_MT_IPAC_PDCH_ACT,
ies := {