5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix cell ptr assignment

Browse Source
master
Francisco Paisana 5 years ago 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

16
srsenb/src/stack/rrc/rrc.cc
Unescape Escape 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].pucch_res = n_pucch;
cell_res_list[ue_cc_idx].prb_idx = i_min; cell_res_list[ue_cc_idx].prb_idx = i_min;
cell_res_list[ue_cc_idx].sf_idx = j_min; cell_res_list[ue_cc_idx].sf_idx = j_min;
const auto& l = parent->cell_ctxt_list; if (ue_cc_idx == UE_PCELL_CC_IDX) {
uint32_t cell_id = get_ue_cc_cfg(UE_PCELL_CC_IDX)->cell_cfg.scell_list[ue_cc_idx].cell_id; cell_res_list[ue_cc_idx].cell_common = get_ue_cc_cfg(UE_PCELL_CC_IDX);
auto it = std::find_if( } else {
l.begin(), l.end(), [cell_id](const std::unique_ptr<cell_ctxt_t>& c) { return c->cell_cfg.cell_id == cell_id; }); const auto& l = parent->cell_ctxt_list;
cell_res_list[ue_cc_idx].cell_common = it->get(); 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( 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", "Allocated CQI resources for ue_cc_idx=%d, time-frequency slot (%d, %d), n_pucch_2=%d, pmi_cfg_idx=%d\n",

Write Preview
Loading…
Cancel
Save