SRSUE: Undo enable/disable RA procedure flag

master
Xavier Arteaga 5 years ago committed by Andre Puschmann
parent 66bb7d6f82
commit fe199e6be2

@ -460,7 +460,6 @@ public:
virtual void reconfiguration(const uint32_t& cc_idx, const bool& enable) = 0; virtual void reconfiguration(const uint32_t& cc_idx, const bool& enable) = 0;
virtual void reset() = 0; virtual void reset() = 0;
virtual void wait_uplink() = 0; virtual void wait_uplink() = 0;
virtual void set_enable_ra_proc(bool en) = 0;
}; };
/** PHY interface /** PHY interface

@ -86,7 +86,6 @@ public:
void reconfiguration(const uint32_t& cc_idx, const bool& enable); void reconfiguration(const uint32_t& cc_idx, const bool& enable);
void reset(); void reset();
void wait_uplink(); void wait_uplink();
void set_enable_ra_proc(bool en) { enable_ra_proc = en; };
/******** set/get MAC configuration ****************/ /******** set/get MAC configuration ****************/
void set_config(mac_cfg_t& mac_cfg); void set_config(mac_cfg_t& mac_cfg);
@ -176,7 +175,6 @@ private:
mac_metrics_t metrics[SRSLTE_MAX_CARRIERS] = {}; mac_metrics_t metrics[SRSLTE_MAX_CARRIERS] = {};
bool initialized = false; bool initialized = false;
bool enable_ra_proc = true;
}; };
} // namespace srsue } // namespace srsue

@ -228,10 +228,8 @@ void mac::run_tti(const uint32_t tti)
sr_procedure.step(tti); sr_procedure.step(tti);
// Check SR if we need to start RA // Check SR if we need to start RA
if (enable_ra_proc) { if (sr_procedure.need_random_access()) {
if (sr_procedure.need_random_access()) { ra_procedure.start_mac_order();
ra_procedure.start_mac_order();
}
} }
ra_procedure.step(tti); ra_procedure.step(tti);

@ -932,7 +932,6 @@ proc_outcome_t rrc::connection_reest_proc::init(asn1::rrc::reest_cause_e cause)
} }
// reset MAC; // reset MAC;
rrc_ptr->mac->set_enable_ra_proc(false); // Prevent MAC from running RA procedure
rrc_ptr->mac->reset(); rrc_ptr->mac->reset();
// apply the default physical channel configuration as specified in 9.2.4; // apply the default physical channel configuration as specified in 9.2.4;
@ -1097,10 +1096,6 @@ proc_outcome_t rrc::connection_reest_proc::step()
break; break;
} }
if (ret != proc_outcome_t::yield) {
rrc_ptr->mac->set_enable_ra_proc(true);
}
return ret; return ret;
} }

Loading…
Cancel
Save