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

rrc,nr,gnb: disable CQI configuration in gNB until gNB PHY supports it

Browse Source
master
Francisco Paisana 3 years ago committed by Andre Puschmann
parent a64750e1be
commit 78dad52cc8
2 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File

77
srsenb/src/stack/rrc/rrc_nr.cc
Unescape Escape View File

@ -816,34 +816,37 @@ int rrc_nr::ue::pack_secondary_cell_group_config_common(asn1::rrc_nr::cell_group
cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg_present = true; cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg_present = true;
cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.set_setup(); cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.set_setup();
// CSI report config // NOTE: Disable CQI configuration until srsENB NR PHY supports it
cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list_present = true; // // CSI report config
cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list.resize(1); // cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list_present =
auto& csi_report = // true;
cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list[0]; // cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list.resize(1);
csi_report.report_cfg_id = 0; // auto& csi_report =
csi_report.res_for_ch_meas = 0; // cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list[0];
csi_report.csi_im_res_for_interference_present = true; // csi_report.report_cfg_id = 0;
csi_report.csi_im_res_for_interference = 1; // csi_report.res_for_ch_meas = 0;
csi_report.report_cfg_type.set_periodic(); // csi_report.csi_im_res_for_interference_present = true;
csi_report.report_cfg_type.periodic().report_slot_cfg.set_slots80(); // csi_report.csi_im_res_for_interference = 1;
csi_report.report_cfg_type.periodic().pucch_csi_res_list.resize(1); // csi_report.report_cfg_type.set_periodic();
csi_report.report_cfg_type.periodic().pucch_csi_res_list[0].ul_bw_part_id = 0; // csi_report.report_cfg_type.periodic().report_slot_cfg.set_slots80();
csi_report.report_cfg_type.periodic().pucch_csi_res_list[0].pucch_res = 1; // was 17 in orig PCAP // csi_report.report_cfg_type.periodic().pucch_csi_res_list.resize(1);
csi_report.report_quant.set_cri_ri_pmi_cqi(); // csi_report.report_cfg_type.periodic().pucch_csi_res_list[0].ul_bw_part_id = 0;
// Report freq config (optional) // csi_report.report_cfg_type.periodic().pucch_csi_res_list[0].pucch_res = 1; // was 17 in orig PCAP
csi_report.report_freq_cfg_present = true; // csi_report.report_quant.set_cri_ri_pmi_cqi();
csi_report.report_freq_cfg.cqi_format_ind_present = true; // // Report freq config (optional)
csi_report.report_freq_cfg.cqi_format_ind = // csi_report.report_freq_cfg_present = true;
asn1::rrc_nr::csi_report_cfg_s::report_freq_cfg_s_::cqi_format_ind_opts::wideband_cqi; // csi_report.report_freq_cfg.cqi_format_ind_present = true;
csi_report.time_restrict_for_ch_meass = asn1::rrc_nr::csi_report_cfg_s::time_restrict_for_ch_meass_opts::not_cfgured; // csi_report.report_freq_cfg.cqi_format_ind =
csi_report.time_restrict_for_interference_meass = // asn1::rrc_nr::csi_report_cfg_s::report_freq_cfg_s_::cqi_format_ind_opts::wideband_cqi;
asn1::rrc_nr::csi_report_cfg_s::time_restrict_for_interference_meass_opts::not_cfgured; // csi_report.time_restrict_for_ch_meass =
csi_report.group_based_beam_report.set_disabled(); // asn1::rrc_nr::csi_report_cfg_s::time_restrict_for_ch_meass_opts::not_cfgured;
// Skip CQI table (optional) // csi_report.time_restrict_for_interference_meass =
csi_report.cqi_table_present = true; // asn1::rrc_nr::csi_report_cfg_s::time_restrict_for_interference_meass_opts::not_cfgured;
csi_report.cqi_table = asn1::rrc_nr::csi_report_cfg_s::cqi_table_opts::table2; // csi_report.group_based_beam_report.set_disabled();
csi_report.subband_size = asn1::rrc_nr::csi_report_cfg_s::subband_size_opts::value1; // // Skip CQI table (optional)
// csi_report.cqi_table_present = true;
// csi_report.cqi_table = asn1::rrc_nr::csi_report_cfg_s::cqi_table_opts::table2;
// csi_report.subband_size = asn1::rrc_nr::csi_report_cfg_s::subband_size_opts::value1;
// Reconfig with Sync // Reconfig with Sync
cell_group_cfg_pack.sp_cell_cfg.recfg_with_sync_present = true; cell_group_cfg_pack.sp_cell_cfg.recfg_with_sync_present = true;
@ -1200,10 +1203,11 @@ int rrc_nr::ue::pack_secondary_cell_group_config_fdd(asn1::dyn_octstring& packed
// CSI resource config // CSI resource config
// TODO: add csi resource config // TODO: add csi resource config
// CSI report config // NOTE: Disable CQI configuration until srsENB NR PHY supports it
auto& csi_report = // // CSI report config
cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list[0]; // auto& csi_report =
csi_report.report_cfg_type.periodic().report_slot_cfg.slots80() = 5; // cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list[0];
// csi_report.report_cfg_type.periodic().report_slot_cfg.slots80() = 5;
// Reconfig with Sync // Reconfig with Sync
cell_group_cfg_pack.sp_cell_cfg.recfg_with_sync.sp_cell_cfg_common.ssb_subcarrier_spacing = cell_group_cfg_pack.sp_cell_cfg.recfg_with_sync.sp_cell_cfg_common.ssb_subcarrier_spacing =
@ -1300,10 +1304,11 @@ int rrc_nr::ue::pack_secondary_cell_group_config_tdd(asn1::dyn_octstring& packed
nzp_csi_res_set.nzp_csi_rs_res[0] = 0; nzp_csi_res_set.nzp_csi_rs_res[0] = 0;
// Skip TRS info // Skip TRS info
// CSI report config // NOTE: Disable CQI configuration until srsENB NR PHY supports it
auto& csi_report = // // CSI report config
cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list[0]; // auto& csi_report =
csi_report.report_cfg_type.periodic().report_slot_cfg.slots80() = 7; // cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg.setup().csi_report_cfg_to_add_mod_list[0];
// csi_report.report_cfg_type.periodic().report_slot_cfg.slots80() = 7;
// Reconfig with Sync // Reconfig with Sync
cell_group_cfg_pack.sp_cell_cfg.recfg_with_sync.smtc.release(); cell_group_cfg_pack.sp_cell_cfg.recfg_with_sync.smtc.release();

3
srsue/src/stack/rrc/rrc_nr.cc
Unescape Escape View File

@ -725,9 +725,6 @@ bool rrc_nr::apply_csi_meas_cfg(const asn1::rrc_nr::csi_meas_cfg_s& csi_meas_cfg
return false; return false;
} }
} }
} else {
logger.warning("Option csi_report_cfg_to_add_mod_list not present");
return false;
} }
if (csi_meas_cfg.nzp_csi_rs_res_to_add_mod_list_present) { if (csi_meas_cfg.nzp_csi_rs_res_to_add_mod_list_present) {

Write Preview
Loading…
Cancel
Save