[S] Change in osmo-ttcn3-hacks[master]: library/rsl: rename t_RSL_IE_ActType_* -> c_RSL_IE_ActType_*
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38693?usp=email )
Change subject: library/rsl: rename t_RSL_IE_ActType_* -> c_RSL_IE_ActType_* ......................................................................
library/rsl: rename t_RSL_IE_ActType_* -> c_RSL_IE_ActType_*
We use prefix 't_' for templates and prefix 'c_' for constants.
Change-Id: I4ae8f6c35f6f823060833f24a0cad41cc9894750 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 19 insertions(+), 19 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/38693/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 07e824a..64804f5 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -867,7 +867,7 @@ friend function f_rsl_chan_act(RSL_IE_ChannelMode mode, boolean encr_enable := false, RSL_IE_List more_ies := {}, - RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) + RSL_IE_ActivationType act_type := c_RSL_IE_ActType_IA) runs on ConnHdlr { var RSL_Message ch_act := valueof(ts_RSL_CHAN_ACT(g_chan_nr, mode, act_type)); if (encr_enable) { @@ -1497,7 +1497,7 @@ };
/* Activate channel on BTS side */ - f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_ASYNC); + f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := c_RSL_IE_ActType_HO_ASYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ f_l1ctl_est_dchan(L1CTL, g_pars); @@ -1525,7 +1525,7 @@ ho_ref_ie, valueof(t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power := ts_RSL_IE_MS_Power(0)})) }; - f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_ASYNC); + f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := c_RSL_IE_ActType_HO_ASYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ f_l1ctl_est_dchan(L1CTL, g_pars); @@ -1578,7 +1578,7 @@ };
/* Activate channel on BTS side */ - f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); + f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := c_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ f_l1ctl_est_dchan(L1CTL, g_pars); @@ -1606,7 +1606,7 @@ ho_ref_ie, valueof(t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power := ts_RSL_IE_MS_Power(0)})) }; - f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); + f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := c_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ f_l1ctl_est_dchan(L1CTL, g_pars); @@ -1635,7 +1635,7 @@ ho_ref_ie, valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE, RSL_IE_Body:{timing_adv := 0})) }; - f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); + f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := c_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ f_l1ctl_est_dchan(L1CTL, g_pars); @@ -1664,7 +1664,7 @@ valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE, RSL_IE_Body:{timing_adv := 0})), valueof(t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power := ts_RSL_IE_MS_Power(0)})) }; - f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC); + f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := c_RSL_IE_ActType_HO_SYNC); /* don't perform immediate assignment here, as we're testing non-IA case */ /* enable dedicated mode */ f_l1ctl_est_dchan(L1CTL, g_pars); @@ -1997,7 +1997,7 @@
/* Activate a channel on the BTS side (no encryption) */ f_rsl_chan_act(g_pars.chan_mode, more_ies := { ho_ref_ie }, - act_type := t_RSL_IE_ActType_HO_SYNC); + act_type := c_RSL_IE_ActType_HO_SYNC);
/* Switch the MS side (e.g. trxcon) to a dedicated channel without * waiting for Immediate Assignment and sending Access Burst */ @@ -2069,7 +2069,7 @@
/* Activate a channel on the BTS side (no encryption) */ f_rsl_chan_act(g_pars.chan_mode, more_ies := { ho_ref_ie }, - act_type := t_RSL_IE_ActType_HO_SYNC); + act_type := c_RSL_IE_ActType_HO_SYNC);
/* Switch the MS side (e.g. trxcon) to a dedicated channel without * waiting for Immediate Assignment and sending of an Access Burst. */ @@ -2527,7 +2527,7 @@
/* Establish dedicated channel: L1CTL + RSL side */ private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies := {}, - RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) runs on ConnHdlr { + RSL_IE_ActivationType act_type := c_RSL_IE_ActType_IA) runs on ConnHdlr { var ChannelDescription ch_desc;
/* Activate channel on BTS side */ @@ -7182,7 +7182,7 @@ friend template RllTestCase t_EITC(template (present) uint3_t sapi, template (present) RslLinkId id, octetstring l3, boolean exp, - RSL_IE_ActivationType act_type := t_RSL_IE_ActType_IA) := { + RSL_IE_ActivationType act_type := c_RSL_IE_ActType_IA) := { sapi := sapi, link_id := id, l3 := l3, @@ -7263,7 +7263,7 @@ /* normal SAPI0 establishment (immediate assignment) */ valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, false)), /* normal SAPI0 establishment (normal assignment) */ - valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true, t_RSL_IE_ActType_ASS)), + valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true, c_RSL_IE_ActType_ASS)), /* SAPI 3 doesn't support contention resolution */ valueof(t_EITC(3, ts_RslLinkID_DCCH(3), '01020304'O, false)), valueof(t_EITC(3, ts_RslLinkID_SACCH(3), '01020304'O, false)), @@ -8860,7 +8860,7 @@ [] L1CTL.receive { repeat; } [] T.timeout; } - RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode, t_RSL_IE_ActType_IA)); + RSL.send(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode, c_RSL_IE_ActType_IA)); RSL.receive(tr_RSL_CHAN_ACT_ACK(g_chan_nr));
/* Now expect the IMM ASS on Um */ diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 1940b09..4597cc0 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -298,22 +298,22 @@ ACT_REL_TO_OSMO_PDCH ('111'B) } with { variant "FIELDLENGTH(3)" };
- const RSL_IE_ActivationType t_RSL_IE_ActType_IA := { + const RSL_IE_ActivationType c_RSL_IE_ActType_IA := { reactivation := false, reserved := 0, a_bits := ACT_REL_TO_IMM_ASSIGN } - const RSL_IE_ActivationType t_RSL_IE_ActType_ASS := { + const RSL_IE_ActivationType c_RSL_IE_ActType_ASS := { reactivation := false, reserved := 0, a_bits := ACT_REL_TO_NORM_ASSIGN } - const RSL_IE_ActivationType t_RSL_IE_ActType_HO_ASYNC := { + const RSL_IE_ActivationType c_RSL_IE_ActType_HO_ASYNC := { reactivation := false, reserved := 0, a_bits := ACT_REL_TO_ASYNC_HANDOVER } - const RSL_IE_ActivationType t_RSL_IE_ActType_HO_SYNC := { + const RSL_IE_ActivationType c_RSL_IE_ActType_HO_SYNC := { reactivation := false, reserved := 0, a_bits := ACT_REL_TO_SYNC_HANDOVER @@ -1614,7 +1614,7 @@ /* 8.4.1 BSC -> BTS */ template (value) RSL_Message ts_RSL_CHAN_ACT(template (value) RslChannelNr chan_nr, template (value) RSL_IE_ChannelMode mode, - template (value) RSL_IE_ActivationType at := t_RSL_IE_ActType_IA) := { + template (value) RSL_IE_ActivationType at := c_RSL_IE_ActType_IA) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), msg_type := RSL_MT_CHAN_ACTIV, ies :={ @@ -1626,7 +1626,7 @@ } template RSL_Message tr_RSL_CHAN_ACT(template RslChannelNr chan_nr, template RSL_IE_ChannelMode mode, - template (value) RSL_IE_ActivationType at := t_RSL_IE_ActType_IA) := { + template (value) RSL_IE_ActivationType at := c_RSL_IE_ActType_IA) := { msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false), msg_type := RSL_MT_CHAN_ACTIV, ies :={
-
fixeria