mac,phy: fixing pdcch order bug, do not process PDSCH if grant is pdcch order

master
yagoda 3 years ago committed by Andre Puschmann
parent 5181d07c8a
commit de8b7d6c48

@ -275,6 +275,9 @@ bool cc_worker::work_dl_regular()
// Set RNTI // Set RNTI
ue_dl_cfg.cfg.pdsch.rnti = dci_dl.rnti; ue_dl_cfg.cfg.pdsch.rnti = dci_dl.rnti;
} else {
ue_dl_cfg.cfg.pdsch.rnti = dci_dl.rnti;
ue_dl_cfg.cfg.pdsch.grant.tb[0].tbs = 0;
} }
// Generate MAC grant // Generate MAC grant
mac_interface_phy_lte::mac_grant_dl_t mac_grant = {}; mac_interface_phy_lte::mac_grant_dl_t mac_grant = {};

@ -433,6 +433,9 @@ void mac::new_grant_dl(uint32_t cc_idx,
action->tb[0].rv = grant.tb[0].rv; action->tb[0].rv = grant.tb[0].rv;
srsran_softbuffer_rx_reset_cb(&pch_softbuffer, 1); srsran_softbuffer_rx_reset_cb(&pch_softbuffer, 1);
} }
} else if (grant.is_pdcch_order) {
// if the grant is a PDCCH order then there is no associated PDSCH
action->tb[0].enabled = false;
} else if (!(grant.rnti == SRSRAN_SIRNTI && cc_idx != 0)) { } else if (!(grant.rnti == SRSRAN_SIRNTI && cc_idx != 0)) {
// If PDCCH for C-RNTI and RA procedure in Contention Resolution, notify it // If PDCCH for C-RNTI and RA procedure in Contention Resolution, notify it
if (grant.rnti == uernti.get_crnti() && ra_procedure.is_contention_resolution()) { if (grant.rnti == uernti.get_crnti() && ra_procedure.is_contention_resolution()) {

Loading…
Cancel
Save