From 9d3485243a2fa93fc8f87698800738c7c33bcc12 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 1 Aug 2017 00:27:39 +0200 Subject: [PATCH] RLCMAC: Integrate encoding/decoding of Control Message Payload Rlcmac{Dl,Ul}CtrlBlock now contain Rlcmac{Dl,Ul}CtrlMsg rather than an octetstring payload. --- library/RLCMAC_Types.ttcn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 52aaef8a7..a03dd860f 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -3,6 +3,7 @@ module RLCMAC_Types { import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; + import from RLCMAC_CSN1_Types all; /* TS 44.060 10.4.7 */ type enumerated MacPayloadType { @@ -76,7 +77,7 @@ module RLCMAC_Types { type record RlcmacDlCtrlBlock { DlMacHeader mac_hdr, DlCtrlOptOctets opt optional, - octetstring payload + RlcmacDlCtrlMsg payload } with { variant (opt) "PRESENCE(mac_hdr.payload_type = MAC_PT_RLCMAC_OPT)" }; @@ -95,7 +96,7 @@ module RLCMAC_Types { /* TS 44.060 10.3.2 UplinkRLC/MAC control block */ type record RlcmacUlCtrlBlock { UlMacCtrlHeader mac_hdr, - octetstring payload + RlcmacUlCtrlMsg payload } with { variant "" }; external function enc_RlcmacUlCtrlBlock(in RlcmacUlCtrlBlock si) return octetstring