<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets<br><br>Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b<br>---<br>M bts/BTS_Tests.ttcn<br>M library/GSM_SystemInformation.ttcn<br>M sysinfo/gen_links.sh<br>3 files changed, 8 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 374228a..1ff0c61 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -322,7 +322,7 @@</span><br><span> },</span><br><span> cell_sel_par := ts_CellSelPar_default,</span><br><span> rach_control := ts_RachCtrl_default,</span><br><span style="color: hsl(0, 100%, 40%);">- rest_octets := enc_SI3RestOctets(valueof(ts_SI3RestOctets_def))</span><br><span style="color: hsl(120, 100%, 40%);">+ rest_octets := valueof(ts_SI3RestOctets_def)</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -347,7 +347,7 @@</span><br><span> rach_control := ts_RachCtrl_default,</span><br><span> cbch_chan_desc := omit,</span><br><span> cbch_mobile_alloc := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- rest_octets := enc_SI4RestOctets(valueof(ts_SI4RestOctets_def))</span><br><span style="color: hsl(120, 100%, 40%);">+ rest_octets := valueof(ts_SI4RestOctets_def)</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -5226,13 +5226,9 @@</span><br><span> var SystemInformation si := f_get_si(L1CTL, si_type);</span><br><span> </span><br><span> if (si_type == SYSTEM_INFORMATION_TYPE_3) {</span><br><span style="color: hsl(0, 100%, 40%);">- var RestOctets ro := si.payload.si3.rest_octets;</span><br><span style="color: hsl(0, 100%, 40%);">- var SI3RestOctets rest := dec_SI3RestOctets(ro);</span><br><span style="color: hsl(0, 100%, 40%);">- return rest.gprs_ind.presence == '1'B;</span><br><span style="color: hsl(120, 100%, 40%);">+ return si.payload.si3.rest_octets.gprs_ind.presence == '1'B;</span><br><span> } else if (si_type == SYSTEM_INFORMATION_TYPE_4) {</span><br><span style="color: hsl(0, 100%, 40%);">- var RestOctets ro := si.payload.si4.rest_octets;</span><br><span style="color: hsl(0, 100%, 40%);">- var SI4RestOctets rest := dec_SI4RestOctets(ro);</span><br><span style="color: hsl(0, 100%, 40%);">- return rest.gprs_ind.presence == '1'B;</span><br><span style="color: hsl(120, 100%, 40%);">+ return si.payload.si4.rest_octets.gprs_ind.presence == '1'B;</span><br><span> }</span><br><span> </span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unhandled SI type");</span><br><span>diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn</span><br><span>index 758ad1c..0639eef 100644</span><br><span>--- a/library/GSM_SystemInformation.ttcn</span><br><span>+++ b/library/GSM_SystemInformation.ttcn</span><br><span>@@ -15,6 +15,7 @@</span><br><span> import from General_Types all;</span><br><span> import from GSM_Types all;</span><br><span> import from GSM_RR_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from GSM_RestOctets all;</span><br><span> import from Osmocom_Types all;</span><br><span> </span><br><span> type union ArfcnOrMaio {</span><br><span>@@ -150,7 +151,7 @@</span><br><span> CellOptions cell_options,</span><br><span> CellSelectionParameters cell_sel_par,</span><br><span> RachControlParameters rach_control,</span><br><span style="color: hsl(0, 100%, 40%);">- RestOctets rest_octets length(0..4)</span><br><span style="color: hsl(120, 100%, 40%);">+ SI3RestOctets rest_octets</span><br><span> } with { variant "" };</span><br><span> </span><br><span> template SystemInformationType3 t_SI3 := {</span><br><span>@@ -171,7 +172,7 @@</span><br><span> RachControlParameters rach_control,</span><br><span> ChannelDescriptionTV cbch_chan_desc optional,</span><br><span> MobileAllocationT cbch_mobile_alloc optional,</span><br><span style="color: hsl(0, 100%, 40%);">- RestOctets rest_octets length(0..10) /* see 10.5.2.35 */</span><br><span style="color: hsl(120, 100%, 40%);">+ SI4RestOctets rest_octets /* see 10.5.2.35 */</span><br><span> } with { variant "TAG(cbch_chan_desc, iei = '64'O; cbch_mobile_alloc, iei = '72'O)" };</span><br><span> </span><br><span> /* 44.018 9.1.37 */</span><br><span>diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh</span><br><span>index 3526a29..0648e7b 100755</span><br><span>--- a/sysinfo/gen_links.sh</span><br><span>+++ b/sysinfo/gen_links.sh</span><br><span>@@ -25,7 +25,7 @@</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> DIR=../library</span><br><span style="color: hsl(0, 100%, 40%);">-FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn"</span><br><span style="color: hsl(120, 100%, 40%);">+FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn"</span><br><span> gen_links $DIR $FILES</span><br><span> </span><br><span> ignore_pp_results</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148">change 19148</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/+/19148"/><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: I3f00dd0b4863582fc5edf08149103150b8b5e97b </div>
<div style="display:none"> Gerrit-Change-Number: 19148 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>