PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ue,rrc_nr: fix SSB config warning 

first read freqInfoDL then try to build SSB config
This commit is contained in:
Andre Puschmann 2021-10-04 12:12:32 +02:00
parent f177a03605
commit ea21232f61
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
srsue/src/stack/rrc/rrc_nr.cc
View File

@ -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;