From 3f5094f30ebd79f69eac8425f95c1af7446e7795 Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Thu, 15 Jul 2021 23:11:39 +0200 Subject: [PATCH] Remove confusing subband_size variable and replace with subband_wideband_ratio --- lib/include/srsran/phy/phch/cqi.h | 1 - lib/src/asn1/rrc_utils.cc | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/include/srsran/phy/phch/cqi.h b/lib/include/srsran/phy/phch/cqi.h index fb2d6b60b..3ae569e30 100644 --- a/lib/include/srsran/phy/phch/cqi.h +++ b/lib/include/srsran/phy/phch/cqi.h @@ -51,7 +51,6 @@ typedef struct { bool ri_idx_present; bool format_is_subband; uint8_t subband_wideband_ratio; ///< K value in TS 36.331. 0 for wideband reporting, (1..4) otherwise - uint32_t subband_size; srsran_cqi_report_mode_t periodic_mode; srsran_cqi_report_mode_t aperiodic_mode; } srsran_cqi_report_cfg_t; diff --git a/lib/src/asn1/rrc_utils.cc b/lib/src/asn1/rrc_utils.cc index 73524624b..3296ea37b 100644 --- a/lib/src/asn1/rrc_utils.cc +++ b/lib/src/asn1/rrc_utils.cc @@ -559,7 +559,8 @@ void set_phy_cfg_t_dedicated_cfg(phy_cfg_t* cfg, const asn1::rrc::phys_cfg_ded_s cqi_report_periodic.cqi_format_ind_periodic_r10.type().value == asn1::rrc::cqi_report_periodic_r10_c::setup_s_::cqi_format_ind_periodic_r10_c_::types::subband_cqi_r10; if (cfg->dl_cfg.cqi_report.format_is_subband) { - cfg->dl_cfg.cqi_report.subband_size = cqi_report_periodic.cqi_format_ind_periodic_r10.subband_cqi_r10().k; + cfg->dl_cfg.cqi_report.subband_wideband_ratio = + cqi_report_periodic.cqi_format_ind_periodic_r10.subband_cqi_r10().k; } if (cqi_report_periodic.ri_cfg_idx_present) { cfg->dl_cfg.cqi_report.ri_idx = cqi_report_periodic.ri_cfg_idx; @@ -586,7 +587,7 @@ void set_phy_cfg_t_dedicated_cfg(phy_cfg_t* cfg, const asn1::rrc::phys_cfg_ded_s asn1_type.cqi_report_cfg.cqi_report_periodic.setup().cqi_format_ind_periodic.type().value == asn1::rrc::cqi_report_periodic_c::setup_s_::cqi_format_ind_periodic_c_::types::subband_cqi; if (cfg->dl_cfg.cqi_report.format_is_subband) { - cfg->dl_cfg.cqi_report.subband_size = + cfg->dl_cfg.cqi_report.subband_wideband_ratio = asn1_type.cqi_report_cfg.cqi_report_periodic.setup().cqi_format_ind_periodic.subband_cqi().k; } if (asn1_type.cqi_report_cfg.cqi_report_periodic.setup().ri_cfg_idx_present) { @@ -862,7 +863,7 @@ void set_phy_cfg_t_scell_config(phy_cfg_t* cfg, const asn1::rrc::scell_to_add_mo cqi_cfg.cqi_format_ind_periodic_r10.type().value == cqi_cfg_t::cqi_format_ind_periodic_r10_c_::types::subband_cqi_r10; if (cfg->dl_cfg.cqi_report.format_is_subband) { - cfg->dl_cfg.cqi_report.subband_size = cqi_cfg.cqi_format_ind_periodic_r10.subband_cqi_r10().k; + cfg->dl_cfg.cqi_report.subband_wideband_ratio = cqi_cfg.cqi_format_ind_periodic_r10.subband_cqi_r10().k; } if (cqi_cfg.ri_cfg_idx_present) { cfg->dl_cfg.cqi_report.ri_idx = cqi_cfg.ri_cfg_idx;