From 216596340a01f52fab9fe3191550c91822eb4678 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 2 Dec 2019 19:12:08 +0100 Subject: [PATCH] pcu: Fix RLCMAC template naming There's also DL_ACK_NACK message for which a template will be introduced soon, so let's rename and fix typos/wrong descriptions to avoid confusion later. Change-Id: I4a2025ad282006953fcfadf429c980b77cb94371 --- library/RLCMAC_Types.ttcn | 6 +++--- pcu/PCU_Tests.ttcn | 2 +- pcu/PCU_Tests_RAW.ttcn | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index 359cb7434..b0dac35be 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -328,8 +328,8 @@ uint3_t usf) := { } } - /* Receive Template for Downlink ACK/NACK */ - template RlcmacDlBlock tr_RLCMAC_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { + /* Receive Template for Uplink ACK/NACK */ + template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { ctrl := { mac_hdr := { payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT), @@ -384,7 +384,7 @@ uint3_t usf) := { retry := retry } - /* Template for Uplink Conntrol ACK */ + /* Template for Uplink Control ACK */ template RlcmacUlBlock ts_RLCMAC_CTRL_ACK(GprsTlli tlli, CtrlAck ack := MS_RCVD_TWO_RLC_SAME_RTI_DIFF_RBSN) := { ctrl := { mac_hdr := t_RLCMAC_UlMacCtrlH(MAC_PT_RLCMAC_NO_OPT), diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 42880610e..1c2b2716e 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -358,7 +358,7 @@ function f_ul_tbf(inout UlTbfState us) runs on dummy_CT { } alt { - [] L1.receive(RLCMAC_ph_data_ind:{cs:=?, ts_nr:=?, fn:=?, block:=tr_RLCMAC_ACK_NACK(0, g_mmctx.tlli)}) -> value dl { + [] L1.receive(RLCMAC_ph_data_ind:{cs:=?, ts_nr:=?, fn:=?, block:=tr_RLCMAC_UL_ACK_NACK(0, g_mmctx.tlli)}) -> value dl { log("found matching ACK/NACK"); /* send CTRL ACK in uplink */ var GsmFrameNumber ul_fn := f_rrbp_fn(dl.fn, dl.block.ctrl.mac_hdr.rrbp); diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn index 24187b704..4a6f54aa0 100644 --- a/pcu/PCU_Tests_RAW.ttcn +++ b/pcu/PCU_Tests_RAW.ttcn @@ -738,7 +738,7 @@ runs on RAW_PCU_Test_CT { private function f_rx_rlcmac_dl_block_exp_ack_nack(out RlcmacDlBlock dl_block) runs on RAW_PCU_Test_CT { f_rx_rlcmac_dl_block(dl_block); - if (not match(dl_block, tr_RLCMAC_ACK_NACK(ul_tfi := ?, tlli := ?))) { + if (not match(dl_block, tr_RLCMAC_UL_ACK_NACK(ul_tfi := ?, tlli := ?))) { setverdict(fail, "Failed to match Packet Uplink ACK / NACK"); mtc.stop; }