From abb5d76fff13ce8bfba45b3ad71acbe422e29a3a Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Mon, 14 Sep 2020 15:19:01 +0200 Subject: HACKS --- library/GSM_RR_Types.ttcn | 15 ++++++++------- library/GSM_RestOctets.ttcn | 28 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index b7e02ec4..6c67c2e0 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -432,7 +432,7 @@ module GSM_RR_Types { BIT1 presence optional, BIT5 ext_ra optional } with { - variant (r99) "CSN.1 L/H" +// variant (r99) "CSN.1 L/H" variant (presence) "PRESENCE(r99 = '1'B)" /* H */ variant (ext_ra) "PRESENCE(presence = '1'B)" /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ @@ -535,9 +535,10 @@ module GSM_RR_Types { }; type record IaRestOctLL { BIT1 compressed_irat_ho_info_ind - } with { - variant (compressed_irat_ho_info_ind) "CSN.1 L/H" - }; + } + //with { +// variant (compressed_irat_ho_info_ind) "CSN.1 L/H" +// }; type record EgprsUlAssignDyn { uint5_t tfi_assignment, BIT1 polling, @@ -618,7 +619,7 @@ module GSM_RR_Types { IaRestOctHL hl optional, IaRestOctHH hh optional } with { - variant (presence) "CSN.1 L/H" +// variant (presence) "CSN.1 L/H" variant (ll) "PRESENCE(presence = '00'B)" variant (lh) "PRESENCE(presence = '01'B)" variant (hl) "PRESENCE(presence = '10'B)" @@ -739,7 +740,7 @@ module GSM_RR_Types { uint3_t rcc optional /* Addition in Rel-15: PEO IMM Cell Group Details struct */ } with { - variant (rel13_ind) "CSN.1 L/H" +// variant (rel13_ind) "CSN.1 L/H" variant (rcc) "PRESENCE(rel13_ind = '1'B)" /* The TITAN's RAW encoder generates an octet-aligned octetstring, @@ -752,7 +753,7 @@ module GSM_RR_Types { BIT1 presence, // L/H BIT5 ext_ra optional } with { - variant (presence) "CSN.1 L/H" +// variant (presence) "CSN.1 L/H" variant (ext_ra) "PRESENCE(presence = '1'B)" /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ variant (ext_ra) "BYTEORDER(last)" diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index d47e510f..a38d042b 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -208,7 +208,7 @@ private type record SI2quaterAdditions { BIT1 rel5_presence, // L/H SI2quaterR5Additions rel5 optional } with { - variant (rel5_presence) "CSN.1 L/H" +// variant (rel5_presence) "CSN.1 L/H" variant (rel5) "PRESENCE(rel5_presence = '1'B)" }; @@ -219,7 +219,7 @@ private type record SI2quaterR5Additions { BIT1 rel6_presence, // L/H SI2quaterR6Additions rel6 optional } with { - variant (rel6_presence) "CSN.1 L/H" +// variant (rel6_presence) "CSN.1 L/H" variant (rel6) "PRESENCE(rel6_presence = '1'B)" }; @@ -258,7 +258,7 @@ private type record SI2quaterR6Additions { BIT1 rel7_presence, // L/H SI2quaterR7Additions rel7 optional } with { - variant (rel7_presence) "CSN.1 L/H" +// variant (rel7_presence) "CSN.1 L/H" variant (rel7) "PRESENCE(rel7_presence = '1'B)" }; @@ -269,7 +269,7 @@ private type record SI2quaterR7Additions { BIT1 rel8_presence, // L/H SI2quaterR8Additions rel8 optional } with { - variant (rel8_presence) "CSN.1 L/H" +// variant (rel8_presence) "CSN.1 L/H" variant (rel8) "PRESENCE(rel8_presence = '1'B)" }; @@ -659,9 +659,9 @@ type record SI3RestOctets { SI21IndicatorOpt si21_ind optional /* ... spare padding ... */ } with { - variant (si_2ter_ind) "CSN.1 L/H" - variant (early_cm_ind) "CSN.1 L/H" - variant (umts_early_cm_ind) "CSN.1 L/H" +// variant (si_2ter_ind) "CSN.1 L/H" +// variant (early_cm_ind) "CSN.1 L/H" +// variant (umts_early_cm_ind) "CSN.1 L/H" /* If Iu mode is not supported in the cell, the Iu Indicator is not sent * within this cell. Iu Indicator is included if and only if GPRS is @@ -684,7 +684,7 @@ type record SI4RestOctets { /* TODO: optional "Rest Octets S" part */ bitstring s optional } with { - variant (s_presence) "CSN.1 L/H" +// variant (s_presence) "CSN.1 L/H" variant (s) "PRESENCE(s_presence = '1'B)" /* The TITAN's RAW encoder generates an octet-aligned octetstring, @@ -707,7 +707,7 @@ type record SelectionParamsOpt { BIT1 presence, // L/H SelectionParams params optional } with { - variant (presence) "CSN.1 L/H" +// variant (presence) "CSN.1 L/H" variant (params) "PRESENCE(presence = '1'B)" }; @@ -716,7 +716,7 @@ type record PowerOffsetOpt { BIT1 presence, // L/H uint2_t offset optional } with { - variant (presence) "CSN.1 L/H" +// variant (presence) "CSN.1 L/H" variant (offset) "PRESENCE(presence = '1'B)" }; @@ -725,7 +725,7 @@ type record SchedIfAndWhere { BIT1 presence, // L/H uint3_t where optional } with { - variant (presence) "CSN.1 L/H" +// variant (presence) "CSN.1 L/H" variant (where) "PRESENCE(presence = '1'B)" }; @@ -739,7 +739,7 @@ type record GPRSIndicatorOpt { BIT1 presence, // L/H GPRSIndicator ind optional } with { - variant (presence) "CSN.1 L/H" +// variant (presence) "CSN.1 L/H" variant (ind) "PRESENCE(presence = '1'B)" }; @@ -748,7 +748,7 @@ type record SI2quaterIndicatorOpt { BIT1 presence, // L/H BIT1 ind optional } with { - variant (presence) "CSN.1 L/H" +// variant (presence) "CSN.1 L/H" variant (ind) "PRESENCE(presence = '1'B)" }; @@ -757,7 +757,7 @@ type record SI21IndicatorOpt { BIT1 presence, // L/H BIT1 pos optional } with { - variant (presence) "CSN.1 L/H" +// variant (presence) "CSN.1 L/H" variant (pos) "PRESENCE(presence = '1'B)" }; -- cgit v1.2.3