From d4f22aaf314f0b15eb0806841112e9f2a8e6b62d Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sun, 10 May 2020 13:13:46 +0700 Subject: library: enrich tr_RLCMAC_DATA_RRBP, rename to tr_RLCMAC_DATA_GPRS Let's make this template more flexible, so it can be used to match any GPRS DL data blocks, not only those with rrbp_valid == true. Note that behavior of f_rx_rlcmac_dl_block_exp_data() is intentionally left unchanged, and will be fixed later. Change-Id: I3940216368cdbb58fe89420675d1d8d5f5e49b05 Signed-off-by: Vadim Yanitskiy --- library/RLCMAC_Templates.ttcn | 10 ++++++---- pcu/PCU_Tests.ttcn | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn index f2945ebd..675a0811 100644 --- a/library/RLCMAC_Templates.ttcn +++ b/library/RLCMAC_Templates.ttcn @@ -497,14 +497,16 @@ module RLCMAC_Templates { } } - template RlcmacDlBlock tr_RLCMAC_DATA_RRBP := { + template RlcmacDlBlock tr_RLCMAC_DATA_GPRS(template (present) boolean rrbp_valid := ?, + template (present) MacRrbp rrbp := ?, + template (present) uint3_t usf := ?) := { data := { mac_hdr := { mac_hdr := { payload_type := MAC_PT_RLC_DATA, - rrbp := ?, - rrbp_valid := true, - usf := ? + rrbp := rrbp, + rrbp_valid := rrbp_valid, + usf := usf }, hdr_ext := ? }, diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index eff20f73..3d194a99 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -686,7 +686,8 @@ runs on RAW_PCU_Test_CT { var PCUIF_Message pcu_msg; var uint32_t dl_fn; var boolean is_egprs := false; - var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP; + /* FIXME: for some reason, this template expects blocks with 'rrbp_valid' flag set */ + var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_GPRS(rrbp_valid := true); dl_template.data.blocks := ?; f_rx_rlcmac_dl_block(dl_block, dl_fn); -- cgit v1.2.3