From 2ecdab87175acda3b1b26a75bda5dfc45c89f1c8 Mon Sep 17 00:00:00 2001 From: yagoda Date: Thu, 11 Feb 2021 11:49:33 +0100 Subject: [PATCH] small fixes to the eMBMS downlink, lack of pdcch decoding was causing issues with uplink --- srsue/src/phy/lte/cc_worker.cc | 7 ++++++- srsue/src/phy/lte/sf_worker.cc | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/srsue/src/phy/lte/cc_worker.cc b/srsue/src/phy/lte/cc_worker.cc index 5b845ed62..649d58d91 100644 --- a/srsue/src/phy/lte/cc_worker.cc +++ b/srsue/src/phy/lte/cc_worker.cc @@ -319,7 +319,12 @@ bool cc_worker::work_dl_mbsfn(srslte_mbsfn_cfg_t mbsfn_cfg) return false; } - decode_pdcch_ul(); + // Look for DL and UL dci(s) if the serving cell is active and it is NOT a secondary serving cell without + // cross-carrier scheduling is enabled + if (phy->cell_state.is_active(cc_idx, sf_cfg_dl.tti) and (cc_idx != 0 or not ue_dl_cfg.cfg.dci.cif_present)) { + decode_pdcch_dl(); + decode_pdcch_ul(); + } if (mbsfn_cfg.enable) { srslte_configure_pmch(&pmch_cfg, &cell, &mbsfn_cfg); diff --git a/srsue/src/phy/lte/sf_worker.cc b/srsue/src/phy/lte/sf_worker.cc index 9ccfc61b8..78c8f2f50 100644 --- a/srsue/src/phy/lte/sf_worker.cc +++ b/srsue/src/phy/lte/sf_worker.cc @@ -179,7 +179,8 @@ void sf_worker::work_imp() ZERO_OBJECT(mbsfn_cfg); if (carrier_idx == 0 && phy->is_mbsfn_sf(&mbsfn_cfg, tti)) { - cc_workers[0]->work_dl_mbsfn(mbsfn_cfg); // Don't do chest_ok in mbsfn since it trigger measurements + rx_signal_ok = + cc_workers[0]->work_dl_mbsfn(mbsfn_cfg); // Don't do chest_ok in mbsfn since it trigger measurements } else { if (phy->cell_state.is_configured(carrier_idx)) { rx_signal_ok = cc_workers[carrier_idx]->work_dl_regular();