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

gnb: fix CSI-IM resource information in RRC recnofig for NSA

Browse Source 
amariue was complaining about CSI-IM resources allocated but
not present in resource config.

15:36:05.604 [RRC] -  0002  - DCCH: CellGroupConfig: ERROR: CSI-IM Set resource #0 not found in CSI Resource config #1

the patch simply removes the CSI-IM config.
master
Andre Puschmann 2 years ago committed by Justin Tallon
parent ec9812e72d
commit 7251d4dcd2
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File

29
srsgnb/src/stack/rrc/cell_asn1_config.cc
Unescape Escape View File

@ -419,25 +419,21 @@ void fill_nzp_csi_rs_from_enb_cfg(const rrc_nr_cfg_t& cfg, csi_meas_cfg_s& csi_m
void fill_csi_resource_cfg_to_add(const rrc_nr_cfg_t& cfg, csi_meas_cfg_s& csi_meas_cfg) void fill_csi_resource_cfg_to_add(const rrc_nr_cfg_t& cfg, csi_meas_cfg_s& csi_meas_cfg)
{ {
if (cfg.cell_list[0].duplex_mode == SRSRAN_DUPLEX_MODE_FDD) { if (cfg.cell_list[0].duplex_mode == SRSRAN_DUPLEX_MODE_FDD) {
csi_meas_cfg.csi_res_cfg_to_add_mod_list.resize(3); csi_meas_cfg.csi_res_cfg_to_add_mod_list.resize(2);
csi_meas_cfg.csi_res_cfg_to_add_mod_list[0].csi_res_cfg_id = 0; auto& res0 = csi_meas_cfg.csi_res_cfg_to_add_mod_list[0];
auto& nzp = csi_meas_cfg.csi_res_cfg_to_add_mod_list[0].csi_rs_res_set_list.set_nzp_csi_rs_ssb(); res0.csi_res_cfg_id = 0;
res0.bwp_id = 0;
res0.res_type.value = csi_res_cfg_s::res_type_opts::periodic;
auto& nzp = res0.csi_rs_res_set_list.set_nzp_csi_rs_ssb();
nzp.nzp_csi_rs_res_set_list.push_back(0); nzp.nzp_csi_rs_res_set_list.push_back(0);
csi_meas_cfg.csi_res_cfg_to_add_mod_list[0].bwp_id = 0;
csi_meas_cfg.csi_res_cfg_to_add_mod_list[0].res_type.value = csi_res_cfg_s::res_type_opts::periodic;
csi_meas_cfg.csi_res_cfg_to_add_mod_list[1].csi_res_cfg_id = 1; auto& res2 = csi_meas_cfg.csi_res_cfg_to_add_mod_list[1];
auto& im_res = csi_meas_cfg.csi_res_cfg_to_add_mod_list[1].csi_rs_res_set_list.set_csi_im_res_set_list(); res2.csi_res_cfg_id = 1;
im_res.push_back(0); res2.bwp_id = 0;
csi_meas_cfg.csi_res_cfg_to_add_mod_list[1].bwp_id = 0; res2.res_type.value = csi_res_cfg_s::res_type_opts::periodic;
csi_meas_cfg.csi_res_cfg_to_add_mod_list[1].res_type.value = csi_res_cfg_s::res_type_opts::periodic; auto& nzp2 = res2.csi_rs_res_set_list.set_nzp_csi_rs_ssb();
csi_meas_cfg.csi_res_cfg_to_add_mod_list[2].csi_res_cfg_id = 2;
auto& nzp2 = csi_meas_cfg.csi_res_cfg_to_add_mod_list[2].csi_rs_res_set_list.set_nzp_csi_rs_ssb();
nzp2.nzp_csi_rs_res_set_list.push_back(1); nzp2.nzp_csi_rs_res_set_list.push_back(1);
csi_meas_cfg.csi_res_cfg_to_add_mod_list[2].bwp_id = 0;
csi_meas_cfg.csi_res_cfg_to_add_mod_list[2].res_type.value = csi_res_cfg_s::res_type_opts::periodic;
} }
} }
@ -489,9 +485,6 @@ int fill_csi_meas_from_enb_cfg(const rrc_nr_cfg_t& cfg, csi_meas_cfg_s& csi_meas
fill_nzp_csi_rs_from_enb_cfg(cfg, csi_meas_cfg); fill_nzp_csi_rs_from_enb_cfg(cfg, csi_meas_cfg);
if (cfg.is_standalone) { if (cfg.is_standalone) {
// CSI IM config
fill_csi_im_resource_cfg_to_add(cfg, csi_meas_cfg);
// CSI report config // CSI report config
fill_csi_report_from_enb_cfg(cfg, csi_meas_cfg); fill_csi_report_from_enb_cfg(cfg, csi_meas_cfg);
} }

Write Preview
Loading…
Cancel
Save