RLCMAC: Integrate encoding/decoding of Control Message Payload

Rlcmac{Dl,Ul}CtrlBlock now contain Rlcmac{Dl,Ul}CtrlMsg rather
than an octetstring payload.
This commit is contained in:
Harald Welte 2017-08-01 00:27:39 +02:00
parent 422f072176
commit 9d3485243a
1 changed files with 3 additions and 2 deletions

View File

@ -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