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

fix phy configuration of UL 64QAM

This commit is contained in:
Francisco Paisana 2020-11-13 13:05:03 +00:00 committed by Andre Puschmann
parent b369d6d5d5
commit bc00abeeb8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1012,7 +1012,10 @@ void rrc::ue::apply_reconf_phy_config(const rrc_conn_recfg_r8_ies_s& reconfig_r8
if (rr_cfg_ded.phys_cfg_ded_present) {
auto& phys_cfg_ded = rr_cfg_ded.phys_cfg_ded;
srslte::set_phy_cfg_t_dedicated_cfg(&phy_rrc_dedicated_list[0].phy_cfg, phys_cfg_ded);
srslte::set_phy_cfg_t_enable_64qam(&phy_rrc_dedicated_list[0].phy_cfg, ue_capabilities.support_ul_64qam);
srslte::set_phy_cfg_t_enable_64qam(
&phy_rrc_dedicated_list[0].phy_cfg,
ue_capabilities.support_ul_64qam and
parent->cfg.sibs[1].sib2().rr_cfg_common.pusch_cfg_common.pusch_cfg_basic.enable64_qam);
}
}
@ -1045,8 +1048,10 @@ void rrc::ue::apply_reconf_phy_config(const rrc_conn_recfg_r8_ies_s& reconfig_r8
// Get corresponding eNB CC index
scell_phy_rrc_ded.enb_cc_idx = ue_cc->cell_common->enb_cc_idx;
srslte::set_phy_cfg_t_enable_64qam(&phy_rrc_dedicated_list[scell.scell_idx_r10].phy_cfg,
ue_capabilities.support_ul_64qam);
srslte::set_phy_cfg_t_enable_64qam(
&phy_rrc_dedicated_list[scell.scell_idx_r10].phy_cfg,
ue_capabilities.support_ul_64qam and
parent->cfg.sibs[1].sib2().rr_cfg_common.pusch_cfg_common.pusch_cfg_basic.enable64_qam);
// Append to PHY RRC config dedicated which will be applied further down
phy_rrc_dedicated_list[scell.scell_idx_r10] = scell_phy_rrc_ded;