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

sched,nr: fix SR PUCCH resource configuration

This commit is contained in:
Francisco Paisana 2021-09-22 17:09:53 +02:00 committed by Andre Puschmann
parent 37bdf53f42
commit 5a45767c73
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
srsenb/src/stack/rrc/rrc_nr.cc
View File

@ -661,8 +661,8 @@ int rrc_nr::ue::pack_secondary_cell_group_config_common(asn1::rrc_nr::cell_group
sr_res1.sched_request_res_id = 1; sr_res1.sched_request_res_id = 1;
sr_res1.sched_request_id = 0; sr_res1.sched_request_id = 0;
sr_res1.periodicity_and_offset_present = true; sr_res1.periodicity_and_offset_present = true;
sr_res1.periodicity_and_offset.set_sl40(); sr_res1.periodicity_and_offset.set_sl40() = 8;
sr_res1.res_present = true; sr_res1.res_present = true;
// DL data // DL data
ul_config.init_ul_bwp.pucch_cfg.setup().dl_data_to_ul_ack_present = true; ul_config.init_ul_bwp.pucch_cfg.setup().dl_data_to_ul_ack_present = true;
@ -704,8 +704,7 @@ int rrc_nr::ue::pack_secondary_cell_group_config_common(asn1::rrc_nr::cell_group
resource_big, ul_config.init_ul_bwp.pucch_cfg.setup().res_to_add_mod_list[1], 1)) { resource_big, ul_config.init_ul_bwp.pucch_cfg.setup().res_to_add_mod_list[1], 1)) {
parent->logger.warning("Failed to create >2 bit NR PUCCH resource"); parent->logger.warning("Failed to create >2 bit NR PUCCH resource");
} }
if (not srsran::make_phy_res_config( if (not srsran::make_phy_res_config(resource_sr, ul_config.init_ul_bwp.pucch_cfg.setup().res_to_add_mod_list[2], 2)) {
resource_big, ul_config.init_ul_bwp.pucch_cfg.setup().res_to_add_mod_list[2], 2)) {
parent->logger.warning("Failed to create SR NR PUCCH resource"); parent->logger.warning("Failed to create SR NR PUCCH resource");
} }
@ -1109,9 +1108,9 @@ int rrc_nr::ue::pack_secondary_cell_group_config_tdd(asn1::dyn_octstring& packed
// UL config dedicated // UL config dedicated
auto& ul_config = cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.ul_cfg; auto& ul_config = cell_group_cfg_pack.sp_cell_cfg.sp_cell_cfg_ded.ul_cfg;
// SR resources // SR resources
auto& sr_res1 = ul_config.init_ul_bwp.pucch_cfg.setup().sched_request_res_to_add_mod_list[0]; auto& sr_res1 = ul_config.init_ul_bwp.pucch_cfg.setup().sched_request_res_to_add_mod_list[0];
// SR resources // SR resources
sr_res1.periodicity_and_offset.sl40() = 7; sr_res1.periodicity_and_offset.sl40() = 8;
sr_res1.res_present = true; sr_res1.res_present = true;
sr_res1.res = 2; // PUCCH resource for SR sr_res1.res = 2; // PUCCH resource for SR