From 598bad1f0e4ae28579256d7d1800b4b6048e87ff Mon Sep 17 00:00:00 2001
From: Francisco Paisana <paisanaf@tcd.ie>
Date: Wed, 13 May 2020 11:40:37 +0100
Subject: [PATCH] changed rrc ue cfg files names

---
 lib/include/srslte/rrc/bearer_cfg.h           | 56 -------------------
 srsenb/hdr/stack/rrc/rrc.h                    |  2 +-
 .../rrc/{rrc_ue_cfg.h => rrc_bearer_cfg.h}    |  6 +-
 srsenb/src/stack/rrc/CMakeLists.txt           |  2 +-
 .../rrc/{rrc_ue_cfg.cc => rrc_bearer_cfg.cc}  |  4 +-
 5 files changed, 7 insertions(+), 63 deletions(-)
 delete mode 100644 lib/include/srslte/rrc/bearer_cfg.h
 rename srsenb/hdr/stack/rrc/{rrc_ue_cfg.h => rrc_bearer_cfg.h} (97%)
 rename srsenb/src/stack/rrc/{rrc_ue_cfg.cc => rrc_bearer_cfg.cc} (99%)

diff --git a/lib/include/srslte/rrc/bearer_cfg.h b/lib/include/srslte/rrc/bearer_cfg.h
deleted file mode 100644
index 51306ba02..000000000
--- a/lib/include/srslte/rrc/bearer_cfg.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2020 Software Radio Systems Limited
- *
- * This file is part of srsLTE.
- *
- * srsLTE is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * srsLTE is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * A copy of the GNU Affero General Public License can be found in
- * the LICENSE file in the top-level directory of this distribution
- * and at http://www.gnu.org/licenses/.
- *
- */
-
-#ifndef SRSLTE_BEARER_CFG_H
-#define SRSLTE_BEARER_CFG_H
-
-#include "rrc_cfg_utils.h"
-#include "srslte/asn1/rrc_asn1.h"
-
-namespace srslte {
-
-//! Apply toAddModList/toRelease diffs to SRBs
-void apply_srb_diff(asn1::rrc::srb_to_add_mod_list_l& src,
-                    asn1::rrc::srb_to_add_mod_list_l& diff,
-                    asn1::rrc::srb_to_add_mod_list_l& target)
-{
-  if (diff.size() > 0) {
-    apply_addmodlist_diff(src, diff, target);
-  } else if (&target != &src) {
-    target = src;
-  }
-}
-
-//! Apply toAddModList/toRelease diffs to SRBs
-void apply_drb_diff(asn1::rrc::drb_to_add_mod_list_l& src,
-                    asn1::rrc::rr_cfg_ded_s&          diff,
-                    asn1::rrc::drb_to_add_mod_list_l& target)
-{
-  if (diff.drb_to_add_mod_list_present) {
-    apply_addmodremlist_diff(src, diff.drb_to_add_mod_list, diff.drb_to_release_list, target);
-  } else if (&target != &src) {
-    target = src;
-  }
-}
-
-} // namespace srslte
-
-#endif // SRSLTE_BEARER_CFG_H
diff --git a/srsenb/hdr/stack/rrc/rrc.h b/srsenb/hdr/stack/rrc/rrc.h
index 58cdfe038..e4cf1932a 100644
--- a/srsenb/hdr/stack/rrc/rrc.h
+++ b/srsenb/hdr/stack/rrc/rrc.h
@@ -22,9 +22,9 @@
 #ifndef SRSENB_RRC_H
 #define SRSENB_RRC_H
 
+#include "rrc_bearer_cfg.h"
 #include "rrc_cell_cfg.h"
 #include "rrc_metrics.h"
-#include "rrc_ue_cfg.h"
 #include "srsenb/hdr/stack/upper/common_enb.h"
 #include "srslte/common/block_queue.h"
 #include "srslte/common/buffer_pool.h"
diff --git a/srsenb/hdr/stack/rrc/rrc_ue_cfg.h b/srsenb/hdr/stack/rrc/rrc_bearer_cfg.h
similarity index 97%
rename from srsenb/hdr/stack/rrc/rrc_ue_cfg.h
rename to srsenb/hdr/stack/rrc/rrc_bearer_cfg.h
index fde833e23..eaef47334 100644
--- a/srsenb/hdr/stack/rrc/rrc_ue_cfg.h
+++ b/srsenb/hdr/stack/rrc/rrc_bearer_cfg.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef SRSLTE_RRC_UE_CFG_H
-#define SRSLTE_RRC_UE_CFG_H
+#ifndef SRSLTE_RRC_BEARER_CFG_H
+#define SRSLTE_RRC_BEARER_CFG_H
 
 #include "srsenb/hdr/stack/rrc/rrc_config.h"
 #include "srslte/common/logmap.h"
@@ -102,4 +102,4 @@ private:
 
 } // namespace srsenb
 
-#endif // SRSLTE_RRC_UE_CFG_H
+#endif // SRSLTE_RRC_BEARER_CFG_H
diff --git a/srsenb/src/stack/rrc/CMakeLists.txt b/srsenb/src/stack/rrc/CMakeLists.txt
index ee3807b5c..bb0027846 100644
--- a/srsenb/src/stack/rrc/CMakeLists.txt
+++ b/srsenb/src/stack/rrc/CMakeLists.txt
@@ -18,5 +18,5 @@
 # and at http://www.gnu.org/licenses/.
 #
 
-set(SOURCES rrc.cc rrc_mobility.cc rrc_cell_cfg.cc rrc_ue_cfg.cc)
+set(SOURCES rrc.cc rrc_mobility.cc rrc_cell_cfg.cc rrc_bearer_cfg.cc)
 add_library(srsenb_rrc STATIC ${SOURCES})
diff --git a/srsenb/src/stack/rrc/rrc_ue_cfg.cc b/srsenb/src/stack/rrc/rrc_bearer_cfg.cc
similarity index 99%
rename from srsenb/src/stack/rrc/rrc_ue_cfg.cc
rename to srsenb/src/stack/rrc/rrc_bearer_cfg.cc
index e0307bb6f..704f7950b 100644
--- a/srsenb/src/stack/rrc/rrc_ue_cfg.cc
+++ b/srsenb/src/stack/rrc/rrc_bearer_cfg.cc
@@ -19,11 +19,11 @@
  *
  */
 
-#include "srsenb/hdr/stack/rrc/rrc_ue_cfg.h"
+#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/bearer_cfg.h"
+#include "srslte/rrc/rrc_cfg_utils.h"
 
 namespace srsenb {