<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14092">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RSL_Types: Add dissected RSL_IE_ActivationType and related templates<br><br>This is required for supporting normal and handover assignments.<br><br>Change-Id: I116d589d0ec4aa6bffba4da6e3bfe1974dd04db2<br>---<br>M library/RSL_Types.ttcn<br>1 file changed, 36 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn</span><br><span>index 0d772b3..cfe2845 100644</span><br><span>--- a/library/RSL_Types.ttcn</span><br><span>+++ b/library/RSL_Types.ttcn</span><br><span>@@ -273,20 +273,44 @@</span><br><span> type record RSL_IE_ActivationType {</span><br><span> boolean reactivation,</span><br><span> uint4_t reserved,</span><br><span style="color: hsl(0, 100%, 40%);">- uint3_t a_bits</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_ActivationAbits a_bits</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type enumerated RSL_ActivationAbits {</span><br><span style="color: hsl(120, 100%, 40%);">+ ACT_REL_TO_IMM_ASSIGN ('000'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ ACT_REL_TO_NORM_ASSIGN ('001'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ ACT_REL_TO_ASYNC_HANDOVER ('010'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ ACT_REL_TO_SYNC_HANDOVER ('011'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ ACT_REL_TO_ADDL_ASSIGN ('100'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ ACT_REL_TO_MSLOT_CONFIG ('101'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ ACT_REL_TO_OSMO_PDCH ('111'B)</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "FIELDLENGTH(3)" };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- template RSL_IE_ActivationType t_RSL_IE_ActType := {</span><br><span style="color: hsl(120, 100%, 40%);">+ const RSL_IE_ActivationType t_RSL_IE_ActType_IA := {</span><br><span> reactivation := false,</span><br><span> reserved := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- a_bits := 0 /* related to immediate assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ a_bits := ACT_REL_TO_IMM_ASSIGN</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ const RSL_IE_ActivationType t_RSL_IE_ActType_ASS := {</span><br><span style="color: hsl(120, 100%, 40%);">+ reactivation := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ reserved := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ a_bits := ACT_REL_TO_NORM_ASSIGN</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ const RSL_IE_ActivationType t_RSL_IE_ActType_HO_ASYNC := {</span><br><span style="color: hsl(120, 100%, 40%);">+ reactivation := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ reserved := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ a_bits := ACT_REL_TO_ASYNC_HANDOVER</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ const RSL_IE_ActivationType t_RSL_IE_ActType_HO_SYNC := {</span><br><span style="color: hsl(120, 100%, 40%);">+ reactivation := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ reserved := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ a_bits := ACT_REL_TO_SYNC_HANDOVER</span><br><span> }</span><br><span> </span><br><span> /* osmocom-style dynamic PDCH */</span><br><span style="color: hsl(0, 100%, 40%);">- template RSL_IE_ActivationType t_RSL_IE_ActType_PDCH := {</span><br><span style="color: hsl(120, 100%, 40%);">+ const RSL_IE_ActivationType t_RSL_IE_ActType_PDCH := {</span><br><span> reactivation := false,</span><br><span> reserved := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- a_bits := 7 /* related to immediate assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ a_bits := ACT_REL_TO_OSMO_PDCH</span><br><span> }</span><br><span> </span><br><span> /* 9.3.6 */</span><br><span>@@ -1122,23 +1146,25 @@</span><br><span> </span><br><span> /* 8.4.1 BSC -> BTS */</span><br><span> template (value) RSL_Message ts_RSL_CHAN_ACT(template (value) RslChannelNr chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) RSL_IE_ChannelMode mode) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RSL_IE_ChannelMode mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RSL_IE_ActivationType at := t_RSL_IE_ActType_IA) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),</span><br><span> msg_type := RSL_MT_CHAN_ACTIV,</span><br><span> ies :={</span><br><span> t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}),</span><br><span style="color: hsl(0, 100%, 40%);">- t_RSL_IE(RSL_IE_ACT_TYPE, RSL_IE_Body:{act_type := t_RSL_IE_ActType}),</span><br><span style="color: hsl(120, 100%, 40%);">+ t_RSL_IE(RSL_IE_ACT_TYPE, RSL_IE_Body:{act_type := at}),</span><br><span> t_RSL_IE(RSL_IE_CHAN_MODE, RSL_IE_Body:{chan_mode := mode})</span><br><span> /* lots of optional IEs */</span><br><span> }</span><br><span> }</span><br><span> template RSL_Message tr_RSL_CHAN_ACT(template RslChannelNr chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- template RSL_IE_ChannelMode mode) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template RSL_IE_ChannelMode mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RSL_IE_ActivationType at := t_RSL_IE_ActType_IA) := {</span><br><span> msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false),</span><br><span> msg_type := RSL_MT_CHAN_ACTIV,</span><br><span> ies :={</span><br><span> tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_RSL_IE(RSL_IE_Body:{act_type := t_RSL_IE_ActType}),</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_RSL_IE(RSL_IE_Body:{act_type := at}),</span><br><span> tr_RSL_IE(RSL_IE_Body:{chan_mode := mode}),</span><br><span> /* lots of optional IEs */</span><br><span> *</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14092">change 14092</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14092"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I116d589d0ec4aa6bffba4da6e3bfe1974dd04db2 </div>
<div style="display:none"> Gerrit-Change-Number: 14092 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>