Merge remote-tracking branch 'origin/lte-rrc-rel16' into integration_2023_w47

openair2/RRC/LTE/MESSAGES/CMakeLists.txt

-set(LTE_RRC_VERSION 15 6 0)
+set(LTE_RRC_VERSION 16 13 0)
 make_version(LTE_RRC_cc ${LTE_RRC_VERSION})
 string(REPLACE ";" "." LTE_RRC_RELEASE "${LTE_RRC_VERSION}")
 
-if(LTE_RRC_RELEASE VERSION_EQUAL "15.6.0")
+if(LTE_RRC_RELEASE VERSION_EQUAL "16.13.0")
+  include(ASN.1/lte-rrc-16.13.0.cmake)
+elseif(LTE_RRC_RELEASE VERSION_EQUAL "15.6.0")
   include(ASN.1/lte-rrc-15.6.0.cmake)
 else()
   message(FATAL_ERROR "unknown LTE_RRC_RELEASE ${LTE_RRC_RELEASE}")

openair2/RRC/LTE/MESSAGES/asn1_msg.c

@@ -511,7 +511,7 @@ uint8_t do_SIB1_MBMS(rrc_eNB_carrier_data_t *carrier,
   (*sib1_MBMS)->cellAccessRelatedInfo_r14.cellIdentity_r14.bits_unused=4;
   (*sib1_MBMS)->freqBandIndicator_r14 = configuration->eutra_band[CC_id];
 
-  schedulingInfo->si_Periodicity_r14=LTE_SchedulingInfo__si_Periodicity_rf16;
+  schedulingInfo->si_Periodicity_r14=LTE_SI_Periodicity_r12_rf16;
   *sib_type = LTE_SIB_Type_MBMS_r14_sibType13_v920;
   asn1cSeqAdd(&schedulingInfo->sib_MappingInfo_r14.list, sib_type);
   asn1cSeqAdd(&(*sib1_MBMS)->schedulingInfoList_MBMS_r14.list, schedulingInfo);
@@ -549,7 +549,7 @@ uint8_t do_SIB1_MBMS(rrc_eNB_carrier_data_t *carrier,
     memset((MBSFN_Area1)->ext1,0,sizeof(*(MBSFN_Area1)->ext1));
     MBSFN_Area1->ext1->subcarrierSpacingMBMS_r14 = CALLOC(1,sizeof(*( MBSFN_Area1->ext1)->subcarrierSpacingMBMS_r14));
     memset(MBSFN_Area1->ext1->subcarrierSpacingMBMS_r14,0,sizeof(*((MBSFN_Area1)->ext1)->subcarrierSpacingMBMS_r14));
-    *(MBSFN_Area1->ext1->subcarrierSpacingMBMS_r14) = LTE_MBSFN_AreaInfo_r9__ext1__subcarrierSpacingMBMS_r14_khz_1dot25;
+    *(MBSFN_Area1->ext1->subcarrierSpacingMBMS_r14) = LTE_MBSFN_AreaInfo_r9__ext1__subcarrierSpacingMBMS_r14_kHz1dot25;
     asn1cSeqAdd(&MBSFNArea_list->list,MBSFN_Area1);
   }
 
@@ -938,9 +938,9 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
   //(*sib1)->p_Max = CALLOC(1, sizeof(P_Max_t));
   // *((*sib1)->p_Max) = 23;
   
-  schedulingInfo.si_Periodicity=LTE_SchedulingInfo__si_Periodicity_rf8;
+  schedulingInfo.si_Periodicity=LTE_SI_Periodicity_r12_rf8;
   if(configuration->eMBMS_M2_configured){
-       schedulingInfo2.si_Periodicity=LTE_SchedulingInfo__si_Periodicity_rf8;
+       schedulingInfo2.si_Periodicity=LTE_SI_Periodicity_r12_rf8;
   }
   // This is for SIB2/3
   sib_type=LTE_SIB_Type_sibType3;

openair2/RRC/LTE/rrc_UE.c

@@ -2538,9 +2538,14 @@ rrc_ue_decode_dcch(
         case LTE_DL_DCCH_MessageType__c1_PR_rnReconfiguration_r10:
           break;
 
+        case LTE_DL_DCCH_MessageType__c1_PR_rrcConnectionResume_r13:
+          break;
+
+        case LTE_DL_DCCH_MessageType__c1_PR_dlDedicatedMessageSegment_r16:
+          break;
+
         case LTE_DL_DCCH_MessageType__c1_PR_spare1:
         case LTE_DL_DCCH_MessageType__c1_PR_spare2:
-        case LTE_DL_DCCH_MessageType__c1_PR_spare3:
           break;
 
         default:

openair2/RRC/LTE/rrc_eNB.c

@@ -212,7 +212,7 @@ init_SI(
         LOG_I(RRC, PROTOCOL_RRC_CTXT_FMT" SIB1-MBMS Subcarrier Spacing MBMS: %s\n",
               PROTOCOL_RRC_CTXT_ARGS(ctxt_pP),
               (*RC.rrc[ctxt_pP->module_id]->carrier[CC_id].sib1_MBMS->systemInformationBlockType13_r14->mbsfn_AreaInfoList_r9.list.array[i]->ext1->subcarrierSpacingMBMS_r14 ==
-               LTE_MBSFN_AreaInfo_r9__ext1__subcarrierSpacingMBMS_r14_khz_1dot25 ? "khz_1dot25": "khz_7dot5"));
+               LTE_MBSFN_AreaInfo_r9__ext1__subcarrierSpacingMBMS_r14_kHz1dot25 ? "khz_1dot25": "khz_7dot5"));
       }
     }
 

openair2/RRC/LTE/rrc_eNB_M2AP.c

@@ -481,6 +481,14 @@ static uint8_t rrc_M2AP_do_SIB1_MBMS_SIB13(
 	break;
       case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib26_v1530:
 	break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib26a_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib27_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib28_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib29_v1610:
+        break;
       case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib2:
 
         LOG_I(RRC, "Adding MBSFN subframe Configuration 1 to SIB2\n");
@@ -784,6 +792,14 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2(
 	break;
       case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib26_v1530:
 	break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib26a_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib27_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib28_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib29_v1610:
+        break;
       case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib2: 
 
 	LOG_I(RRC,"Adding MBSFN subframe Configuration 1 to SIB2, %p %p\n",&typeandinfo->choice.sib2,*sib2);
@@ -1140,6 +1156,14 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13(
 	break;
       case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib26_v1530:
 	break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib26a_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib27_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib28_v1610:
+        break;
+      case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib29_v1610:
+        break;
       case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib2: 
 
 	LOG_I(RRC,"Adding MBSFN subframe Configuration 1 to SIB2, %p %p\n",&typeandinfo->choice.sib2,*sib2);