From 10afbef4738c7536413b91e885786703f7790062 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Sun, 18 Feb 2024 18:14:09 +0100 Subject: [PATCH] reset nFAPI message count in PNF Reset the counters. In monolithic, this happens in the scheduler; in the PNF, without this change, it would trigger PDCCH again. Co-authored-by: hsum --- openair1/SCHED_NR/fapi_nr_l1.c | 2 -- openair1/SCHED_NR/phy_procedures_nr_gNB.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openair1/SCHED_NR/fapi_nr_l1.c b/openair1/SCHED_NR/fapi_nr_l1.c index d56897f0cf..949011a6f5 100644 --- a/openair1/SCHED_NR/fapi_nr_l1.c +++ b/openair1/SCHED_NR/fapi_nr_l1.c @@ -97,8 +97,6 @@ void nr_schedule_dl_tti_req(PHY_VARS_gNB *gNB, nfapi_nr_dl_tti_request_t *DL_req DevAssert(slot_type == NR_DOWNLINK_SLOT || slot_type == NR_MIXED_SLOT); processingData_L1tx_t *msgTx = gNB->msgDataTx; - msgTx->num_pdsch_slot = 0; - msgTx->num_dl_pdcch = 0; msgTx->slot = slot; msgTx->frame = frame; diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c index 052f42ce9c..9e1ec84d9c 100644 --- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c +++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c @@ -242,6 +242,8 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx, VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_gNB_PDCCH_TX,0); } + msgTx->num_dl_pdcch = 0; + msgTx->num_ul_pdcch = 0; if (msgTx->num_pdsch_slot > 0) { VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DLSCH,1); @@ -249,6 +251,7 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx, nr_generate_pdsch(msgTx, frame, slot); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DLSCH,0); } + msgTx->num_pdsch_slot = 0; for (int i = 0; i < NR_SYMBOLS_PER_SLOT; i++){ NR_gNB_CSIRS_t *csirs = &msgTx->csirs_pdu[i];