From a15962c81788978e111063b3926ca506febe3367 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Fri, 26 Nov 2021 12:29:40 +0100 Subject: [PATCH] ue,rrc: move NR RRC into own folder --- srsue/hdr/stack/{rrc => rrc_nr}/rrc_nr.h | 2 +- .../hdr/stack/{rrc/nr => rrc_nr}/rrc_nr_config.h | 0 srsue/hdr/stack/ue_stack_base.h | 2 +- srsue/hdr/stack/ue_stack_lte.h | 2 +- srsue/src/stack/CMakeLists.txt | 3 ++- srsue/src/stack/rrc/CMakeLists.txt | 6 +----- srsue/src/stack/rrc/test/CMakeLists.txt | 15 +-------------- srsue/src/stack/rrc/test/rrc_meas_test.cc | 2 +- srsue/src/stack/rrc_nr/CMakeLists.txt | 13 +++++++++++++ srsue/src/stack/{rrc => rrc_nr}/rrc_nr.cc | 2 +- srsue/src/stack/rrc_nr/test/CMakeLists.txt | 10 ++++++++++ .../stack/{rrc => rrc_nr}/test/ue_rrc_nr_test.cc | 2 +- srsue/src/stack/ue_stack_nr.cc | 2 +- 13 files changed, 34 insertions(+), 27 deletions(-) rename srsue/hdr/stack/{rrc => rrc_nr}/rrc_nr.h (99%) rename srsue/hdr/stack/{rrc/nr => rrc_nr}/rrc_nr_config.h (100%) create mode 100644 srsue/src/stack/rrc_nr/CMakeLists.txt rename srsue/src/stack/{rrc => rrc_nr}/rrc_nr.cc (99%) create mode 100644 srsue/src/stack/rrc_nr/test/CMakeLists.txt rename srsue/src/stack/{rrc => rrc_nr}/test/ue_rrc_nr_test.cc (99%) diff --git a/srsue/hdr/stack/rrc/rrc_nr.h b/srsue/hdr/stack/rrc_nr/rrc_nr.h similarity index 99% rename from srsue/hdr/stack/rrc/rrc_nr.h rename to srsue/hdr/stack/rrc_nr/rrc_nr.h index 823a479e3..e53c6943e 100644 --- a/srsue/hdr/stack/rrc/rrc_nr.h +++ b/srsue/hdr/stack/rrc_nr/rrc_nr.h @@ -13,7 +13,7 @@ #ifndef SRSUE_RRC_NR_H #define SRSUE_RRC_NR_H -#include "nr/rrc_nr_config.h" +#include "rrc_nr_config.h" #include "srsran/adt/circular_map.h" #include "srsran/asn1/rrc_nr.h" #include "srsran/asn1/rrc_nr_utils.h" diff --git a/srsue/hdr/stack/rrc/nr/rrc_nr_config.h b/srsue/hdr/stack/rrc_nr/rrc_nr_config.h similarity index 100% rename from srsue/hdr/stack/rrc/nr/rrc_nr_config.h rename to srsue/hdr/stack/rrc_nr/rrc_nr_config.h diff --git a/srsue/hdr/stack/ue_stack_base.h b/srsue/hdr/stack/ue_stack_base.h index 2551922c0..7e478f8a2 100644 --- a/srsue/hdr/stack/ue_stack_base.h +++ b/srsue/hdr/stack/ue_stack_base.h @@ -13,8 +13,8 @@ #ifndef SRSUE_UE_STACK_BASE_H #define SRSUE_UE_STACK_BASE_H -#include "rrc/nr/rrc_nr_config.h" #include "rrc/rrc_config.h" +#include "rrc_nr/rrc_nr_config.h" #include "srsue/hdr/stack/upper/nas_config.h" #include "srsue/hdr/ue_metrics_interface.h" #include "upper/gw.h" diff --git a/srsue/hdr/stack/ue_stack_lte.h b/srsue/hdr/stack/ue_stack_lte.h index a6b6b4dd5..21adb8d61 100644 --- a/srsue/hdr/stack/ue_stack_lte.h +++ b/srsue/hdr/stack/ue_stack_lte.h @@ -20,7 +20,7 @@ #include "mac/mac.h" #include "mac_nr/mac_nr.h" #include "rrc/rrc.h" -#include "rrc/rrc_nr.h" +#include "rrc_nr/rrc_nr.h" #include "srsran/common/bearer_manager.h" #include "srsran/common/buffer_pool.h" #include "srsran/common/multiqueue.h" diff --git a/srsue/src/stack/CMakeLists.txt b/srsue/src/stack/CMakeLists.txt index c2834833e..48b1b61f2 100644 --- a/srsue/src/stack/CMakeLists.txt +++ b/srsue/src/stack/CMakeLists.txt @@ -8,12 +8,13 @@ add_subdirectory(mac_common) add_subdirectory(mac) +add_subdirectory(mac_nr) add_subdirectory(rrc) +add_subdirectory(rrc_nr) add_subdirectory(upper) set(SOURCES ue_stack_lte.cc) add_library(srsue_stack STATIC ${SOURCES}) -add_subdirectory(mac_nr) set(SOURCES ue_stack_nr.cc) add_library(srsue_nr_stack STATIC ${SOURCES}) diff --git a/srsue/src/stack/rrc/CMakeLists.txt b/srsue/src/stack/rrc/CMakeLists.txt index 88a66feab..19edf7884 100644 --- a/srsue/src/stack/rrc/CMakeLists.txt +++ b/srsue/src/stack/rrc/CMakeLists.txt @@ -9,8 +9,4 @@ add_subdirectory(test) set(SOURCES rrc.cc rrc_procedures.cc rrc_meas.cc rrc_cell.cc rrc_rlf_report.cc phy_controller.cc) -add_library(srsue_rrc STATIC ${SOURCES}) - -set(SOURCES rrc_nr.cc) -add_library(srsue_rrc_nr STATIC ${SOURCES}) - +add_library(srsue_rrc STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsue/src/stack/rrc/test/CMakeLists.txt b/srsue/src/stack/rrc/test/CMakeLists.txt index 55c77ef15..cd10f22c6 100644 --- a/srsue/src/stack/rrc/test/CMakeLists.txt +++ b/srsue/src/stack/rrc/test/CMakeLists.txt @@ -24,17 +24,4 @@ add_test(rrc_cell_test rrc_cell_test) add_executable(rrc_rlf_report_test rrc_rlf_report_test.cc) target_link_libraries(rrc_rlf_report_test srsue_rrc srsue_upper srsran_pdcp srsran_phy rrc_asn1 rrc_nr_asn1) -add_test(rrc_rlf_report_test rrc_rlf_report_test) - -add_executable(ue_rrc_nr_test ue_rrc_nr_test.cc) -target_link_libraries(ue_rrc_nr_test srsue_rrc_nr srsue_upper srsran_common srsran_pdcp srsran_phy rrc_asn1 rrc_nr_asn1) - -######################################################################## -# Option to run command after build (useful for remote builds) -######################################################################## -if (NOT ${BUILD_CMD} STREQUAL "") - message(STATUS "Added custom post-build command: ${BUILD_CMD}") - add_custom_command(TARGET ip_test POST_BUILD COMMAND ${BUILD_CMD}) -else(NOT ${BUILD_CMD} STREQUAL "") - message(STATUS "No post-build command defined") -endif (NOT ${BUILD_CMD} STREQUAL "") +add_test(rrc_rlf_report_test rrc_rlf_report_test) \ No newline at end of file diff --git a/srsue/src/stack/rrc/test/rrc_meas_test.cc b/srsue/src/stack/rrc/test/rrc_meas_test.cc index bf610fd65..60121b01a 100644 --- a/srsue/src/stack/rrc/test/rrc_meas_test.cc +++ b/srsue/src/stack/rrc/test/rrc_meas_test.cc @@ -17,7 +17,7 @@ #include "srsran/upper/pdcp.h" #include "srsue/hdr/stack/rrc/rrc.h" #include "srsue/hdr/stack/rrc/rrc_meas.h" -#include "srsue/hdr/stack/rrc/rrc_nr.h" +#include "srsue/hdr/stack/rrc_nr/rrc_nr.h" #include "srsue/hdr/stack/upper/nas.h" #include diff --git a/srsue/src/stack/rrc_nr/CMakeLists.txt b/srsue/src/stack/rrc_nr/CMakeLists.txt new file mode 100644 index 000000000..685824cd2 --- /dev/null +++ b/srsue/src/stack/rrc_nr/CMakeLists.txt @@ -0,0 +1,13 @@ +# +# Copyright 2013-2021 Software Radio Systems Limited +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the distribution. +# + +add_subdirectory(test) + +set(SOURCES rrc_nr.cc) +add_library(srsue_rrc_nr STATIC ${SOURCES}) + diff --git a/srsue/src/stack/rrc/rrc_nr.cc b/srsue/src/stack/rrc_nr/rrc_nr.cc similarity index 99% rename from srsue/src/stack/rrc/rrc_nr.cc rename to srsue/src/stack/rrc_nr/rrc_nr.cc index b46b218be..aed7c1a79 100644 --- a/srsue/src/stack/rrc/rrc_nr.cc +++ b/srsue/src/stack/rrc_nr/rrc_nr.cc @@ -10,7 +10,7 @@ * */ -#include "srsue/hdr/stack/rrc/rrc_nr.h" +#include "srsue/hdr/stack/rrc_nr/rrc_nr.h" #include "srsran/common/band_helper.h" #include "srsran/common/security.h" #include "srsran/common/standard_streams.h" diff --git a/srsue/src/stack/rrc_nr/test/CMakeLists.txt b/srsue/src/stack/rrc_nr/test/CMakeLists.txt new file mode 100644 index 000000000..b2b114239 --- /dev/null +++ b/srsue/src/stack/rrc_nr/test/CMakeLists.txt @@ -0,0 +1,10 @@ +# +# Copyright 2013-2021 Software Radio Systems Limited +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the distribution. +# + +add_executable(ue_rrc_nr_test ue_rrc_nr_test.cc) +target_link_libraries(ue_rrc_nr_test srsue_rrc_nr srsue_upper srsran_common srsran_pdcp srsran_phy rrc_asn1 rrc_nr_asn1) \ No newline at end of file diff --git a/srsue/src/stack/rrc/test/ue_rrc_nr_test.cc b/srsue/src/stack/rrc_nr/test/ue_rrc_nr_test.cc similarity index 99% rename from srsue/src/stack/rrc/test/ue_rrc_nr_test.cc rename to srsue/src/stack/rrc_nr/test/ue_rrc_nr_test.cc index fea8ff597..774eb4db5 100644 --- a/srsue/src/stack/rrc/test/ue_rrc_nr_test.cc +++ b/srsue/src/stack/rrc_nr/test/ue_rrc_nr_test.cc @@ -16,7 +16,7 @@ #include "srsran/interfaces/ue_pdcp_interfaces.h" #include "srsran/interfaces/ue_rlc_interfaces.h" #include "srsran/interfaces/ue_usim_interfaces.h" -#include "srsue/hdr/stack/rrc/rrc_nr.h" +#include "srsue/hdr/stack/rrc_nr/rrc_nr.h" using namespace srsue; diff --git a/srsue/src/stack/ue_stack_nr.cc b/srsue/src/stack/ue_stack_nr.cc index b5c2a38fc..da1b66806 100644 --- a/srsue/src/stack/ue_stack_nr.cc +++ b/srsue/src/stack/ue_stack_nr.cc @@ -12,7 +12,7 @@ #include "srsue/hdr/stack/ue_stack_nr.h" #include "srsran/srsran.h" -#include "srsue/hdr/stack/rrc/rrc_nr.h" +#include "srsue/hdr/stack/rrc_nr/rrc_nr.h" using namespace srsran;