Added option for 256QAM in PHY config

master
Guillem Foreman 6 years ago
parent 46724c336d
commit ca6d9576c3

@ -1228,6 +1228,14 @@ void cc_worker::set_pcell_config(phy_interface_rrc_lte::phy_cfg_t* phy_cfg)
ue_dl_cfg.cfg.cqi_report.aperiodic_configured = true; ue_dl_cfg.cfg.cqi_report.aperiodic_configured = true;
ue_dl_cfg.cfg.cqi_report.aperiodic_mode = aperiodic_mode(dedicated->cqi_report_cfg.cqi_report_mode_aperiodic); ue_dl_cfg.cfg.cqi_report.aperiodic_mode = aperiodic_mode(dedicated->cqi_report_cfg.cqi_report_mode_aperiodic);
} }
if (dedicated->cqi_report_cfg_pcell_v1250_present) {
auto cqi_report_cfg_pcell_v1250 = dedicated->cqi_report_cfg_pcell_v1250.get();
if (cqi_report_cfg_pcell_v1250->alt_cqi_table_r12_present) {
ue_dl_cfg.pdsch_use_tbs_index_alt = true;
}
} else {
ue_dl_cfg.pdsch_use_tbs_index_alt = false;
}
if (pregen_enabled) { if (pregen_enabled) {
Info("Pre-generating UL signals...\n"); Info("Pre-generating UL signals...\n");

@ -2590,7 +2590,7 @@ void rrc::send_rrc_ue_cap_info()
for (uint32_t i = 0; i < args.nof_supported_bands; i++) { for (uint32_t i = 0; i < args.nof_supported_bands; i++) {
supported_band_eutra_v1250_s supported_band_eutra_v1250; supported_band_eutra_v1250_s supported_band_eutra_v1250;
// According to 3GPP 36.306 v12 Table 4.1A-1, 256QAM is supported for ue_category_dl 11-16 // According to 3GPP 36.306 v12 Table 4.1A-1, 256QAM is supported for ue_category_dl 11-16
supported_band_eutra_v1250.dl_minus256_qam_r12_present = false; supported_band_eutra_v1250.dl_minus256_qam_r12_present = true;
// According to 3GPP 36.331 v12 UE-EUTRA-Capability field descriptions // According to 3GPP 36.331 v12 UE-EUTRA-Capability field descriptions
// This field is only present when the field ue-CategoryUL is considered to 5 or 13. // This field is only present when the field ue-CategoryUL is considered to 5 or 13.
@ -2871,6 +2871,11 @@ void rrc::apply_phy_config_dedicated(const phys_cfg_ded_s& phy_cnfg)
current_cfg->pucch_cfg_ded = phy_cnfg.pucch_cfg_ded; current_cfg->pucch_cfg_ded = phy_cnfg.pucch_cfg_ded;
} }
if (phy_cnfg.cqi_report_cfg_pcell_v1250_present) {
current_cfg->cqi_report_cfg_pcell_v1250_present = true;
current_cfg->cqi_report_cfg_pcell_v1250 = phy_cnfg.cqi_report_cfg_pcell_v1250;
}
if (phy_cnfg.pucch_cfg_ded_v1020_present) { if (phy_cnfg.pucch_cfg_ded_v1020_present) {
current_cfg->pucch_cfg_ded_v1020_present = true; current_cfg->pucch_cfg_ded_v1020_present = true;
current_cfg->pucch_cfg_ded_v1020 = phy_cnfg.pucch_cfg_ded_v1020; current_cfg->pucch_cfg_ded_v1020 = phy_cnfg.pucch_cfg_ded_v1020;

Loading…
Cancel
Save