From 97d20ca5798b30207bb8fc670e5f97637dd20305 Mon Sep 17 00:00:00 2001
From: Francisco Paisana <francisco.paisana@softwareradiosystems.com>
Date: Thu, 25 Jun 2020 17:57:20 +0100
Subject: [PATCH] remove obsolete bearer cfg methods

---
 srsenb/hdr/stack/rrc/mac_controller.h  |  3 +--
 srsenb/hdr/stack/rrc/rrc_bearer_cfg.h  |  1 -
 srsenb/src/stack/rrc/rrc_bearer_cfg.cc | 23 -----------------------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/srsenb/hdr/stack/rrc/mac_controller.h b/srsenb/hdr/stack/rrc/mac_controller.h
index c517ac1a4..4184a01f6 100644
--- a/srsenb/hdr/stack/rrc/mac_controller.h
+++ b/srsenb/hdr/stack/rrc/mac_controller.h
@@ -43,11 +43,10 @@ public:
   void handle_con_reconf(const asn1::rrc::rrc_conn_recfg_r8_ies_s& conn_recfg);
   void handle_con_reconf_complete();
 
-  void handle_con_reconf_with_mobility();
-
   const sched_interface::ue_cfg_t& get_ue_sched_cfg() const { return current_sched_ue_cfg; }
 
 private:
+  void handle_con_reconf_with_mobility();
   int  apply_basic_conn_cfg(const asn1::rrc::rr_cfg_ded_s& rr_cfg);
   void apply_current_bearers_cfg();
   void apply_phy_cfg_updates_common(const asn1::rrc::phys_cfg_ded_s& phy_cfg);
diff --git a/srsenb/hdr/stack/rrc/rrc_bearer_cfg.h b/srsenb/hdr/stack/rrc/rrc_bearer_cfg.h
index 83f461c78..900f67abc 100644
--- a/srsenb/hdr/stack/rrc/rrc_bearer_cfg.h
+++ b/srsenb/hdr/stack/rrc/rrc_bearer_cfg.h
@@ -81,7 +81,6 @@ public:
   void rr_ded_cfg_complete();
 
   // Methods to apply bearer updates
-  void apply_mac_bearer_updates(mac_interface_rrc* mac, sched_interface::ue_cfg_t* sched_ue_cfg);
   void apply_pdcp_bearer_updates(pdcp_interface_rrc* pdcp, const security_cfg_handler& ue_sec_cfg);
   void apply_rlc_bearer_updates(rlc_interface_rrc* rlc);
   void add_gtpu_bearer(gtpu_interface_rrc* gtpu, uint32_t erab_id);
diff --git a/srsenb/src/stack/rrc/rrc_bearer_cfg.cc b/srsenb/src/stack/rrc/rrc_bearer_cfg.cc
index 34d16b4a1..6550b94b7 100644
--- a/srsenb/src/stack/rrc/rrc_bearer_cfg.cc
+++ b/srsenb/src/stack/rrc/rrc_bearer_cfg.cc
@@ -22,7 +22,6 @@
 #include "srsenb/hdr/stack/rrc/rrc_bearer_cfg.h"
 #include "srsenb/hdr/stack/upper/common_enb.h"
 #include "srslte/asn1/rrc_asn1_utils.h"
-#include "srslte/interfaces/sched_interface.h"
 #include "srslte/rrc/rrc_cfg_utils.h"
 
 namespace srsenb {
@@ -340,28 +339,6 @@ bool bearer_cfg_handler::fill_rr_cfg_ded(asn1::rrc::rr_cfg_ded_s& msg)
   return msg.srb_to_add_mod_list_present or msg.drb_to_add_mod_list_present or msg.drb_to_release_list_present;
 }
 
-void bearer_cfg_handler::apply_mac_bearer_updates(mac_interface_rrc* mac, sched_interface::ue_cfg_t* sched_ue_cfg)
-{
-  srsenb::sched_interface::ue_bearer_cfg_t bearer_cfg = {};
-  for (const srb_to_add_mod_s& srb : srbs_to_add) {
-    bearer_cfg.direction = srsenb::sched_interface::ue_bearer_cfg_t::BOTH;
-    bearer_cfg.group     = 0;
-    mac->bearer_ue_cfg(rnti, srb.srb_id, &bearer_cfg);
-    sched_ue_cfg->ue_bearers[srb.srb_id] = bearer_cfg;
-  }
-  for (uint8_t drb_id : drbs_to_release) {
-    bearer_cfg.direction = sched_interface::ue_bearer_cfg_t::IDLE;
-    mac->bearer_ue_cfg(rnti, drb_id + 2, &bearer_cfg);
-    sched_ue_cfg->ue_bearers[drb_id + 2] = bearer_cfg;
-  }
-  for (const drb_to_add_mod_s& drb : drbs_to_add) {
-    bearer_cfg.direction = sched_interface::ue_bearer_cfg_t::BOTH;
-    bearer_cfg.group     = drb.lc_ch_cfg.ul_specific_params.lc_ch_group;
-    mac->bearer_ue_cfg(rnti, drb.lc_ch_id, &bearer_cfg);
-    sched_ue_cfg->ue_bearers[drb.lc_ch_id] = bearer_cfg;
-  }
-}
-
 void bearer_cfg_handler::apply_pdcp_bearer_updates(pdcp_interface_rrc* pdcp, const security_cfg_handler& ue_sec_cfg)
 {
   for (const srb_to_add_mod_s& srb : srbs_to_add) {