Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-RAN
Commits
2c79b0a4
Commit
2c79b0a4
authored
2 years ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Generate and build M2AP ASN.1 during build time
parent
09b4c657
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
388 additions
and
52 deletions
+388
-52
CMakeLists.txt
CMakeLists.txt
+14
-52
openair2/CMakeLists.txt
openair2/CMakeLists.txt
+1
-0
openair2/M2AP/CMakeLists.txt
openair2/M2AP/CMakeLists.txt
+1
-0
openair2/M2AP/MESSAGES/ASN1/m2ap-14.0.0.asn
openair2/M2AP/MESSAGES/ASN1/m2ap-14.0.0.asn
+0
-0
openair2/M2AP/MESSAGES/ASN1/m2ap-14.0.0.cmake
openair2/M2AP/MESSAGES/ASN1/m2ap-14.0.0.cmake
+343
-0
openair2/M2AP/MESSAGES/CMakeLists.txt
openair2/M2AP/MESSAGES/CMakeLists.txt
+29
-0
No files found.
CMakeLists.txt
View file @
2c79b0a4
...
@@ -429,51 +429,10 @@ target_link_libraries(ngap PUBLIC asn1_ngap lte_rrc)
...
@@ -429,51 +429,10 @@ target_link_libraries(ngap PUBLIC asn1_ngap lte_rrc)
target_link_libraries(ngap PRIVATE asn1_nr_rrc asn1_lte_rrc)
target_link_libraries(ngap PRIVATE asn1_nr_rrc asn1_lte_rrc)
#M2AP
#M2AP
# Same limitation as described in RRC/S1AP: unknown generated file list
# so we generate it at cmake time
##############
##############
add_list1_option(M2AP_RELEASE R14 "M2AP ASN.1 grammar version" R14)
set(M2AP_DIR ${OPENAIR2_DIR}/M2AP)
set(M2AP_DIR ${OPENAIR2_DIR}/M2AP)
if (${M2AP_RELEASE} STREQUAL "R8")
add_library(m2ap
make_version(M2AP_VERSION 8 9 0)
set(M2AP_ASN_FILES m2ap-8.9.0.asn1)
elseif (${M2AP_RELEASE} STREQUAL "R11")
make_version(M2AP_VERSION 11 9 0)
set(M2AP_ASN_FILES m2ap-11.9.0.asn1)
elseif (${M2AP_RELEASE} STREQUAL "R12")
make_version(M2AP_VERSION 12 9 0)
set(M2AP_ASN_FILES m2ap-12.9.0.asn1)
elseif (${M2AP_RELEASE} STREQUAL "R14")
make_version(M2AP_VERSION 14 0 0)
set(M2AP_ASN_FILES m2ap-14.0.0.asn1)
elseif (${M2AP_RELEASE} STREQUAL "R15")
make_version(M2AP_VERSION 15 1 0)
set(M2AP_ASN_FILES m2ap-15.1.0.asn1)
endif(${M2AP_RELEASE} STREQUAL "R8")
add_definitions(-DM2AP_VERSION=${M2AP_VERSION})
set(M2AP_ASN_DIR ${M2AP_DIR}/MESSAGES/ASN1/${M2AP_RELEASE})
set(M2AP_C_DIR ${asn1_generated_dir}/M2AP_${M2AP_RELEASE})
# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
set(m2ap_cmd ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "M2AP_" "-fno-include-deps -DEMIT_ASN_DEBUG=1" "${M2AP_C_DIR}")
compile_asn1("${M2AP_ASN_DIR}/${M2AP_ASN_FILES}" "${m2ap_cmd}" m2_flag)
file(GLOB M2AP_source ${M2AP_C_DIR}/*.c)
add_library(M2AP_LIB
${M2AP_source}
${M2AP_DIR}/m2ap_common.c
${M2AP_DIR}/m2ap_common.c
)
add_dependencies(M2AP_LIB m2_flag)
target_link_libraries(M2AP_LIB PRIVATE asn1_nr_rrc asn1_lte_rrc)
include_directories ("${M2AP_C_DIR}")
include_directories ("${M2AP_DIR}")
add_library(M2AP_ENB
${M2AP_DIR}/m2ap_eNB.c
${M2AP_DIR}/m2ap_eNB.c
${M2AP_DIR}/m2ap_MCE.c
${M2AP_DIR}/m2ap_MCE.c
${M2AP_DIR}/m2ap_decoder.c
${M2AP_DIR}/m2ap_decoder.c
...
@@ -490,8 +449,9 @@ add_library(M2AP_ENB
...
@@ -490,8 +449,9 @@ add_library(M2AP_ENB
${M2AP_DIR}/m2ap_MCE_interface_management.c
${M2AP_DIR}/m2ap_MCE_interface_management.c
${M2AP_DIR}/m2ap_eNB_interface_management.c
${M2AP_DIR}/m2ap_eNB_interface_management.c
)
)
add_dependencies(M2AP_ENB m2_flag)
target_link_libraries(m2ap PUBLIC asn1_m2ap)
target_link_libraries(M2AP_ENB PRIVATE asn1_nr_rrc asn1_lte_rrc)
target_link_libraries(m2ap PRIVATE lte_rrc nr_rrc)
target_include_directories(m2ap PRIVATE "${M2AP_DIR}")
#M3AP
#M3AP
# Same limitation as described in RRC/S1AP: unknown generated file list
# Same limitation as described in RRC/S1AP: unknown generated file list
...
@@ -554,6 +514,7 @@ add_library(M3AP_ENB
...
@@ -554,6 +514,7 @@ add_library(M3AP_ENB
)
)
add_dependencies(M3AP_ENB m3_flag)
add_dependencies(M3AP_ENB m3_flag)
target_link_libraries(M3AP_ENB PRIVATE asn1_nr_rrc asn1_lte_rrc)
target_link_libraries(M3AP_ENB PRIVATE asn1_nr_rrc asn1_lte_rrc)
target_link_libraries(m3ap PRIVATE m2ap)
#X2AP
#X2AP
##############
##############
...
@@ -1793,8 +1754,8 @@ add_library(L2
...
@@ -1793,8 +1754,8 @@ add_library(L2
${ENB_APP_SRC}
${ENB_APP_SRC}
${MCE_APP_SRC}
${MCE_APP_SRC}
)
)
add_dependencies(L2 m
2_flag m
3_flag)
add_dependencies(L2 m3_flag)
target_link_libraries(L2 PRIVATE f1ap x2ap s1ap lte_rrc)
target_link_libraries(L2 PRIVATE f1ap x2ap s1ap lte_rrc
m2ap
)
target_link_libraries(L2 PRIVATE asn1_nr_rrc asn1_lte_rrc)
target_link_libraries(L2 PRIVATE asn1_nr_rrc asn1_lte_rrc)
add_library(MAC_NR ${MAC_NR_SRC})
add_library(MAC_NR ${MAC_NR_SRC})
...
@@ -1875,7 +1836,8 @@ set (MME_APP_SRC
...
@@ -1875,7 +1836,8 @@ set (MME_APP_SRC
${OPENAIR3_DIR}/MME_APP/mme_config.c
${OPENAIR3_DIR}/MME_APP/mme_config.c
)
)
add_library(MME_APP ${MME_APP_SRC})
add_library(MME_APP ${MME_APP_SRC})
add_dependencies(MME_APP m2_flag m3_flag)
add_dependencies(MME_APP m3_flag)
target_link_libraries(MME_APP PRIVATE m2ap)
target_link_libraries(MME_APP PRIVATE asn1_nr_rrc asn1_lte_rrc)
target_link_libraries(MME_APP PRIVATE asn1_nr_rrc asn1_lte_rrc)
set(SCTP_SRC
set(SCTP_SRC
...
@@ -2407,7 +2369,7 @@ add_dependencies(lte-softmodem oai_iqplayer)
...
@@ -2407,7 +2369,7 @@ add_dependencies(lte-softmodem oai_iqplayer)
target_link_libraries(lte-softmodem PRIVATE
target_link_libraries(lte-softmodem PRIVATE
-Wl,--start-group
-Wl,--start-group
lte_rrc nr_rrc s1ap
M2AP_LIB M2AP_ENB
x2ap M3AP_LIB M3AP_ENB GTPV1U f1ap SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
lte_rrc nr_rrc s1ap
m2ap
x2ap M3AP_LIB M3AP_ENB GTPV1U f1ap SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
PHY_COMMON PHY PHY_RU L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
PHY_COMMON PHY PHY_RU L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
${RAL_LIB} ${NAS_UE_LIB} ITTI
${RAL_LIB} ${NAS_UE_LIB} ITTI
-Wl,--end-group z dl)
-Wl,--end-group z dl)
...
@@ -2447,7 +2409,7 @@ add_dependencies(ocp-enb oai_iqplayer coding params_libconfig rfsimulator)
...
@@ -2447,7 +2409,7 @@ add_dependencies(ocp-enb oai_iqplayer coding params_libconfig rfsimulator)
target_link_libraries (ocp-enb
target_link_libraries (ocp-enb
-Wl,--start-group
-Wl,--start-group
lte_rrc nr_rrc s1ap f1ap
M2AP_LIB M2AP_ENB
x2ap M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
lte_rrc nr_rrc s1ap f1ap
m2ap
x2ap M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
PHY_COMMON PHY PHY_RU L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB MISC_NFAPI_LTE_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU_COMMON
PHY_COMMON PHY PHY_RU L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB MISC_NFAPI_LTE_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU_COMMON
${RAL_LIB} ${NAS_UE_LIB} ITTI
${RAL_LIB} ${NAS_UE_LIB} ITTI
-Wl,--end-group z dl)
-Wl,--end-group z dl)
...
@@ -2503,7 +2465,7 @@ if (NOT ${NOS1})
...
@@ -2503,7 +2465,7 @@ if (NOT ${NOS1})
endif()
endif()
target_link_libraries(lte-uesoftmodem PRIVATE
target_link_libraries(lte-uesoftmodem PRIVATE
-Wl,--start-group
-Wl,--start-group
lte_rrc nr_rrc s1ap x2ap
M2AP_LIB M2AP_ENB
M3AP_LIB M3AP_ENB
lte_rrc nr_rrc s1ap x2ap
m2ap
M3AP_LIB M3AP_ENB
SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
PHY_UE PHY_RU L2_UE L2_LTE SIMU_COMMON SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
PHY_UE PHY_RU L2_UE L2_LTE SIMU_COMMON SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
${RAL_LIB} ${NAS_UE_LIB} ITTI ${ATLAS_LIBRARIES}
${RAL_LIB} ${NAS_UE_LIB} ITTI ${ATLAS_LIBRARIES}
...
@@ -2547,7 +2509,7 @@ target_link_libraries(nr-softmodem PRIVATE
...
@@ -2547,7 +2509,7 @@ target_link_libraries(nr-softmodem PRIVATE
UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECU_CN SECU_OSA
UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECU_CN SECU_OSA
ITTI ${RAL_LIB} ${NAS_UE_LIB} lte_rrc nr_rrc
ITTI ${RAL_LIB} ${NAS_UE_LIB} lte_rrc nr_rrc
ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
x2ap f1ap
M2AP_LIB M2AP_ENB
M3AP_LIB M3AP_ENB
x2ap f1ap
m2ap
M3AP_LIB M3AP_ENB
-Wl,--end-group z dl)
-Wl,--end-group z dl)
target_link_libraries(nr-softmodem PRIVATE ${LIBXML2_LIBRARIES})
target_link_libraries(nr-softmodem PRIVATE ${LIBXML2_LIBRARIES})
...
@@ -2844,7 +2806,7 @@ if (${T_TRACER})
...
@@ -2844,7 +2806,7 @@ if (${T_TRACER})
syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
#all "add_library" definitions
#all "add_library" definitions
ITTI lte_rrc nr_rrc s1ap x2ap
M2AP_LIB M2AP_ENB
M3AP_LIB M3AP_ENB f1ap
ITTI lte_rrc nr_rrc s1ap x2ap
m2ap
M3AP_LIB M3AP_ENB f1ap
params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
SECU_OSA SECU_CN SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
SECU_OSA SECU_CN SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
...
...
This diff is collapsed.
Click to expand it.
openair2/CMakeLists.txt
View file @
2c79b0a4
add_subdirectory
(
E1AP
)
add_subdirectory
(
E1AP
)
add_subdirectory
(
F1AP
)
add_subdirectory
(
F1AP
)
add_subdirectory
(
M2AP
)
add_subdirectory
(
X2AP
)
add_subdirectory
(
X2AP
)
add_subdirectory
(
RRC
)
add_subdirectory
(
RRC
)
This diff is collapsed.
Click to expand it.
openair2/M2AP/CMakeLists.txt
0 → 100644
View file @
2c79b0a4
add_subdirectory
(
MESSAGES
)
This diff is collapsed.
Click to expand it.
openair2/M2AP/MESSAGES/ASN1/
R14/m2ap-14.0.0.asn1
→
openair2/M2AP/MESSAGES/ASN1/
m2ap-14.0.0.asn
View file @
2c79b0a4
File moved
This diff is collapsed.
Click to expand it.
openair2/M2AP/MESSAGES/ASN1/m2ap-14.0.0.cmake
0 → 100644
View file @
2c79b0a4
This diff is collapsed.
Click to expand it.
openair2/M2AP/MESSAGES/CMakeLists.txt
0 → 100644
View file @
2c79b0a4
set
(
M2AP_VERSION 14 0 0
)
make_version
(
M2AP_cc
${
M2AP_VERSION
}
)
string
(
REPLACE
";"
"."
M2AP_RELEASE
"
${
M2AP_VERSION
}
"
)
if
(
M2AP_RELEASE VERSION_EQUAL
"16.3.1"
)
include
(
ASN1/m2ap-16.3.1.cmake
)
elseif
(
M2AP_RELEASE VERSION_EQUAL
"8.9.0"
)
include
(
ASN1/m2ap-8.9.0.cmake
)
elseif
(
M2AP_RELEASE VERSION_EQUAL
"11.9.0"
)
include
(
ASN1/m2ap-11.9.0.cmake
)
elseif
(
M2AP_RELEASE VERSION_EQUAL
"12.9.0"
)
include
(
ASN1/m2ap-12.9.0.cmake
)
elseif
(
M2AP_RELEASE VERSION_EQUAL
"14.0.0"
)
include
(
ASN1/m2ap-14.0.0.cmake
)
elseif
(
M2AP_RELEASE VERSION_EQUAL
"15.1.0"
)
include
(
ASN1/m2ap-15.1.0.cmake
)
else
()
message
(
FATAL_ERROR
"unknown M2AP_RELEASE
${
M2AP_RELEASE
}
"
)
endif
()
add_custom_command
(
OUTPUT
${
m2ap_source
}
${
m2ap_headers
}
COMMAND ASN1C_PREFIX=M2AP_ asn1c -gen-PER -no-gen-OER -fcompound-names -no-gen-example -fno-include-deps -D
${
CMAKE_CURRENT_BINARY_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
M2AP_GRAMMAR
}
DEPENDS
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
M2AP_GRAMMAR
}
COMMENT
"Generating M2AP source files from
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
M2AP_GRAMMAR
}
"
)
add_library
(
asn1_m2ap
${
m2ap_source
}
)
target_include_directories
(
asn1_m2ap PUBLIC
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
target_compile_options
(
asn1_m2ap PRIVATE -DASN_DISABLE_OER_SUPPORT -w
)
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment