<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18251">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move some types from GSM_RR_Types.ttcn to RLCMAC_CSN1_Types.ttcn<br><br>Some types already available in GSM_RR_Types.ttcn will also be required<br>by messages sent over PDCH and which belong to RLCMAC_CSN1_Types. Since<br>GSM_RR_Types.ttcn already requires RLCMAC_CSN1_Types.ttcn, let's move<br>them there so they can be used in both places.<br><br>Change-Id: Iccaaa2743dc44a36046c19d4d4ff882dc02fb479<br>---<br>M library/GSM_RR_Types.ttcn<br>M library/RLCMAC_CSN1_Types.ttcn<br>2 files changed, 56 insertions(+), 61 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/51/18251/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 dcf12ae..b09a760 100644</span><br><span>--- a/library/GSM_RR_Types.ttcn</span><br><span>+++ b/library/GSM_RR_Types.ttcn</span><br><span>@@ -512,67 +512,6 @@</span><br><span> } with {</span><br><span> variant (compressed_irat_ho_info_ind) "CSN.1 L/H"</span><br><span> };</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%);">- type record of AccessTechnologiesRequest</span><br><span style="color: hsl(0, 100%, 40%);">- AccessTechnologiesRequestRepetition</span><br><span style="color: hsl(0, 100%, 40%);">- with { variant "EXTENSION_BIT(reverse)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- type record AccessTechnologiesRequest</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- BIT4 accessTechnType,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT1 extensionBit</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "FIELDORDER(msb)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- type enumerated EgprsChCodingCommand {</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS1 ('0000'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS2 ('0001'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS3 ('0010'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS4 ('0011'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS5 ('0100'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS6 ('0101'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS7 ('0110'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS8 ('0111'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS9 ('1000'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS5_7 ('1001'B),</span><br><span style="color: hsl(0, 100%, 40%);">- CH_CODING_MCS6_9 ('1010'B)</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "FIELDLENGTH(4)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* TS 44.060 Table 12.5.2.1 */</span><br><span style="color: hsl(0, 100%, 40%);">- type enumerated EgprsWindowSize {</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_64 ('00000'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_96 ('00001'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_128 ('00010'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_160 ('00011'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_192 ('00100'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_224 ('00101'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_256 ('00110'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_288 ('00111'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_320 ('01000'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_352 ('01001'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_384 ('01010'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_416 ('01011'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_448 ('01100'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_480 ('01101'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_512 ('01110'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_544 ('01111'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_576 ('10000'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_608 ('10001'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_640 ('10010'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_672 ('10011'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_704 ('10100'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_736 ('10101'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_768 ('10110'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_800 ('10111'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_832 ('11000'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_864 ('11001'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_896 ('11010'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_928 ('11011'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_960 ('11100'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_992 ('11101'B),</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_WS_1024 ('11110'B)</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "FIELDLENGTH(5)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> type record EgprsUlAssignDyn {</span><br><span> uint5_t tfi_assignment,</span><br><span> BIT1 polling,</span><br><span>diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>index bca4351..447e52b 100644</span><br><span>--- a/library/RLCMAC_CSN1_Types.ttcn</span><br><span>+++ b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>@@ -56,6 +56,55 @@</span><br><span> MBMS_DL_ACK_NACK ('010000'B)</span><br><span> } with { variant "FIELDLENGTH(6)" };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ type enumerated EgprsChCodingCommand {</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS1 ('0000'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS2 ('0001'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS3 ('0010'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS4 ('0011'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS5 ('0100'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS6 ('0101'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS7 ('0110'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS8 ('0111'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS9 ('1000'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS5_7 ('1001'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ CH_CODING_MCS6_9 ('1010'B)</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "FIELDLENGTH(4)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TS 44.060 Table 12.5.2.1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ type enumerated EgprsWindowSize { /* This probably needs to be moved to RLCMAC_CSN1_Types.ttcn */</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_64 ('00000'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_96 ('00001'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_128 ('00010'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_160 ('00011'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_192 ('00100'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_224 ('00101'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_256 ('00110'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_288 ('00111'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_320 ('01000'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_352 ('01001'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_384 ('01010'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_416 ('01011'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_448 ('01100'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_480 ('01101'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_512 ('01110'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_544 ('01111'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_576 ('10000'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_608 ('10001'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_640 ('10010'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_672 ('10011'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_704 ('10100'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_736 ('10101'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_768 ('10110'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_800 ('10111'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_832 ('11000'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_864 ('11001'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_896 ('11010'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_928 ('11011'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_960 ('11100'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_992 ('11101'B),</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_WS_1024 ('11110'B)</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "FIELDLENGTH(5)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record NullGlobalTfi {</span><br><span> BIT1 presence ('0'B),</span><br><span> GlobalTfi global_tfi</span><br><span>@@ -184,6 +233,13 @@</span><br><span> variant (dyn_block_alloc) "PRESENCE(alloc_present = '01'B)"</span><br><span> variant (sgl_block_alloc) "PRESENCE(alloc_present = '10'B)"</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record of AccessTechnologiesRequest AccessTechnologiesRequestRepetition</span><br><span style="color: hsl(120, 100%, 40%);">+ with { variant "EXTENSION_BIT(reverse)" };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record AccessTechnologiesRequest</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT4 accessTechnType,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 extensionBit</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "FIELDORDER(msb)" };</span><br><span> type record PacketUlAssignment {</span><br><span> PageMode page_mode,</span><br><span> BIT1 persistence_levels_present,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18251">change 18251</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/+/18251"/><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: Iccaaa2743dc44a36046c19d4d4ff882dc02fb479 </div>
<div style="display:none"> Gerrit-Change-Number: 18251 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>