<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22802">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Implement SystemInformation13 Rest Octets types<br><br>Related: SYS#5358<br>Change-Id: Id8845ebe28a9a6ed79d2d408dc7c1ad8a275b809<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/GSM_RestOctets.ttcn<br>M library/GSM_SystemInformation.ttcn<br>M library/RLCMAC_CSN1_Types.ttcn<br>4 files changed, 134 insertions(+), 6 deletions(-)<br><br></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..dc94b74 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,44 @@</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 := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ bcch_change_mark := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ si_change_field := '0000'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ presence2 := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ si13_change_mark := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ma := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ zero := '0'B, /* PBCCH not present in cell */</span><br><span style="color: hsl(120, 100%, 40%);">+ rac := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ spgc_ccch_sup := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ priority_access_thr := '110'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ network_control_order := '00'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_cell_opts := {</span><br><span style="color: hsl(120, 100%, 40%);">+ nmo := '01'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ t3168 := '011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ t3192 := '010'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ drx_timer_max := '011'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ access_burst_type := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ control_ack_type := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ bs_cv_max := 15,</span><br><span style="color: hsl(120, 100%, 40%);">+ pan_presence := '1'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ pan_dec := 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ pan_inc := 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ pan_max := '111'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ ext_info_presence := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ ext_info_length := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ ext_info := *</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_pwr_ctrl_params := {</span><br><span style="color: hsl(120, 100%, 40%);">+ alpha := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ t_avg_w := '10000'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ t_avg_t := '10000'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ pc_meas_chan := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ n_avg_i := '1000'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%);">+ },</span><br><span> si5 := {</span><br><span> bcch_freq_list := '10000000000000000000000000000000'O</span><br><span> },</span><br><span>@@ -480,7 +516,7 @@</span><br><span> if (not isbound(data)) {</span><br><span> si.si13 := omit;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- si.si13 := dec_SystemInformation(data).payload.other;</span><br><span style="color: hsl(120, 100%, 40%);">+ si.si13 := dec_SystemInformation(data).payload.si13;</span><br><span> }</span><br><span> } else {</span><br><span> handled := false;</span><br><span>diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn</span><br><span>index d47e510..9aa1217 100644</span><br><span>--- a/library/GSM_RestOctets.ttcn</span><br><span>+++ b/library/GSM_RestOctets.ttcn</span><br><span>@@ -15,6 +15,7 @@</span><br><span> </span><br><span> import from General_Types all;</span><br><span> import from Osmocom_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from RLCMAC_CSN1_Types all;</span><br><span> </span><br><span> /* 10.5.2.33b SI 2quater Rest Octets */</span><br><span> type record SI2quaterRestOctets {</span><br><span>@@ -692,6 +693,34 @@</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%);">+ uint3_t bcch_change_mark,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT4 si_change_field,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 presence2,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT2 si13_change_mark optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMobileAllocation gprs_ma optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 zero ('0'B), /* PBCCH not present in cell */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rac,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 spgc_ccch_sup,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT3 priority_access_thr,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT2 network_control_order,</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsCellOptions gprs_cell_opts,</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsPowerControlParameters gprs_pwr_ctrl_params</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: Additions in release 99 */</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%);">+ /* TODO: for all fields after presencte: variant (<field>) "PRESENCE(presence = '1'B)" */</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (si13_change_mark) "PRESENCE(presence2 = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (gprs_ma) "PRESENCE(presence2 = '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 +806,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..0356e7d 100644</span><br><span>--- a/library/GSM_SystemInformation.ttcn</span><br><span>+++ b/library/GSM_SystemInformation.ttcn</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>diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>index af8b8d6..0dd8a8b 100644</span><br><span>--- a/library/RLCMAC_CSN1_Types.ttcn</span><br><span>+++ b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>@@ -929,7 +929,7 @@</span><br><span> };</span><br><span> type record FreqDirect1 {</span><br><span> uint6_t maio,</span><br><span style="color: hsl(0, 100%, 40%);">- GprsMobileAllication mobile_allocation</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMobileAllocation mobile_allocation</span><br><span> }</span><br><span> type record FreqDirect2 {</span><br><span> uint6_t maio,</span><br><span>@@ -953,6 +953,15 @@</span><br><span> variant (direct2) "PRESENCE(presence = '11'B)"</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* 12.9a GPRS Power Control Parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ type record GprsPowerControlParameters {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint4_t alpha,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT5 t_avg_w,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT5 t_avg_t,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 pc_meas_chan,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT4 n_avg_i</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* 12.10 Global TFI */</span><br><span> type record GlobalTfi {</span><br><span> boolean is_dl_tfi,</span><br><span>@@ -967,7 +976,7 @@</span><br><span> } with {</span><br><span> variant (rfl_number_list) "PRESENCE(presence = '1'B)"</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- type record GprsMobileAllication {</span><br><span style="color: hsl(120, 100%, 40%);">+ type record GprsMobileAllocation {</span><br><span> uint6_t hsn,</span><br><span> BIT1 rfl_number_list_present,</span><br><span> RflNumberList rfl_number_list optional,</span><br><span>@@ -1036,6 +1045,48 @@</span><br><span> variant (relative_k) "PRESENCE(presence = '1'B)"</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* 12.24 GPRS Cell Options */</span><br><span style="color: hsl(120, 100%, 40%);">+ type record ExtensionInformation {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 egprs_supported,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 egprs_pkt_channel_req optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT4 bep_period optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 pfc_feature_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 dtm_support,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 bss_paging_coordination,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* REL-4 extension */</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 ccn_active optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 nw_ext_utbf optional</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: REL-6 extension */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: REL-7 extension */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: REL-10 extension */</span><br><span style="color: hsl(120, 100%, 40%);">+ } with {</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (egprs_pkt_channel_req) "PRESENCE(egprs_supported = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (bep_period) "PRESENCE(egprs_supported = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record GprsCellOptions {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT2 nmo,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT3 t3168,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT3 t3192,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT3 drx_timer_max,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 access_burst_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 control_ack_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint4_t bs_cv_max,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 pan_presence,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint3_t pan_dec optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint3_t pan_inc optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT3 pan_max optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 ext_info_presence,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT6 ext_info_length optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ ExtensionInformation ext_info optional</span><br><span style="color: hsl(120, 100%, 40%);">+ } with {</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (pan_dec) "PRESENCE(pan_presence = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (pan_inc) "PRESENCE(pan_presence = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (pan_max) "PRESENCE(pan_presence = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (ext_info_length) "PRESENCE(ext_info_presence = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ variant (ext_info) "PRESENCE(ext_info_presence = '1'B)"</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: mark REL-4 and upwards in ext_info as omit based on ext_info_length ? */</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* 3GPP TS 44.060, table 11.2.5a.2 "EGPRS PACKET CHANNEL REQUEST" */</span><br><span> type union EGPRSPktChRequest {</span><br><span> EGPRSPktChRequest_MC5P2RB3 one_phase,</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: 3 </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: daniel <dwillmann@sysmocom.de> </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: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>