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

SRSENB: moved backwards compatibility enb conf check

This commit is contained in:
Xavier Arteaga 2020-01-24 13:23:37 +01:00 committed by Xavier Arteaga
parent c2b23d273b
commit c5dcc5e95b
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
srsenb/src/enb_cfg_parser.cc
View File

@ -650,6 +650,20 @@ int parse_rr(all_args_t* args_, rrc_cfg_t* rrc_cfg_)
p.add_section(&mac_cnfg);
p.add_section(&phy_cfg_);
p.add_section(&rrc_cnfg);
// If the cell list is empty, use default values from enb.conf to keep backwards compatibility
if (rrc_cfg_->cell_list.empty()) {
rrc_cfg_->cell_list.resize(1);
cell_cfg_t& cell_cfg = rrc_cfg_->cell_list[0];
cell_cfg.rf_port = 0;
cell_cfg.cell_id = 0;
cell_cfg.tac = args_->stack.s1ap.tac;
cell_cfg.pci = args_->enb.pci;
cell_cfg.root_seq_idx = rrc_cfg_->sibs[1].sib2().rr_cfg_common.prach_cfg.root_seq_idx;
cell_cfg.dl_earfcn = args_->enb.dl_earfcn;
cell_cfg.ul_earfcn = args_->enb.ul_earfcn;
}
return p.parse();
}
@ -733,19 +747,6 @@ static int parse_cell_list(all_args_t* args, rrc_cfg_t* rrc_cfg, Setting& root)
}
}
// If the cell list is empty, use default values from enb.conf to keep backwards compatibility
if (rrc_cfg->cell_list.empty()) {
rrc_cfg->cell_list.resize(1);
cell_cfg_t& cell_cfg = rrc_cfg->cell_list[0];
cell_cfg.rf_port = 0;
cell_cfg.cell_id = 0;
cell_cfg.tac = args->stack.s1ap.tac;
cell_cfg.pci = args->enb.pci;
cell_cfg.root_seq_idx = rrc_cfg->sibs[1].sib2().rr_cfg_common.prach_cfg.root_seq_idx;
cell_cfg.dl_earfcn = args->enb.dl_earfcn;
cell_cfg.ul_earfcn = args->enb.ul_earfcn;
}
// Configuration check
for (auto it = rrc_cfg->cell_list.begin(); it != rrc_cfg->cell_list.end(); it++) {
for (auto it2 = it + 1; it2 != rrc_cfg->cell_list.end(); it2++) {