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

SRSUE MAC: 36.331 v10 9.2.2 MAC main config defaults does not include RACH

This commit is contained in:
Xavier Arteaga 2019-05-14 14:36:06 +02:00 committed by Andre Puschmann
parent de9555c4f1
commit 7629863c5a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/include/srslte/interfaces/ue_interfaces.h
View File

@ -533,7 +533,7 @@ public:
{ {
public: public:
// Default constructor with default values as in 36.331 9.2.2 // 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() void set_defaults()
{ {
@ -545,6 +545,15 @@ public:
time_alignment_timer = -1; 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 // Called only if section is present
void set_sched_request_cfg(asn1::rrc::sched_request_cfg_c& cfg) void set_sched_request_cfg(asn1::rrc::sched_request_cfg_c& cfg)
{ {

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

@ -2741,7 +2741,7 @@ void rrc::log_mac_config_dedicated()
void rrc::apply_mac_config_dedicated_default() void rrc::apply_mac_config_dedicated_default()
{ {
rrc_log->info("Set MAC default configuration\n"); 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); mac->set_config(current_mac_cfg);
log_mac_config_dedicated(); log_mac_config_dedicated();
} }