From 01d8814f3998b7938499dfa4cb6bc11f6eb5a1cb Mon Sep 17 00:00:00 2001 From: Francisco Date: Thu, 14 Oct 2021 15:46:22 +0100 Subject: [PATCH] sched,nr: when sched allocates PUSCH, SR doesn't need to be decoded --- srsenb/src/stack/mac/nr/sched_nr_worker.cc | 4 ++++ test/phy/dummy_gnb_stack.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/srsenb/src/stack/mac/nr/sched_nr_worker.cc b/srsenb/src/stack/mac/nr/sched_nr_worker.cc index 0fd5d0f5e..ce992962c 100644 --- a/srsenb/src/stack/mac/nr/sched_nr_worker.cc +++ b/srsenb/src/stack/mac/nr/sched_nr_worker.cc @@ -167,6 +167,10 @@ void slot_cc_worker::postprocess_decisions() if (pusch.sch.grant.rnti == ue.rnti) { // Put UCI configuration in PUSCH config has_pusch = true; + + // If has PUSCH, no SR shall be received + uci_cfg.o_sr = 0; + if (not ue.cfg->phy().get_pusch_uci_cfg(slot_cfg, uci_cfg, pusch.sch)) { logger.error("Error setting UCI configuration in PUSCH"); continue; diff --git a/test/phy/dummy_gnb_stack.h b/test/phy/dummy_gnb_stack.h index c0f470b44..cbc88d002 100644 --- a/test/phy/dummy_gnb_stack.h +++ b/test/phy/dummy_gnb_stack.h @@ -570,6 +570,9 @@ public: // Schedule PUSCH if (has_pusch) { + // If has PUSCH, no SR shall be received + uci_cfg.o_sr = 0; + // Put UCI configuration in PUSCH config if (not phy_cfg.get_pusch_uci_cfg(slot_cfg, uci_cfg, pusch.sch)) { logger.error("Error setting UCI configuration in PUSCH");