<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19364">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RLCMAC_CSN1_Types: fix definition of PacketDlAssignment<br><br> - s/PacketDlAssignmentRel1999SubStruct/PktDlAssR99EGPRS/g,<br> - fix Additions in Release 1999 (missing spare bit),<br> - fix RLC_MODE field (it takes 1 bit, not 2),<br> - fix PRESENCE(p0) attribute (defined twice).<br><br>Change-Id: I98efe66bf43853b580f38bed36487fa10a53298a<br>---<br>M library/RLCMAC_CSN1_Types.ttcn<br>M library/RLCMAC_Templates.ttcn<br>2 files changed, 35 insertions(+), 26 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 00b6f2d..4ebdd75 100644</span><br><span>--- a/library/RLCMAC_CSN1_Types.ttcn</span><br><span>+++ b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>@@ -122,14 +122,6 @@</span><br><span> TenTlli tlli</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- type record PacketDlAssignmentRel1999SubStruct {</span><br><span style="color: hsl(0, 100%, 40%);">- EgprsWindowSize window_size,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT2 link_quality_meas_mode,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT1 bep_period2_present,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT4 bep_period2 optional</span><br><span style="color: hsl(0, 100%, 40%);">- } with {</span><br><span style="color: hsl(0, 100%, 40%);">- variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)"</span><br><span style="color: hsl(0, 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>@@ -138,7 +130,7 @@</span><br><span> GlobalTfiOrTlli tfi_or_tlli,</span><br><span> BIT1 egprs2('0'B), /* TODO: implement union with egprs2 */</span><br><span> BIT2 mac_mode,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT2 rlc_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 rlc_mode,</span><br><span> BIT1 control_ack,</span><br><span> BIT8 timeslot_alloc,</span><br><span> PacketTimingAdvance pkt_ta,</span><br><span>@@ -154,29 +146,51 @@</span><br><span> PowerControlParameters pwr_ctrl optional,</span><br><span> BIT1 tbf_starting_time_present,</span><br><span> StartingFnDesc tbf_starting_time optional,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT1 release1999('1'B),</span><br><span style="color: hsl(0, 100%, 40%);">- BIT1 sub_present,</span><br><span style="color: hsl(0, 100%, 40%);">- PacketDlAssignmentRel1999SubStruct sub optional,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT1 pkt_ext_ta_present,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT2 pkt_ext_ta optional,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT1 compact_reduced_ma_present,</span><br><span style="color: hsl(0, 100%, 40%);">- COMPACTreducedMA compact_reduced_ma optional</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: Additions for REL-5 */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The value '1' was allocated in an earlier version of the protocol */</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 spare ('0'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rel-{99,5,6,7,9,10,12,14} Additions (Matrioshka) */</span><br><span style="color: hsl(120, 100%, 40%);">+ PktDlAssRelAdditions rel_additions optional</span><br><span> } with {</span><br><span> variant (persistence_levels) "PRESENCE(pres1 = '1'B)"</span><br><span> variant (p0) "PRESENCE(p0_present = '1'B)"</span><br><span style="color: hsl(0, 100%, 40%);">- variant (p0) "PRESENCE(p0_present = '1'B)"</span><br><span> variant (reserved) "PRESENCE(p0_present = '1'B)"</span><br><span> variant (pr_mode) "PRESENCE(p0_present = '1'B)"</span><br><span> variant (freq_par) "PRESENCE(freq_par_present = '1'B)"</span><br><span> variant (dl_tfi_assignment) "PRESENCE(dl_tfi_ass_present = '1'B)"</span><br><span> variant (pwr_ctrl) "PRESENCE(pwr_ctrl_present = '1'B)"</span><br><span> variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)"</span><br><span style="color: hsl(0, 100%, 40%);">- variant (sub) "PRESENCE(sub_present = '1'B)"</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%);">+ private type record PktDlAssRelAdditions {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 rel99_presence, // 0/1</span><br><span style="color: hsl(120, 100%, 40%);">+ PktDlAssR99Additions rel99 optional</span><br><span style="color: hsl(120, 100%, 40%);">+ } with {</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (rel99) "PRESENCE(rel99_presence = '1'B)"</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%);">+ private type record PktDlAssR99Additions {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 egprs_present,</span><br><span style="color: hsl(120, 100%, 40%);">+ PktDlAssR99EGPRS egprs 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 style="color: hsl(120, 100%, 40%);">+ } with {</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (egprs) "PRESENCE(egprs_present = '1'B)"</span><br><span> variant (pkt_ext_ta) "PRESENCE(pkt_ext_ta_present = '1'B)"</span><br><span> variant (compact_reduced_ma) "PRESENCE(compact_reduced_ma_present = '1'B)"</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ private type record PktDlAssR99EGPRS {</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* 11.2.29 Packet Uplink Assignment */</span><br><span> type record O_Gtfi {</span><br><span> BIT1 presence ('0'B),</span><br><span>diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn</span><br><span>index a217f46..5bdc17d 100644</span><br><span>--- a/library/RLCMAC_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_Templates.ttcn</span><br><span>@@ -504,13 +504,8 @@</span><br><span> pwr_ctrl := *,</span><br><span> tbf_starting_time_present := ?,</span><br><span> tbf_starting_time := *,</span><br><span style="color: hsl(0, 100%, 40%);">- release1999 := '1'B,</span><br><span style="color: hsl(0, 100%, 40%);">- sub_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- sub := *,</span><br><span style="color: hsl(0, 100%, 40%);">- pkt_ext_ta_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- pkt_ext_ta := *,</span><br><span style="color: hsl(0, 100%, 40%);">- compact_reduced_ma_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- compact_reduced_ma := *</span><br><span style="color: hsl(120, 100%, 40%);">+ spare := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ rel_additions := *</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/+/19364">change 19364</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/+/19364"/><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: I98efe66bf43853b580f38bed36487fa10a53298a </div>
<div style="display:none"> Gerrit-Change-Number: 19364 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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>