PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor - create s1ap dedicated folder

This commit is contained in:
Francisco 2021-05-14 18:35:57 +01:00 committed by Francisco Paisana
parent 0e0835a805
commit 1488606156
16 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/srsran/interfaces/enb_metrics_interface.h
View File

@ -19,7 +19,7 @@
#include "srsenb/hdr/phy/phy_metrics.h"
#include "srsenb/hdr/stack/mac/mac_metrics.h"
#include "srsenb/hdr/stack/rrc/rrc_metrics.h"
#include "srsenb/hdr/stack/upper/s1ap_metrics.h"
#include "srsenb/hdr/stack/s1ap/s1ap_metrics.h"
#include "srsran/common/metrics_hub.h"
#include "srsran/radio/radio_metrics.h"
#include "srsran/system/sys_metrics.h"

2
srsenb/hdr/stack/enb_stack_lte.h
View File

@ -20,11 +20,11 @@
#include "mac/mac.h"
#include "rrc/rrc.h"
#include "s1ap/s1ap.h"
#include "srsran/common/task_scheduler.h"
#include "upper/gtpu.h"
#include "upper/pdcp.h"
#include "upper/rlc.h"
#include "upper/s1ap.h"
#include "enb_stack_base.h"
#include "srsran/common/mac_pcap_net.h"

2
srsenb/hdr/stack/gnb_stack_nr.h
View File

@ -18,12 +18,12 @@
#ifndef SRSRAN_GNB_STACK_NR_H
#define SRSRAN_GNB_STACK_NR_H
#include "s1ap/s1ap.h"
#include "srsenb/hdr/stack/mac/mac_nr.h"
#include "srsenb/hdr/stack/rrc/rrc_nr.h"
#include "srsenb/hdr/stack/upper/pdcp_nr.h"
#include "srsenb/hdr/stack/upper/rlc_nr.h"
#include "upper/gtpu.h"
#include "upper/s1ap.h"
#include "upper/sdap.h"
#include "enb_stack_base.h"

0
srsenb/hdr/stack/upper/ngap.h → srsenb/hdr/stack/s1ap/ngap.h
View File

0
srsenb/hdr/stack/upper/s1ap.h → srsenb/hdr/stack/s1ap/s1ap.h
View File

0
srsenb/hdr/stack/upper/s1ap_metrics.h → srsenb/hdr/stack/s1ap/s1ap_metrics.h
View File

4
srsenb/src/CMakeLists.txt
View File

