Merge remote-tracking branch 'origin/nr_rrc_asn1_16_4_1' into integration_2021_w33

cmake_targets/CMakeLists.txt

@@ -457,8 +457,8 @@ include_directories ("${RRC_FULL_DIR}")
 #NR RRC
 #######
 set (NR_RRC_ASN1_VERSION "NR_Rel16" )
-make_version(NR_RRC_VERSION 16 1 0)
-set (NR_RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-16.1.0.asn1)
+make_version(NR_RRC_VERSION 16 4 1)
+set (NR_RRC_GRAMMAR ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-16.4.1.asn1)
 add_definitions(-DNR_RRC_VERSION=${NR_RRC_VERSION})
 set (NR_RRC_FULL_DIR ${asn1_generated_dir}/RRC_${NR_RRC_ASN1_VERSION})
 

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c

@@ -157,7 +157,7 @@ void init_RA(module_id_t mod_id,
   }
 
   if (nr_rach_ConfigCommon->ext1) {
-    if (nr_rach_ConfigCommon->ext1->ra_PrioritizationForAccessIdentity){
+    if (nr_rach_ConfigCommon->ext1->ra_PrioritizationForAccessIdentity_r16){
       LOG_D(MAC, "In %s:%d: Missing implementation for Access Identity initialization procedures\n", __FUNCTION__, __LINE__);
     }
   }

openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/extract_asn1_from_spce.pl

@@ -27,8 +27,7 @@ while (<INPUT_FILE>) {
     syswrite OUTPUT_FILE,"END\n\n";
 
 	  while(<INPUT_FILE>) {
-  	  if( m/NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=/){
-         
+      if( m/PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=/){
         syswrite OUTPUT_FILE,"$_ \n";
         syswrite OUTPUT_FILE,"BEGIN\n\n";
 
@@ -38,8 +37,15 @@ while (<INPUT_FILE>) {
         syswrite OUTPUT_FILE,"END\n\n";
           
         while(<INPUT_FILE>) {
-                  if( m/NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=/){
+          if( m/NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=/){
+            syswrite OUTPUT_FILE,"$_ \n";
+            syswrite OUTPUT_FILE,"BEGIN\n\n";
 
+            # Get all the text delimited by -- ASN1START and -- ASN1STOP
+            extract_asn1();
+            syswrite OUTPUT_FILE,"END\n\n";
+            while(<INPUT_FILE>) {
+              if( m/NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=/){
                 syswrite OUTPUT_FILE,"$_ \n";
                 syswrite OUTPUT_FILE,"BEGIN\n\n";
 
@@ -47,17 +53,25 @@ while (<INPUT_FILE>) {
                 extract_asn1();
 
                 syswrite OUTPUT_FILE,"END\n\n";
+                while(<INPUT_FILE>) {
+                  if( m/NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=/){
+                    syswrite OUTPUT_FILE,"$_ \n";
+                    syswrite OUTPUT_FILE,"BEGIN\n\n";
+
+                    # Get all the text delimited by -- ASN1START and -- ASN1STOP
+                    extract_asn1();
 
+                    syswrite OUTPUT_FILE,"END\n\n";
+                  }
+                }
+              }
+            }
           }
         }
-
 	    }
     }
-
     close(OUTPUT_FILE);
   }
-
-
 }
 
 close(INPUT_FILE);

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -1363,7 +1363,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  secondaryCellGroup->spCellConfig->spCellConfigDedicated->sCellDeactivationTimer=NULL;
  secondaryCellGroup->spCellConfig->spCellConfigDedicated->crossCarrierSchedulingConfig=NULL;
  secondaryCellGroup->spCellConfig->spCellConfigDedicated->tag_Id=0;
- secondaryCellGroup->spCellConfig->spCellConfigDedicated->dummy=NULL;
+ secondaryCellGroup->spCellConfig->spCellConfigDedicated->dummy1=NULL;
  secondaryCellGroup->spCellConfig->spCellConfigDedicated->pathlossReferenceLinking=NULL;
  secondaryCellGroup->spCellConfig->spCellConfigDedicated->servingCellMO=NULL;