mirror of https://github.com/PentHertz/srsLTE.git
ue,rrc: move NR RRC into own folder
This commit is contained in:
parent
74fda904ac
commit
a15962c817
|
@ -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"
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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})
|
||||
|
|
|
@ -10,7 +10,3 @@ 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})
|
||||
|
||||
|
|
|
@ -25,16 +25,3 @@ 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 "")
|
||||
|
|
|
@ -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 <iostream>
|
||||
|
||||
|
|
|
@ -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})
|
||||
|
|
@ -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"
|
|
@ -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)
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue