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

SRSUE: Deafult PUCCH/SRS does not imply full PHY dedicated defaults

This commit is contained in:
Xavier Arteaga 2020-10-06 18:19:13 +02:00 committed by Xavier Arteaga
parent 9105b36cee
commit 6ae47b6510
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/include/srslte/interfaces/rrc_interface_types.h
View File

@ -192,6 +192,18 @@ struct phy_cfg_t {
set_defaults_dedicated();
}
// 36.331 9.2.4 for CQI-ReportConfig, soundingRS-UL-ConfigDedicated and schedulingRequestConfig
void set_defaults_pucch_sr()
{
dl_cfg.cqi_report.periodic_configured = false;
dl_cfg.cqi_report.aperiodic_configured = false;
ul_cfg.srs.dedicated_enabled = false;
ul_cfg.srs.configured = false;
ul_cfg.pucch.sr_configured = false;
}
// 36.331 9.2.4
void set_defaults_dedicated()
{
@ -200,9 +212,6 @@ struct phy_cfg_t {
dl_cfg.pdsch.use_tbs_index_alt = false;
dl_cfg.pdsch.p_a = 0;
dl_cfg.cqi_report.periodic_configured = false;
dl_cfg.cqi_report.aperiodic_configured = false;
ul_cfg.pucch.tdd_ack_multiplex = false;
ul_cfg.pusch.uci_offset.I_offset_ack = 10;
@ -215,10 +224,7 @@ struct phy_cfg_t {
ul_cfg.power_ctrl.p0_nominal_pucch = 0;
ul_cfg.power_ctrl.p_srs_offset = 7;
ul_cfg.srs.dedicated_enabled = false;
ul_cfg.srs.configured = false;
ul_cfg.pucch.sr_configured = false;
set_defaults_pucch_sr();
}
srslte_dl_cfg_t dl_cfg = {};

2
srsue/hdr/stack/rrc/phy_controller.h
View File

@ -65,7 +65,7 @@ public:
void out_sync() { trigger(out_sync_ev{}); }
bool set_cell_config(const srslte::phy_cfg_t& config, uint32_t cc_idx = 0);
void set_phy_to_default();
void set_phy_to_default_dedicated();
void set_phy_to_default_pucch_srs();
void set_config_complete();
// state getters

1
srsue/hdr/stack/rrc/rrc.h
View File

@ -387,7 +387,6 @@ private:
// Helpers for setting default values
void set_phy_default_pucch_srs();
void set_phy_config_dedicated_default();
void set_phy_default();
void set_mac_default();
void set_rrc_default();

4
srsue/src/stack/rrc/phy_controller.cc
View File

@ -61,12 +61,12 @@ void phy_controller::set_phy_to_default()
}
}
void phy_controller::set_phy_to_default_dedicated()
void phy_controller::set_phy_to_default_pucch_srs()
{
log_h->info("Setting default PHY config dedicated\n");
srslte::phy_cfg_t& default_cfg_ded = current_cells_cfg[0];
default_cfg_ded.set_defaults_dedicated();
default_cfg_ded.set_defaults_pucch_sr();
for (uint32_t i = 0; i < SRSLTE_MAX_CARRIERS; ++i) {
set_cell_config_common(default_cfg_ded, i, false);
}

16
srsue/src/stack/rrc/rrc.cc
View File

@ -1989,16 +1989,6 @@ void rrc::set_phy_default()
}
}
// Apply default physical channel configs (9.2.4)
void rrc::set_phy_config_dedicated_default()
{
if (phy_ctrl != nullptr) {
phy_ctrl->set_phy_to_default_dedicated();
} else {
rrc_log->info("RRC not initialized. Skipping default PHY config.\n");
}
}
// Apply provided PHY config
void rrc::apply_phy_config_dedicated(const phys_cfg_ded_s& phy_cnfg, bool is_handover)
{
@ -2440,7 +2430,11 @@ void rrc::add_mrb(uint32_t lcid, uint32_t port)
// PHY CONFIG DEDICATED Defaults (3GPP 36.331 v10 9.2.4)
void rrc::set_phy_default_pucch_srs()
{
set_phy_config_dedicated_default();
if (phy_ctrl != nullptr) {
phy_ctrl->set_phy_to_default_pucch_srs();
} else {
rrc_log->info("RRC not initialized. Skipping default PUCCH/SRS config.\n");
}
// SR configuration affects to MAC SR too
current_mac_cfg.sr_cfg.reset();