From dbdb699a7810646fbe39dfdda173cf2c545af17e Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Tue, 19 Nov 2019 16:42:02 +0100 Subject: [PATCH] SRSUE: minor RRC/PHY fixes --- srsue/src/phy/phy.cc | 6 +++--- srsue/src/stack/rrc/rrc.cc | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/srsue/src/phy/phy.cc b/srsue/src/phy/phy.cc index e023dbbc0..31a9fd0f1 100644 --- a/srsue/src/phy/phy.cc +++ b/srsue/src/phy/phy.cc @@ -423,7 +423,7 @@ void phy::enable_pregen_signals(bool enable) } } -void phy::set_config(srslte::phy_cfg_t& config, uint32_t cc_idx, uint32_t earfcn, srslte_cell_t* cell_info) +void phy::set_config(srslte::phy_cfg_t& config_, uint32_t cc_idx, uint32_t earfcn, srslte_cell_t* cell_info) { if (!is_initiated()) { fprintf(stderr, "Error calling set_config(): PHY not initialized\n"); @@ -439,11 +439,11 @@ void phy::set_config(srslte::phy_cfg_t& config, uint32_t cc_idx, uint32_t earfcn if (cell_info) { workers[i]->set_cell(cc_idx, *cell_info); } - workers[i]->set_config(cc_idx, config); + workers[i]->set_config(cc_idx, config_); } if (cc_idx == 0) { - prach_cfg = config.prach_cfg; + prach_cfg = config_.prach_cfg; } else if (cell_info) { // If SCell does not share synchronism with PCell ... if (m->radio_idx > 0) { diff --git a/srsue/src/stack/rrc/rrc.cc b/srsue/src/stack/rrc/rrc.cc index 8fadf737c..21124f65f 100644 --- a/srsue/src/stack/rrc/rrc.cc +++ b/srsue/src/stack/rrc/rrc.cc @@ -1348,7 +1348,7 @@ void rrc::stop_timers() void rrc::start_con_restablishment(asn1::rrc::reest_cause_e cause) { if (not connection_reest.launch(cause)) { - rrc_log->info("Failed to launch connection re-establishment pocedure\n"); + rrc_log->info("Failed to launch connection re-establishment procedure\n"); } callback_list.add_proc(connection_reest); @@ -2740,6 +2740,7 @@ void rrc::set_rrc_default() N310 = 1; N311 = 1; auto timer_expire_func = [this](uint32_t tid) { timer_expired(tid); }; + t304.set(1000, timer_expire_func); t310.set(1000, timer_expire_func); t311.set(1000, timer_expire_func); }