From ea21232f619845b6f7a148b37c5d67c0e3b6e7ae Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Mon, 4 Oct 2021 12:12:32 +0200 Subject: [PATCH] ue,rrc_nr: fix SSB config warning first read freqInfoDL then try to build SSB config --- srsue/src/stack/rrc/rrc_nr.cc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srsue/src/stack/rrc/rrc_nr.cc b/srsue/src/stack/rrc/rrc_nr.cc index a9c7a4856..493333d73 100644 --- a/srsue/src/stack/rrc/rrc_nr.cc +++ b/srsue/src/stack/rrc/rrc_nr.cc @@ -1162,13 +1162,7 @@ bool rrc_nr::apply_sp_cell_cfg(const sp_cell_cfg_s& sp_cell_cfg) logger.warning("Secondary primary cell ul cfg common not present"); return false; } - phy_cfg_nr_t::ssb_cfg_t ssb_cfg = {}; - if (make_phy_ssb_cfg(phy_cfg.carrier, recfg_with_sync.sp_cell_cfg_common, &ssb_cfg) == true) { - phy_cfg.ssb = ssb_cfg; - } else { - logger.warning("Warning while building SSB config structure"); - return false; - } + // Read essential DL carrier settings if (recfg_with_sync.sp_cell_cfg_common.dl_cfg_common_present) { if (apply_dl_common_cfg(recfg_with_sync.sp_cell_cfg_common.dl_cfg_common) == false) { return false; @@ -1177,6 +1171,14 @@ bool rrc_nr::apply_sp_cell_cfg(const sp_cell_cfg_s& sp_cell_cfg) logger.warning("DL cfg common not present"); return false; } + // Build SSB config + phy_cfg_nr_t::ssb_cfg_t ssb_cfg = {}; + if (make_phy_ssb_cfg(phy_cfg.carrier, recfg_with_sync.sp_cell_cfg_common, &ssb_cfg) == true) { + phy_cfg.ssb = ssb_cfg; + } else { + logger.warning("Warning while building SSB config structure"); + return false; + } if (recfg_with_sync.sp_cell_cfg_common.tdd_ul_dl_cfg_common_present) { logger.info("TDD UL DL config present, using TDD"); srsran_duplex_config_nr_t duplex;