<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: Implement SystemInformation13 Rest Octets types<br><br>Change-Id: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/GSM_RestOctets.ttcn<br>M library/GSM_SystemInformation.ttcn<br>3 files changed, 41 insertions(+), 4 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/02/22802/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 52b4906..e2c17e6 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -165,8 +165,7 @@</span><br><span> SI2quaterRestOctetsList si2quater optional,</span><br><span> SystemInformationType3 si3 optional,</span><br><span> SystemInformationType4 si4 optional,</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: replace with proper decoding of SI13, implement SI13 in GSM_SystemInformation.ttcn */</span><br><span style="color: hsl(0, 100%, 40%);">- octetstring si13 optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ SystemInformationType13 si13 optional,</span><br><span> SystemInformationType5 si5 optional,</span><br><span> SystemInformationType5bis si5bis optional,</span><br><span> SystemInformationType5ter si5ter optional,</span><br><span>@@ -371,7 +370,9 @@</span><br><span> s := omit</span><br><span> }</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- si13 := '9000185A6FC9E08410AB2B2B2B2B2B2B2B2B2B2B'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ si13 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ rest_octets := '9000185A6FC9E08410AB2B2B2B2B2B2B2B2B2B2B'O</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> si5 := {</span><br><span> bcch_freq_list := '10000000000000000000000000000000'O</span><br><span> },</span><br><span>diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn</span><br><span>index d47e510..ec817eb 100644</span><br><span>--- a/library/GSM_RestOctets.ttcn</span><br><span>+++ b/library/GSM_RestOctets.ttcn</span><br><span>@@ -692,6 +692,30 @@</span><br><span> variant "PADDING(yes), PADDING_PATTERN('00101011'B)"</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* 10.5.2.37b SI 13 Rest Octets (O & S) */</span><br><span style="color: hsl(120, 100%, 40%);">+type record SI13RestOctets {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 presence, // L/H</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%);">+ SelectionParamsOpt sel_params,</span><br><span style="color: hsl(120, 100%, 40%);">+ PowerOffsetOpt pwr_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+ GPRSIndicatorOpt gprs_ind,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 s_presence, // L/H</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: optional "Rest Octets S" part */</span><br><span style="color: hsl(120, 100%, 40%);">+ bitstring s optional</span><br><span style="color: hsl(120, 100%, 40%);">+} with {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (presence) "CSN.1 L/H"</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%);">+ variant (s_presence) "CSN.1 L/H"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (s) "PRESENCE(s_presence = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The TITAN's RAW encoder generates an octet-aligned octetstring,</span><br><span style="color: hsl(120, 100%, 40%);">+ * so we should make sure that unused bits contain proper padding. */</span><br><span style="color: hsl(120, 100%, 40%);">+ variant "PADDING(yes), PADDING_PATTERN('00101011'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Selection Parameters */</span><br><span> type record SelectionParams {</span><br><span> boolean cbq,</span><br><span>@@ -777,6 +801,11 @@</span><br><span> external function dec_SI4RestOctets(in octetstring stream) return SI4RestOctets</span><br><span> with { extension "prototype(convert) decode(RAW)" };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+external function enc_SI13RestOctets(in SI13RestOctets ro) return octetstring</span><br><span style="color: hsl(120, 100%, 40%);">+ with { extension "prototype(convert) encode(RAW)" };</span><br><span style="color: hsl(120, 100%, 40%);">+external function dec_SI13RestOctets(in octetstring stream) return SI13RestOctets</span><br><span style="color: hsl(120, 100%, 40%);">+ with { extension "prototype(convert) decode(RAW)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* Basic templates to be extended in place */</span><br><span> template (value) SI3RestOctets ts_SI3RestOctets := {</span><br><span>diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn</span><br><span>index 85abb7f..86ff817 100644</span><br><span>--- a/library/GSM_SystemInformation.ttcn</span><br><span>+++ b/library/GSM_SystemInformation.ttcn</span><br><span>@@ -160,7 +160,7 @@</span><br><span> rach_control := ?,</span><br><span> rest_octets := ?</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* 44.018 9.1.36 */</span><br><span> type record SystemInformationType4 {</span><br><span>@@ -196,6 +196,11 @@</span><br><span> RestOctets rest_octets length(0..7)</span><br><span> } with { variant "" };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* 44.018 9.1.43a */</span><br><span style="color: hsl(120, 100%, 40%);">+ type record SystemInformationType13 {</span><br><span style="color: hsl(120, 100%, 40%);">+ SI13RestOctets rest_octets</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type union SystemInformationUnion {</span><br><span> SystemInformationType1 si1,</span><br><span> SystemInformationType2 si2,</span><br><span>@@ -208,6 +213,7 @@</span><br><span> SystemInformationType5bis si5bis,</span><br><span> SystemInformationType5ter si5ter,</span><br><span> SystemInformationType6 si6,</span><br><span style="color: hsl(120, 100%, 40%);">+ SystemInformationType13 si13,</span><br><span> octetstring other</span><br><span> } with { variant "" };</span><br><span> </span><br><span>@@ -225,6 +231,7 @@</span><br><span> si5bis, header.message_type = SYSTEM_INFORMATION_TYPE_5bis;</span><br><span> si5ter, header.message_type = SYSTEM_INFORMATION_TYPE_5ter;</span><br><span> si6, header.message_type = SYSTEM_INFORMATION_TYPE_6;</span><br><span style="color: hsl(120, 100%, 40%);">+ si13, header.message_type = SYSTEM_INFORMATION_TYPE_13;</span><br><span> other, OTHERWISE;</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/+/22802">change 22802</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/+/22802"/><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: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809 </div>
<div style="display:none"> Gerrit-Change-Number: 22802 </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>