This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 ) Change subject: GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets ...................................................................... GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b --- M bts/BTS_Tests.ttcn M library/GSM_SystemInformation.ttcn M sysinfo/gen_links.sh 3 files changed, 8 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 374228a..1ff0c61 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -322,7 +322,7 @@ }, cell_sel_par := ts_CellSelPar_default, rach_control := ts_RachCtrl_default, - rest_octets := enc_SI3RestOctets(valueof(ts_SI3RestOctets_def)) + rest_octets := valueof(ts_SI3RestOctets_def) } } } @@ -347,7 +347,7 @@ rach_control := ts_RachCtrl_default, cbch_chan_desc := omit, cbch_mobile_alloc := omit, - rest_octets := enc_SI4RestOctets(valueof(ts_SI4RestOctets_def)) + rest_octets := valueof(ts_SI4RestOctets_def) } } } @@ -5226,13 +5226,9 @@ var SystemInformation si := f_get_si(L1CTL, si_type); if (si_type == SYSTEM_INFORMATION_TYPE_3) { - var RestOctets ro := si.payload.si3.rest_octets; - var SI3RestOctets rest := dec_SI3RestOctets(ro); - return rest.gprs_ind.presence == '1'B; + return si.payload.si3.rest_octets.gprs_ind.presence == '1'B; } else if (si_type == SYSTEM_INFORMATION_TYPE_4) { - var RestOctets ro := si.payload.si4.rest_octets; - var SI4RestOctets rest := dec_SI4RestOctets(ro); - return rest.gprs_ind.presence == '1'B; + return si.payload.si4.rest_octets.gprs_ind.presence == '1'B; } Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unhandled SI type"); diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index 758ad1c..0639eef 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -15,6 +15,7 @@ import from General_Types all; import from GSM_Types all; import from GSM_RR_Types all; + import from GSM_RestOctets all; import from Osmocom_Types all; type union ArfcnOrMaio { @@ -150,7 +151,7 @@ CellOptions cell_options, CellSelectionParameters cell_sel_par, RachControlParameters rach_control, - RestOctets rest_octets length(0..4) + SI3RestOctets rest_octets } with { variant "" }; template SystemInformationType3 t_SI3 := { @@ -171,7 +172,7 @@ RachControlParameters rach_control, ChannelDescriptionTV cbch_chan_desc optional, MobileAllocationT cbch_mobile_alloc optional, - RestOctets rest_octets length(0..10) /* see 10.5.2.35 */ + SI4RestOctets rest_octets /* see 10.5.2.35 */ } with { variant "TAG(cbch_chan_desc, iei = '64'O; cbch_mobile_alloc, iei = '72'O)" }; /* 44.018 9.1.37 */ diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index 3526a29..0648e7b 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -25,7 +25,7 @@ gen_links $DIR $FILES DIR=../library -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" +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" gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b Gerrit-Change-Number: 19148 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200706/9f342ec0/attachment.htm>