From fe199e6be212234f6bd358de90539568150b1598 Mon Sep 17 00:00:00 2001
From: Xavier Arteaga <xavier@softwareradiosystems.com>
Date: Wed, 29 Jan 2020 12:04:55 +0100
Subject: [PATCH] SRSUE: Undo enable/disable RA procedure flag

---
 lib/include/srslte/interfaces/ue_interfaces.h | 1 -
 srsue/hdr/stack/mac/mac.h                     | 2 --
 srsue/src/stack/mac/mac.cc                    | 6 ++----
 srsue/src/stack/rrc/rrc_procedures.cc         | 5 -----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/include/srslte/interfaces/ue_interfaces.h b/lib/include/srslte/interfaces/ue_interfaces.h
index 559bb4ba3..8c9e102bd 100644
--- a/lib/include/srslte/interfaces/ue_interfaces.h
+++ b/lib/include/srslte/interfaces/ue_interfaces.h
@@ -460,7 +460,6 @@ public:
   virtual void reconfiguration(const uint32_t& cc_idx, const bool& enable) = 0;
   virtual void reset()                                                     = 0;
   virtual void wait_uplink()                                               = 0;
-  virtual void set_enable_ra_proc(bool en)                                 = 0;
 };
 
 /** PHY interface
diff --git a/srsue/hdr/stack/mac/mac.h b/srsue/hdr/stack/mac/mac.h
index 1c7455b43..2faa9c6f4 100644
--- a/srsue/hdr/stack/mac/mac.h
+++ b/srsue/hdr/stack/mac/mac.h
@@ -86,7 +86,6 @@ public:
   void reconfiguration(const uint32_t& cc_idx, const bool& enable);
   void reset();
   void wait_uplink();
-  void set_enable_ra_proc(bool en) { enable_ra_proc = en; };
 
   /******** set/get MAC configuration  ****************/
   void set_config(mac_cfg_t& mac_cfg);
@@ -176,7 +175,6 @@ private:
   mac_metrics_t metrics[SRSLTE_MAX_CARRIERS] = {};
 
   bool initialized    = false;
-  bool enable_ra_proc = true;
 };
 
 } // namespace srsue
diff --git a/srsue/src/stack/mac/mac.cc b/srsue/src/stack/mac/mac.cc
index 5485571f0..ade7a9d3b 100644
--- a/srsue/src/stack/mac/mac.cc
+++ b/srsue/src/stack/mac/mac.cc
@@ -228,10 +228,8 @@ void mac::run_tti(const uint32_t tti)
   sr_procedure.step(tti);
 
   // Check SR if we need to start RA
-  if (enable_ra_proc) {
-    if (sr_procedure.need_random_access()) {
-      ra_procedure.start_mac_order();
-    }
+  if (sr_procedure.need_random_access()) {
+    ra_procedure.start_mac_order();
   }
 
   ra_procedure.step(tti);
diff --git a/srsue/src/stack/rrc/rrc_procedures.cc b/srsue/src/stack/rrc/rrc_procedures.cc
index 30b0ed2cf..95540e1b0 100644
--- a/srsue/src/stack/rrc/rrc_procedures.cc
+++ b/srsue/src/stack/rrc/rrc_procedures.cc
@@ -932,7 +932,6 @@ proc_outcome_t rrc::connection_reest_proc::init(asn1::rrc::reest_cause_e cause)
     }
 
     // reset MAC;
-    rrc_ptr->mac->set_enable_ra_proc(false); // Prevent MAC from running RA procedure
     rrc_ptr->mac->reset();
 
     // 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;
   }
 
-  if (ret != proc_outcome_t::yield) {
-    rrc_ptr->mac->set_enable_ra_proc(true);
-  }
-
   return ret;
 }