<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20104">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move some key types from GSM_RR_Types to GSM_Types<br><br>This in turn means Osmocom_Gb_Types doesn't need to depend on<br>GSM_RR_Types anymore, which is particularly ugly as the latter<br>now depends on RLCMAC_*, creating a long chain of dependencies.<br><br>Change-Id: I8c8da7709695ff0023f71b3999291e2515b22e46<br>---<br>M library/GSM_RR_Types.ttcn<br>M library/GSM_Types.ttcn<br>M library/Osmocom_Gb_Types.ttcn<br>3 files changed, 21 insertions(+), 21 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/04/20104/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 2cb50bc..b7e02ec 100644</span><br><span>--- a/library/GSM_RR_Types.ttcn</span><br><span>+++ b/library/GSM_RR_Types.ttcn</span><br><span>@@ -135,8 +135,6 @@</span><br><span> } with { variant "FIELDLENGTH(8)" };</span><br><span> </span><br><span> type octetstring RestOctets with { variant "PADDING(yes), PADDING_PATTERN('00101011'B)" };</span><br><span style="color: hsl(0, 100%, 40%);">- type hexstring GsmBcdString with { variant "HEXORDER(low)" };</span><br><span style="color: hsl(0, 100%, 40%);">- type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" };</span><br><span> </span><br><span> type record L2PseudoLength {</span><br><span> uint6_t l2_plen,</span><br><span>@@ -219,18 +217,9 @@</span><br><span> hsn := hsn</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* TS 24.008 10.5.1.1 */</span><br><span style="color: hsl(0, 100%, 40%);">- type uint16_t CellIdentity;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* TS 24.008 10.5.1.2 */</span><br><span> type uint4_t CipheringKeySeqNr (0..7);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 24.008 10.5.1.3 */</span><br><span style="color: hsl(0, 100%, 40%);">- type record LocationAreaIdentification {</span><br><span style="color: hsl(0, 100%, 40%);">- BcdMccMnc mcc_mnc,</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t lac</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* TS 24.008 10.5.1.4 */</span><br><span> type enumerated MobileIdentityType {</span><br><span> MI_TYPE_NONE (0),</span><br><span>@@ -424,15 +413,6 @@</span><br><span> uint3_t non_drx_timer</span><br><span> } with { variant "" };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 24.008 10.5.5.15 */</span><br><span style="color: hsl(0, 100%, 40%);">- type record RoutingAreaIdentification {</span><br><span style="color: hsl(0, 100%, 40%);">- LocationAreaIdentification lai,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rac</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- external function enc_RoutingAreaIdentification(RoutingAreaIdentification rai) return octetstring</span><br><span style="color: hsl(0, 100%, 40%);">- with { extension "prototype(convert)" extension "encode(RAW)" }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* 44.018 10.5.2.16 */</span><br><span> type record IaRestOctHL {</span><br><span> uint6_t freq_par_len,</span><br><span>diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn</span><br><span>index 5340fee..ee6635b 100644</span><br><span>--- a/library/GSM_Types.ttcn</span><br><span>+++ b/library/GSM_Types.ttcn</span><br><span>@@ -356,5 +356,26 @@</span><br><span> return (fn / 51) mod 8;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type hexstring GsmBcdString with { variant "HEXORDER(low)" };</span><br><span style="color: hsl(120, 100%, 40%);">+type GsmBcdString BcdMccMnc with { variant "FIELDLENGTH(6)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* 24.008 10.5.1.3 */</span><br><span style="color: hsl(120, 100%, 40%);">+type record LocationAreaIdentification {</span><br><span style="color: hsl(120, 100%, 40%);">+ BcdMccMnc mcc_mnc,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t lac</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* 24.008 10.5.5.15 */</span><br><span style="color: hsl(120, 100%, 40%);">+type record RoutingAreaIdentification {</span><br><span style="color: hsl(120, 100%, 40%);">+ LocationAreaIdentification lai,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rac</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+external function enc_RoutingAreaIdentification(RoutingAreaIdentification rai) return octetstring</span><br><span style="color: hsl(120, 100%, 40%);">+with { extension "prototype(convert)" extension "encode(RAW)" }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* TS 24.008 10.5.1.1 */</span><br><span style="color: hsl(120, 100%, 40%);">+type uint16_t CellIdentity;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> } with { encode "RAW"; variant "FIELDORDER(msb)" }</span><br><span>diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn</span><br><span>index 7ddaada..c5b0953 100644</span><br><span>--- a/library/Osmocom_Gb_Types.ttcn</span><br><span>+++ b/library/Osmocom_Gb_Types.ttcn</span><br><span>@@ -6,7 +6,6 @@</span><br><span> import from General_Types all;</span><br><span> import from Osmocom_Types all;</span><br><span> import from GSM_Types all;</span><br><span style="color: hsl(0, 100%, 40%);">- import from GSM_RR_Types all;</span><br><span> import from BSSGP_Types all</span><br><span> import from NS_Types all</span><br><span> import from Native_Functions all;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20104">change 20104</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/+/20104"/><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: I8c8da7709695ff0023f71b3999291e2515b22e46 </div>
<div style="display:none"> Gerrit-Change-Number: 20104 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>