diff --git a/lib/include/srslte/interfaces/ue_interfaces.h b/lib/include/srslte/interfaces/ue_interfaces.h index 0dd0cb5be..17e84f7d5 100644 --- a/lib/include/srslte/interfaces/ue_interfaces.h +++ b/lib/include/srslte/interfaces/ue_interfaces.h @@ -533,7 +533,7 @@ public: { public: // Default constructor with default values as in 36.331 9.2.2 - mac_cfg_t() { time_alignment_timer = -1; } + mac_cfg_t() { set_defaults(); } void set_defaults() { @@ -545,6 +545,15 @@ public: time_alignment_timer = -1; } + void set_mac_main_cfg_default() + { + bsr_cfg.reset(); + phr_cfg.reset(); + sr_cfg.reset(); + harq_cfg.reset(); + time_alignment_timer = -1; + } + // Called only if section is present void set_sched_request_cfg(asn1::rrc::sched_request_cfg_c& cfg) { diff --git a/srsue/src/stack/rrc/rrc.cc b/srsue/src/stack/rrc/rrc.cc index 1b841711d..3e6153e67 100644 --- a/srsue/src/stack/rrc/rrc.cc +++ b/srsue/src/stack/rrc/rrc.cc @@ -2741,7 +2741,7 @@ void rrc::log_mac_config_dedicated() void rrc::apply_mac_config_dedicated_default() { rrc_log->info("Set MAC default configuration\n"); - current_mac_cfg.set_defaults(); + current_mac_cfg.set_mac_main_cfg_default(); mac->set_config(current_mac_cfg); log_mac_config_dedicated(); }