sched,nr: when sched allocates PUSCH, SR doesn't need to be decoded

master
Francisco 3 years ago committed by Francisco Paisana
parent b034a9c983
commit 01d8814f39

@ -167,6 +167,10 @@ void slot_cc_worker::postprocess_decisions()
if (pusch.sch.grant.rnti == ue.rnti) { if (pusch.sch.grant.rnti == ue.rnti) {
// Put UCI configuration in PUSCH config // Put UCI configuration in PUSCH config
has_pusch = true; 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)) { if (not ue.cfg->phy().get_pusch_uci_cfg(slot_cfg, uci_cfg, pusch.sch)) {
logger.error("Error setting UCI configuration in PUSCH"); logger.error("Error setting UCI configuration in PUSCH");
continue; continue;

@ -570,6 +570,9 @@ public:
// Schedule PUSCH // Schedule PUSCH
if (has_pusch) { if (has_pusch) {
// If has PUSCH, no SR shall be received
uci_cfg.o_sr = 0;
// Put UCI configuration in PUSCH config // Put UCI configuration in PUSCH config
if (not phy_cfg.get_pusch_uci_cfg(slot_cfg, uci_cfg, pusch.sch)) { if (not phy_cfg.get_pusch_uci_cfg(slot_cfg, uci_cfg, pusch.sch)) {
logger.error("Error setting UCI configuration in PUSCH"); logger.error("Error setting UCI configuration in PUSCH");

Loading…
Cancel
Save