From 3c74a1113a0a9936bc630b81249a6c4921f73c93 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sun, 3 May 2020 22:16:09 +0700 Subject: library: get rid of Si1RestOctets and Si3RestOctets Both are basically sub-types of GSM_RR_Types.RestOctets with length constraints. We don't really need to have them as separate symbols, especially since we have SI3RestOctets and SI4RestOctets now, so let's apply these constraints within the corresponding records. Change-Id: I2b126348ae5c5425fea4267ab2b77ea0192795ac Signed-off-by: Vadim Yanitskiy --- library/GSM_SystemInformation.ttcn | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn index f1918c96..a4688cd6 100644 --- a/library/GSM_SystemInformation.ttcn +++ b/library/GSM_SystemInformation.ttcn @@ -115,16 +115,14 @@ module GSM_SystemInformation { AccessControlClass acc } with { variant (acc) "FIELDLENGTH(16)" }; - /* 44.018 10.5.2.32 */ - type RestOctets Si1RestOctets with { variant "FIELDLENGTH(1)" }; - type RestOctets Si3RestOctets with { variant "FIELDLENGTH(4)" }; - /* 44.018 9.1.31 */ type record SystemInformationType1 { CellChannelDescription cell_chan_desc, RachControlParameters rach_control, - Si1RestOctets rest_octets - } with { variant "" }; + RestOctets rest_octets + } with { + variant (rest_octets) "FIELDLENGTH(1)" + }; /* 44.018 9.1.32 */ type record SystemInformationType2 { @@ -154,8 +152,10 @@ module GSM_SystemInformation { CellOptions cell_options, CellSelectionParameters cell_sel_par, RachControlParameters rach_control, - Si3RestOctets rest_octets - } with { variant "" }; + RestOctets rest_octets + } with { + variant (rest_octets) "FIELDLENGTH(4)" + }; template SystemInformationType3 t_SI3 := { cell_id := ?, -- cgit v1.2.3