@ -26,10 +26,10 @@ target_link_libraries(enb_cfg_parser ${LIBCONFIGPP_LIBRARIES})
add_executable(srsenb main.cc enb.cc metrics_stdout.cc metrics_csv.cc metrics_json.cc)
set(SRSENB_SOURCES srsenb_phy srsenb_stack srsenb_common srsenb_upper srsenb_mac srsenb_rrc srslog system)
set(SRSENB_SOURCES srsenb_phy srsenb_stack srsenb_common srsenb_s1ap srsenb_upper srsenb_mac srsenb_rrc srslog system)
set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_upper srsran_radio rrc_asn1 s1ap_asn1 enb_cfg_parser srslog system)
set(SRSENB_SOURCES ${SRSENB_SOURCES} srsgnb_phy srsgnb_stack srsgnb_upper srsgnb_mac srsgnb_rrc)
set(SRSENB_SOURCES ${SRSENB_SOURCES} srsgnb_phy srsgnb_stack srsgnb_ngap srsgnb_upper srsgnb_mac srsgnb_rrc)
set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1)
target_link_libraries(srsenb ${SRSENB_SOURCES}

1
srsenb/src/stack/CMakeLists.txt
View File

@ -8,6 +8,7 @@
add_subdirectory(mac)
add_subdirectory(rrc)
add_subdirectory(s1ap)
add_subdirectory(upper)
set(SOURCES enb_stack_lte.cc)

13
srsenb/src/stack/s1ap/CMakeLists.txt Normal file
View File

@ -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.
#
set(SOURCES s1ap.cc)
add_library(srsenb_s1ap STATIC ${SOURCES})
set(SOURCES ngap.cc)
add_library(srsgnb_ngap STATIC ${SOURCES})

2
srsenb/src/stack/upper/ngap.cc → srsenb/src/stack/s1ap/ngap.cc
View File

@ -10,7 +10,7 @@
*
*/
#include "srsenb/hdr/stack/upper/ngap.h"
#include "srsenb/hdr/stack/s1ap/ngap.h"
#define procError(fmt, ...) ngap_ptr->logger.error("Proc \"%s\" - " fmt, name(), ##__VA_ARGS__)
#define procWarning(fmt, ...) ngap_ptr->logger.warning("Proc \"%s\" - " fmt, name(), ##__VA_ARGS__)

2
srsenb/src/stack/upper/s1ap.cc → srsenb/src/stack/s1ap/s1ap.cc
View File

@ -10,7 +10,7 @@
*
*/
#include "srsenb/hdr/stack/upper/s1ap.h"
#include "srsenb/hdr/stack/s1ap/s1ap.h"
#include "srsran/adt/scope_exit.h"
#include "srsran/common/bcd_helpers.h"
#include "srsran/common/enb_events.h"

4
srsenb/src/stack/upper/CMakeLists.txt
View File

@ -6,8 +6,8 @@
# the distribution.
#
set(SOURCES gtpu.cc pdcp.cc rlc.cc s1ap.cc)
set(SOURCES gtpu.cc pdcp.cc rlc.cc)
add_library(srsenb_upper STATIC ${SOURCES})
set(SOURCES pdcp_nr.cc rlc_nr.cc sdap.cc ngap.cc)
set(SOURCES pdcp_nr.cc rlc_nr.cc sdap.cc)
add_library(srsgnb_upper STATIC ${SOURCES})

1
srsenb/test/CMakeLists.txt
View File

@ -10,6 +10,7 @@ add_subdirectory(mac)
add_subdirectory(phy)
add_subdirectory(upper)
add_subdirectory(rrc)
add_subdirectory(s1ap)
add_executable(enb_metrics_test enb_metrics_test.cc ../src/metrics_stdout.cc ../src/metrics_csv.cc)
target_link_libraries(enb_metrics_test srsran_phy srsran_common)

12
srsenb/test/s1ap/CMakeLists.txt Normal file
View File

@ -0,0 +1,12 @@
#
# 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(s1ap_test s1ap_test.cc)
target_link_libraries(s1ap_test srsran_common s1ap_asn1 srsenb_s1ap srsenb_upper srsran_upper s1ap_asn1 ${SCTP_LIBRARIES})
add_test(s1ap_test s1ap_test)

2
srsenb/test/upper/s1ap_test.cc → srsenb/test/s1ap/s1ap_test.cc
View File

@ -10,7 +10,7 @@
*
*/
#include "srsenb/hdr/stack/upper/s1ap.h"
#include "srsenb/hdr/stack/s1ap/s1ap.h"
#include "srsenb/test/common/dummy_classes.h"
#include "srsran/common/network_utils.h"
#include "srsran/common/test_common.h"

3
srsenb/test/upper/CMakeLists.txt
View File

@ -25,9 +25,6 @@ target_link_libraries(rrc_meascfg_test test_helpers)
add_executable(gtpu_test gtpu_test.cc)
target_link_libraries(gtpu_test srsran_common s1ap_asn1 srsenb_upper srsran_upper ${SCTP_LIBRARIES})
add_executable(s1ap_test s1ap_test.cc)
target_link_libraries(s1ap_test srsran_common s1ap_asn1 srsenb_upper srsran_upper s1ap_asn1 ${SCTP_LIBRARIES})
add_test(rrc_mobility_test rrc_mobility_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
add_test(erab_setup_test erab_setup_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
add_test(rrc_meascfg_test rrc_meascfg_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)