<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18369">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RLCMAC_CSN1_Types: Extend support for PacketDlAssignment<br><br>Change-Id: I5788d9fffe768bb8ebbb3fc2d93ebf014648e9bf<br>---<br>M library/RLCMAC_CSN1_Types.ttcn<br>M library/RLCMAC_Templates.ttcn<br>2 files changed, 72 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>index 1f1fb0a..ee02a8a 100644</span><br><span>--- a/library/RLCMAC_CSN1_Types.ttcn</span><br><span>+++ b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>@@ -122,15 +122,59 @@</span><br><span> TenTlli tlli</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ type record PacketDlAssignmentRel1999SubStruct {</span><br><span style="color: hsl(120, 100%, 40%);">+ EgprsWindowSize window_size,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT2 link_quality_meas_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 bep_period2_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT4 bep_period2 optional</span><br><span style="color: hsl(120, 100%, 40%);">+ } with {</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> /* 11.2.7 Packet Downlink Assignment */</span><br><span> type record PacketDlAssignment {</span><br><span> PageMode page_mode,</span><br><span> BIT1 pres1,</span><br><span> PersistenceLevels persistence_levels optional,</span><br><span style="color: hsl(0, 100%, 40%);">- GlobalTfiOrTlli tfi_or_tlli</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO */</span><br><span style="color: hsl(120, 100%, 40%);">+ GlobalTfiOrTlli tfi_or_tlli,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 egprs2('0'B), /* TODO: implement union with egprs2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT2 mac_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT2 rlc_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 control_ack,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT8 timeslot_alloc,</span><br><span style="color: hsl(120, 100%, 40%);">+ PacketTimingAdvance pkt_ta,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 p0_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint4_t p0 optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 reserved('0'B) optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 pr_mode optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 freq_par_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ FrequencyParameters freq_par optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 dl_tfi_ass_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint5_t dl_tfi_assignment optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 pwr_ctrl_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ PowerControlParameters pwr_ctrl optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 tbf_starting_time_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ StartingFnDesc tbf_starting_time optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 release1999('1'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 sub_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ PacketDlAssignmentRel1999SubStruct sub optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 pkt_ext_ta_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT2 pkt_ext_ta optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 compact_reduced_ma_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ COMPACTreducedMA compact_reduced_ma optional</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Additions for REL-5 */</span><br><span> } with {</span><br><span> variant (persistence_levels) "PRESENCE(pres1 = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (p0) "PRESENCE(p0_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (p0) "PRESENCE(p0_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (reserved) "PRESENCE(p0_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (pr_mode) "PRESENCE(p0_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (freq_par) "PRESENCE(freq_par_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (dl_tfi_assignment) "PRESENCE(dl_tfi_ass_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (pwr_ctrl) "PRESENCE(pwr_ctrl_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (sub) "PRESENCE(sub_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (pkt_ext_ta) "PRESENCE(pkt_ext_ta_present = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (compact_reduced_ma) "PRESENCE(compact_reduced_ma_present = '1'B)"</span><br><span> };</span><br><span> </span><br><span> /* 11.2.29 Packet Uplink Assignment */</span><br><span>diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn</span><br><span>index 0ffa840..e2abd84 100644</span><br><span>--- a/library/RLCMAC_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_Templates.ttcn</span><br><span>@@ -444,7 +444,32 @@</span><br><span> page_mode := ?,</span><br><span> pres1 := ?,</span><br><span> persistence_levels := *,</span><br><span style="color: hsl(0, 100%, 40%);">- tfi_or_tlli := ?</span><br><span style="color: hsl(120, 100%, 40%);">+ tfi_or_tlli := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ egprs2 := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ mac_mode := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ rlc_mode := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ control_ack := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot_alloc := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ pkt_ta := ?,</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%);">+ reserved := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ pr_mode := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ freq_par_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ freq_par := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_tfi_ass_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_tfi_assignment := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ pwr_ctrl_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ pwr_ctrl := *,</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%);">+ release1999 := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ sub_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ sub := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ pkt_ext_ta_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ pkt_ext_ta := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ compact_reduced_ma_present := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ compact_reduced_ma := *</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18369">change 18369</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/+/18369"/><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: I5788d9fffe768bb8ebbb3fc2d93ebf014648e9bf </div>
<div style="display:none"> Gerrit-Change-Number: 18369 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>