<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15448">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/GSM_RR_Types.ttcn: refactor IaRestOctHH coding<br><br>According to 3GPP TS 44.018, section 10.5.2.16, IA Rest Octets IE<br>starting with 'HH' bits may contain one of the following CSN.1<br>encoded components:<br><br> 7 6 5 4 3 2 1 0 Bit Numbers<br> H H 0 0 . . . . Packet Uplink Assignment<br> H H 0 1 . . . . Packet Downlink Assignment<br> H H 1 . . . . . Second Part Packet Assignment<br><br>We already have (partial) support for the first two, while the<br>last type has not been supported so far. Let's add it.<br><br>Also, this change introduces several templates for IA Rest Octets<br>IE and some of its components mentioned above. This would allow<br>us to abstract the API users from dealing with further changes,<br>e.g. adding a coding attribute 'CSN.1 L/H' and missing fields.<br><br>Change-Id: Ib3a21e7c5fa1cad4466e3a09fa70540de7f6ecc5<br>---<br>M library/GSM_RR_Types.ttcn<br>M library/LAPDm_RAW_PT.ttcn<br>M pcu/PCU_Tests.ttcn<br>3 files changed, 120 insertions(+), 64 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/15448/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn</span><br><span>index b098118..480a12b 100644</span><br><span>--- a/library/GSM_RR_Types.ttcn</span><br><span>+++ b/library/GSM_RR_Types.ttcn</span><br><span>@@ -445,13 +445,37 @@</span><br><span> variant (mobile_allocation) "PRESENCE(freq_par_len != 0)"</span><br><span> */</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- type record IaRestOctHH {</span><br><span style="color: hsl(0, 100%, 40%);">- BIT2 presence,</span><br><span style="color: hsl(0, 100%, 40%);">- PacketUlAssign ul optional,</span><br><span style="color: hsl(0, 100%, 40%);">- PacketDlAssign dl optional</span><br><span style="color: hsl(120, 100%, 40%);">+ type record SecondPartAssign {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 r99, /* H / L */</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 presence optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT5 ext_ra optional</span><br><span> } with {</span><br><span style="color: hsl(0, 100%, 40%);">- variant (ul) "PRESENCE(presence = '00'B)"</span><br><span style="color: hsl(0, 100%, 40%);">- variant (dl) "PRESENCE(presence = '01'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: use 'CSN.1 L/H' attribute here */</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (presence) "PRESENCE(r99 = '1'B)" /* H */</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (ext_ra) "PRESENCE(presence = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type union PacketUlDlAssignUnion {</span><br><span style="color: hsl(120, 100%, 40%);">+ PacketUlAssign ul,</span><br><span style="color: hsl(120, 100%, 40%);">+ PacketDlAssign dl</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record PacketUlDlAssign {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 ass_disc,</span><br><span style="color: hsl(120, 100%, 40%);">+ PacketUlDlAssignUnion ass</span><br><span style="color: hsl(120, 100%, 40%);">+ } with {</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (ass) "CROSSTAG(dl, ass_disc = '1'B; ul, ass_disc = '0'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type union PacketAssignUnion {</span><br><span style="color: hsl(120, 100%, 40%);">+ SecondPartAssign spa,</span><br><span style="color: hsl(120, 100%, 40%);">+ PacketUlDlAssign uldl</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record IaRestOctHH {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Packet Assignment discriminator:</span><br><span style="color: hsl(120, 100%, 40%);">+ * Packet Uplink / Downlink Assignment (0)</span><br><span style="color: hsl(120, 100%, 40%);">+ * Second Part Packet Assignment (1) */</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 pa_disc,</span><br><span style="color: hsl(120, 100%, 40%);">+ PacketAssignUnion pa</span><br><span style="color: hsl(120, 100%, 40%);">+ } with {</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (pa) "CROSSTAG(spa, pa_disc = '1'B; uldl, pa_disc = '0'B)"</span><br><span> };</span><br><span> type record PacketUlAssignDyn {</span><br><span> uint5_t tfi_assignment,</span><br><span>@@ -722,6 +746,88 @@</span><br><span> with { extension "prototype(convert) decode(RAW)" };</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ template PacketDlAssign tr_PacketDlAssign(template GprsTlli tlli) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tlli := tlli,</span><br><span style="color: hsl(120, 100%, 40%);">+ group1_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ group1 := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ ta_index_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ ta_index := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_starting_time_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_starting_time := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ p0_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ p0 := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ pr_mode := *</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ template IaRestOctets tr_IaRestOctets_DLAss(template PacketDlAssign dl_ass) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := '11'B, /* HH */</span><br><span style="color: hsl(120, 100%, 40%);">+ ll := omit, lh := omit, hl := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ hh := {</span><br><span style="color: hsl(120, 100%, 40%);">+ pa_disc := '0'B, /* Packet Assignment (0) */</span><br><span style="color: hsl(120, 100%, 40%);">+ pa := {</span><br><span style="color: hsl(120, 100%, 40%);">+ uldl := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ass_disc := '1'B, /* Downlink Assignment (1) */</span><br><span style="color: hsl(120, 100%, 40%);">+ ass := { dl := dl_ass }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ template PacketUlAssign tr_PacketUlDynAssign(template uint5_t tfi := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BIT1 polling := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template uint3_t usf := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BIT1 usf_granularity := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template ChCodingCommand cs := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := '1'B, /* Dynamic Assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ dynamic := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tfi_assignment := tfi,</span><br><span style="color: hsl(120, 100%, 40%);">+ polling := polling,</span><br><span style="color: hsl(120, 100%, 40%);">+ spare := '0'B, /* Dynamic Assignment (mandatory after Rel-4) */</span><br><span style="color: hsl(120, 100%, 40%);">+ usf := usf,</span><br><span style="color: hsl(120, 100%, 40%);">+ usf_granularity := usf_granularity,</span><br><span style="color: hsl(120, 100%, 40%);">+ p0_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ p0 := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ pr_mode := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_coding_cmd := cs,</span><br><span style="color: hsl(120, 100%, 40%);">+ tlli_block_chan_coding := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ alpha_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ alpha := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ gamma := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: add to parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ ta_index_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ ta_index := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_starting_time_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_starting_time := *</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ single := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ template PacketUlAssign tr_PacketUlSglAssign := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := '1'B, /* Single Block Assignment */</span><br><span style="color: hsl(120, 100%, 40%);">+ dynamic := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ single := {</span><br><span style="color: hsl(120, 100%, 40%);">+ alpha_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ alpha := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ gamma := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ padding := '01'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_starting_time := ?</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ template IaRestOctets tr_IaRestOctets_ULAss(template PacketUlAssign ul_ass) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := '11'B, /* HH */</span><br><span style="color: hsl(120, 100%, 40%);">+ ll := omit, lh := omit, hl := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ hh := {</span><br><span style="color: hsl(120, 100%, 40%);">+ pa_disc := '0'B, /* Packet Assignment (0) */</span><br><span style="color: hsl(120, 100%, 40%);">+ pa := {</span><br><span style="color: hsl(120, 100%, 40%);">+ uldl := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ass_disc := '0'B, /* Uplink Assignment (0) */</span><br><span style="color: hsl(120, 100%, 40%);">+ ass := { ul := ul_ass }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> template (value) GsmRrMessage ts_IMM_ASS(uint8_t ra, GsmFrameNumber fn, TimingAdvance ta,</span><br><span> ChannelDescription ch_desc, MobileAllocation ma) := {</span><br><span> header := t_RrHeader(IMMEDIATE_ASSIGNMENT, 0),</span><br><span>@@ -800,6 +906,7 @@</span><br><span> }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: introduce generic TBF Assignment template for DL and UL */</span><br><span> template ImmediateAssignment t_IMM_ASS_TBF_DL(template GprsTlli tlli) := {</span><br><span> ded_or_tbf := {</span><br><span> spare := ?,</span><br><span>@@ -820,28 +927,7 @@</span><br><span> req_ref := ?,</span><br><span> timing_advance := ?,</span><br><span> mobile_allocation := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- rest_octets := {</span><br><span style="color: hsl(0, 100%, 40%);">- presence := '11'B,</span><br><span style="color: hsl(0, 100%, 40%);">- ll := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- lh := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- hl := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- hh := {</span><br><span style="color: hsl(0, 100%, 40%);">- presence := '01'B,</span><br><span style="color: hsl(0, 100%, 40%);">- ul := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- dl := {</span><br><span style="color: hsl(0, 100%, 40%);">- tlli := tlli,</span><br><span style="color: hsl(0, 100%, 40%);">- group1_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- group1 := *,</span><br><span style="color: hsl(0, 100%, 40%);">- ta_index_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- ta_index := *,</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_starting_time_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_starting_time := *,</span><br><span style="color: hsl(0, 100%, 40%);">- p0_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- p0 := *,</span><br><span style="color: hsl(0, 100%, 40%);">- pr_mode := *</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rest_octets := tr_IaRestOctets_DLAss(tr_PacketDlAssign(tlli))</span><br><span> };</span><br><span> </span><br><span> template GsmRrMessage t_RR_IMM_ASS_TBF_DL(template GprsTlli tlli) := {</span><br><span>diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn</span><br><span>index 2ede566..5a8d9ea 100644</span><br><span>--- a/library/LAPDm_RAW_PT.ttcn</span><br><span>+++ b/library/LAPDm_RAW_PT.ttcn</span><br><span>@@ -261,44 +261,13 @@</span><br><span> a[idx] := tfi_usf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Match an IMM.ASS for an Uplink TBF with a dynamic allocation */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Match an IMM.ASS for an Uplink TBF with a dynamic allocation</span><br><span style="color: hsl(120, 100%, 40%);">+ * FIXME: this template has nothing to do with LAPDm, move to GSM_RR_Types.ttcn */</span><br><span> template ImmediateAssignment t_IMM_ASS_TBF_UL_DYN(uint8_t ra, GsmFrameNumber fn) modifies t_IMM_ASS := {</span><br><span> ded_or_tbf := { spare := ?, tma := ?, downlink := false, tbf := true},</span><br><span> chan_desc := omit,</span><br><span> pkt_chan_desc := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- rest_octets := {</span><br><span style="color: hsl(0, 100%, 40%);">- presence := '11'B,</span><br><span style="color: hsl(0, 100%, 40%);">- ll := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- lh := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- hl := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- hh := {</span><br><span style="color: hsl(0, 100%, 40%);">- presence := '00'B,</span><br><span style="color: hsl(0, 100%, 40%);">- ul := {</span><br><span style="color: hsl(0, 100%, 40%);">- presence := '1'B,</span><br><span style="color: hsl(0, 100%, 40%);">- dynamic := {</span><br><span style="color: hsl(0, 100%, 40%);">- tfi_assignment := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- polling := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- spare := '0'B,</span><br><span style="color: hsl(0, 100%, 40%);">- usf := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- usf_granularity := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- p0_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- p0 := *,</span><br><span style="color: hsl(0, 100%, 40%);">- pr_mode := *,</span><br><span style="color: hsl(0, 100%, 40%);">- ch_coding_cmd := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- tlli_block_chan_coding:= ?,</span><br><span style="color: hsl(0, 100%, 40%);">- alpha_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- alpha := *,</span><br><span style="color: hsl(0, 100%, 40%);">- gamma := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- ta_index_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- ta_index := *,</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_starting_time_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- tbf_starting_time := *</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- single := omit</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- dl := omit</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ rest_octets := tr_IaRestOctets_ULAss(tr_PacketUlDynAssign())</span><br><span> };</span><br><span> </span><br><span> template (value) RLCMAC_ph_data_req ts_PH_DATA_ABS(uint8_t tbf_id, GprsCodingScheme cs,</span><br><span>@@ -332,7 +301,8 @@</span><br><span> //chan_desc := imm_ass.chan_desc;</span><br><span> </span><br><span> /* Important: ARFCN, TN, TSC, USF, USF_GRANULARITY, CH_CODING_CMD */</span><br><span style="color: hsl(0, 100%, 40%);">- f_TfiUsfArrSet(tua, imm_ass.pkt_chan_desc.tn, imm_ass.rest_octets.hh.ul.dynamic.usf);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TfiUsfArrSet(tua, imm_ass.pkt_chan_desc.tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ imm_ass.rest_octets.hh.pa.uldl.ass.ul.dynamic.usf);</span><br><span> f_L1CTL_TBF_CFG(L1CTL, true, tua);</span><br><span> } else {</span><br><span> /* FIXME: single block uplink allocation */</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 0f43f28..4ef71fa 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -603,7 +603,7 @@</span><br><span> var TbfPars tbf_pars := valueof(t_TbfParsInit);</span><br><span> log("Received IMM.ASS for our TLLI!");</span><br><span> tbf_pars.tfi[rr.payload.imm_ass.pkt_chan_desc.tn] :=</span><br><span style="color: hsl(0, 100%, 40%);">- rr.payload.imm_ass.rest_octets.hh.dl.group1.tfi_assignment;</span><br><span style="color: hsl(120, 100%, 40%);">+ rr.payload.imm_ass.rest_octets.hh.pa.uldl.ass.dl.group1.tfi_assignment;</span><br><span> L1.send(TBF_DL_establish_req:{tbf_nr, tbf_pars});</span><br><span> } else {</span><br><span> repeat;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15448">change 15448</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/c/osmo-ttcn3-hacks/+/15448"/><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-Change-Id: Ib3a21e7c5fa1cad4466e3a09fa70540de7f6ecc5 </div>
<div style="display:none"> Gerrit-Change-Number: 15448 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>