Merge remote-tracking branch 'origin/update-to-2019-march-june-release' into...

Merge remote-tracking branch 'origin/update-to-2019-march-june-release' into integration_develop-nr_2019w32

cmake_targets/CMakeLists.txt

@@ -314,8 +314,8 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "Rel14")
   make_version(RRC_VERSION 14 7 0)
   set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-14.7.0.asn1)
 elseif (${RRC_ASN1_VERSION} STREQUAL "Rel15")
-  make_version(RRC_VERSION 15 3 0)
-  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-15.3.0.asn1)
+  make_version(RRC_VERSION 15 6 0)
+  set (RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/LTE/MESSAGES/asn1c/ASN1_files/lte-rrc-15.6.0.asn1)
 endif  (${RRC_ASN1_VERSION} STREQUAL "Rel8")
 add_definitions(-DRRC_VERSION=${RRC_VERSION})
 set (RRC_FULL_DIR ${asn1_generated_dir}/RRC_${RRC_ASN1_VERSION})
@@ -345,8 +345,8 @@ include_directories ("${RRC_FULL_DIR}")
 add_list2_option(NR_RRC_ASN1_VERSION "NR_Rel15" "ASN.1 version of NR_RRC interface")
 
 if (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15")
-  make_version(NR_RRC_VERSION 15 3 0)
-  set (NR_RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.3.0.asn1)
+  make_version(NR_RRC_VERSION 15 6 0)
+  set (NR_RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.6.0.asn1)
 endif  (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15")
 add_definitions(-DNR_RRC_VERSION=${NR_RRC_VERSION})
 set (NR_RRC_FULL_DIR ${asn1_generated_dir}/${NR_RRC_ASN1_VERSION})
@@ -398,11 +398,11 @@ elseif (${S1AP_RELEASE} STREQUAL "R13")
   make_version(S1AP_VERSION 13 6 0)
   set(S1AP_ASN_FILES "s1ap-13.6.0.asn1")
 elseif (${S1AP_RELEASE} STREQUAL "R14")
-  make_version(S1AP_VERSION 14 7 0)
-  set(S1AP_ASN_FILES "s1ap-14.7.0.asn1")
+  make_version(S1AP_VERSION 14 9 0)
+  set(S1AP_ASN_FILES "s1ap-14.9.0.asn1")
 else (${S1AP_RELEASE} STREQUAL "R15")
-  make_version(S1AP_VERSION 15 3 0)
-  set(S1AP_ASN_FILES "s1ap-15.3.0.asn1")
+  make_version(S1AP_VERSION 15 6 0)
+  set(S1AP_ASN_FILES "s1ap-15.6.0.asn1")
 endif(${S1AP_RELEASE} STREQUAL "R8")
 add_definitions(-DS1AP_VERSION=${S1AP_VERSION})
 set(S1AP_ASN_DIR ${S1AP_DIR}/MESSAGES/ASN1/${S1AP_RELEASE})
@@ -464,11 +464,11 @@ elseif (${X2AP_RELEASE} STREQUAL "R12")
   make_version(X2AP_VERSION 12 9 0)
   set(X2AP_ASN_FILES x2ap-12.9.0.asn1)
 elseif (${X2AP_RELEASE} STREQUAL "R14")
-  make_version(X2AP_VERSION 14 6 0)
-  set(X2AP_ASN_FILES x2ap-14.6.0.asn1)
+  make_version(X2AP_VERSION 14 7 0)
+  set(X2AP_ASN_FILES x2ap-14.7.0.asn1)
 elseif (${X2AP_RELEASE} STREQUAL "R15")
-  make_version(X2AP_VERSION 15 3 0)
-  set(X2AP_ASN_FILES x2ap-15.3.0.asn1)
+  make_version(X2AP_VERSION 15 6 0)
+  set(X2AP_ASN_FILES x2ap-15.6.0.asn1)
 endif(${X2AP_RELEASE} STREQUAL "R8")
 add_definitions(-DX2AP_VERSION=${X2AP_VERSION})
 set(X2AP_ASN_DIR ${X2AP_DIR}/MESSAGES/ASN1/${X2AP_RELEASE})

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -341,7 +341,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
     //(*servingcellconfigcommon)->lte_CRS_ToMatchAround           = CALLOC(1,sizeof(struct NR_SetupRelease_RateMatchPatternLTE_CRS));
     (*servingcellconfigcommon)->rateMatchPatternToAddModList              = CALLOC(1,sizeof(struct NR_ServingCellConfigCommon__rateMatchPatternToAddModList));
     (*servingcellconfigcommon)->rateMatchPatternToReleaseList             = CALLOC(1,sizeof(struct NR_ServingCellConfigCommon__rateMatchPatternToReleaseList));
+#if (NR_RRC_VERSION >= MAKE_VERSION(15, 5, 0))
+    (*servingcellconfigcommon)->ssbSubcarrierSpacing                      = CALLOC(1,sizeof(NR_SubcarrierSpacing_t));
+#else 
     (*servingcellconfigcommon)->subcarrierSpacing                         = CALLOC(1,sizeof(NR_SubcarrierSpacing_t));
+#endif
     (*servingcellconfigcommon)->tdd_UL_DL_ConfigurationCommon             = CALLOC(1,sizeof(struct NR_TDD_UL_DL_ConfigCommon));
 
 
@@ -869,7 +873,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
   ASN_SEQUENCE_ADD(&(*servingcellconfigcommon)->rateMatchPatternToReleaseList->list,&ratematchpatternid);
 
   //subcarrierSpacing
+#if (NR_RRC_VERSION >= MAKE_VERSION(15, 5, 0))
+  *(*servingcellconfigcommon)->ssbSubcarrierSpacing         = configuration->NIA_SubcarrierSpacing[CC_id];
+#else
   *(*servingcellconfigcommon)->subcarrierSpacing            = configuration->NIA_SubcarrierSpacing[CC_id];
+#endif
 
   //tdd_UL_DL_ConfigurationCommon
   (*servingcellconfigcommon)->tdd_UL_DL_ConfigurationCommon->referenceSubcarrierSpacing             = configuration->referenceSubcarrierSpacing[CC_id];