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

fix cell ptr assignment

This commit is contained in:
Francisco Paisana 2020-04-29 18:23:10 +01:00 committed by Francisco Paisana
parent 5ef6031b44
commit 6f02c067b3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
srsenb/src/stack/rrc/rrc.cc
View File

@ -2711,11 +2711,17 @@ int rrc::ue::cqi_allocate(uint32_t period, uint32_t ue_cc_idx)
cell_res_list[ue_cc_idx].pucch_res = n_pucch;
cell_res_list[ue_cc_idx].prb_idx = i_min;
cell_res_list[ue_cc_idx].sf_idx = j_min;
const auto& l = parent->cell_ctxt_list;
uint32_t cell_id = get_ue_cc_cfg(UE_PCELL_CC_IDX)->cell_cfg.scell_list[ue_cc_idx].cell_id;
auto it = std::find_if(
l.begin(), l.end(), [cell_id](const std::unique_ptr<cell_ctxt_t>& c) { return c->cell_cfg.cell_id == cell_id; });
cell_res_list[ue_cc_idx].cell_common = it->get();
if (ue_cc_idx == UE_PCELL_CC_IDX) {
cell_res_list[ue_cc_idx].cell_common = get_ue_cc_cfg(UE_PCELL_CC_IDX);
} else {
const auto& l = parent->cell_ctxt_list;
uint32_t cell_id = get_ue_cc_cfg(UE_PCELL_CC_IDX)->cell_cfg.scell_list[ue_cc_idx - 1].cell_id;
// search for cell based on cell_id
auto it = std::find_if(l.begin(), l.end(), [cell_id](const std::unique_ptr<cell_ctxt_t>& c) {
return c->cell_cfg.cell_id == cell_id;
});
cell_res_list[ue_cc_idx].cell_common = it->get();
}
parent->rrc_log->info(
"Allocated CQI resources for ue_cc_idx=%d, time-frequency slot (%d, %d), n_pucch_2=%d, pmi_cfg_idx=%d\n",