From 2adf459f6e4a04ec1cec2b0e9617f1b5dcfcbc1b Mon Sep 17 00:00:00 2001 From: matzakos Date: Tue, 2 Jul 2019 17:34:21 +0200 Subject: [PATCH] Update X2AP to Rel.15 to support EN-DC X2 signaling for 5G Non-standalone --- cmake_targets/CMakeLists.txt | 1 - openair2/X2AP/MESSAGES/ASN1/R15/x2ap-15.1.0.asn1 | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt index dee34ef05d..732cfd289e 100644 --- a/cmake_targets/CMakeLists.txt +++ b/cmake_targets/CMakeLists.txt @@ -469,7 +469,6 @@ endif(${X2AP_RELEASE} STREQUAL "R8") add_definitions(-DX2AP_VERSION=${X2AP_VERSION}) set(X2AP_ASN_DIR ${X2AP_DIR}/MESSAGES/ASN1/${X2AP_RELEASE}) set(X2AP_C_DIR ${asn1_generated_dir}/X2AP_${X2AP_RELEASE}) - # Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make execute_process(COMMAND ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh "${X2AP_C_DIR}" "${X2AP_ASN_DIR}/${X2AP_ASN_FILES}" "X2AP_" -fno-include-deps RESULT_VARIABLE ret) diff --git a/openair2/X2AP/MESSAGES/ASN1/R15/x2ap-15.1.0.asn1 b/openair2/X2AP/MESSAGES/ASN1/R15/x2ap-15.1.0.asn1 index 04de5ca5c5..e8a053a12c 100644 --- a/openair2/X2AP/MESSAGES/ASN1/R15/x2ap-15.1.0.asn1 +++ b/openair2/X2AP/MESSAGES/ASN1/R15/x2ap-15.1.0.asn1 @@ -4010,7 +4010,7 @@ NRNeighbour-Information-ExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } -CellAssistanceInformation ::= CHOICE { +CellAssistanceInformation ::= CHOICE { limited-list Limited-list, full-list ENUMERATED {allServedNRcells, ...}, ... @@ -6094,7 +6094,7 @@ SgNBResourceCoordinationInformationExtIEs X2AP-PROTOCOL-EXTENSION ::= { ... } -SgNB-UE-X2AP-ID ::= INTEGER (0..4294967295) +SgNB-UE-X2AP-ID ::= INTEGER (0..4294967295) SIPTOBearerDeactivationIndication ::= ENUMERATED { true,