updated SIB1 ,, added BR option

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -289,6 +289,9 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
 
 uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
         int Mod_id,int CC_id
+#ifdef Rel14
+                , BOOLEAN_t brOption
+#endif
 #if defined(ENABLE_ITTI)
                 , RrcConfigurationReq *configuration
 #endif
@@ -302,10 +305,21 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
   SchedulingInfo_t schedulingInfo;
   SIB_Type_t sib_type;
 
-  uint8_t *buffer                      = carrier->SIB1;
+  uint8_t *buffer;
   BCCH_DL_SCH_Message_t *bcch_message  = &carrier->siblock1;
-	SystemInformationBlockType1_BR_r13_t **sib1_br = &carrier->sib1;
-
+  SystemInformationBlockType1_BR_r13_t **sib1_br;
+#ifdef Rel14
+  if(brOption)
+  {
+      buffer                      = carrier->SIB1_BR;
+      sib1_br = &carrier->sib1_BR;
+  }
+  else
+#endif
+  {
+      buffer                      = carrier->SIB1;
+      sib1_br = &carrier->sib1;
+  }
   
   memset(bcch_message,0,sizeof(BCCH_DL_SCH_Message_t));
   bcch_message->message.present = BCCH_DL_SCH_MessageType_PR_c1;
@@ -455,6 +469,10 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
 
 	(*sib1_br)->si_WindowLength = SystemInformationBlockType1__si_WindowLength_ms20;
 	(*sib1_br)->systemInfoValueTag = 0;
+    (*sib1_br)->nonCriticalExtension = NULL;
+#ifdef Rel14
+    if(brOption)
+    {
         (*sib1_br)->nonCriticalExtension = calloc(1, sizeof(SystemInformationBlockType1_v890_IEs_t));
 
         SystemInformationBlockType1_v890_IEs_t *sib1_br_890 = (*sib1_br)->nonCriticalExtension;
@@ -484,10 +502,8 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
         sib1_br_1250->freqBandIndicatorPriority_r12 = 0; // long* // FIXME
         sib1_br_1250->nonCriticalExtension = NULL;
 
-
-
-
 	////Rel1310
+    ///
 #if defined(ENABLE_ITTI)
         if (configuration->schedulingInfoSIB1_BR_r13[CC_id] != 0)
         {
@@ -766,7 +782,10 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
       *sib1_br_1320->freqHoppingParametersDL_r13->mpdcch_pdsch_HoppingOffset_r13 = 1;
 
       sib1_br_1320->nonCriticalExtension = NULL;
-#endif
+
+#endif // ITTI ENABLED
+  }
+#endif // Rel14
 #ifdef XER_PRINT
   xer_fprint(stdout, &asn_DEF_BCCH_DL_SCH_Message, (void*)bcch_message);
 #endif

openair2/RRC/LITE/MESSAGES/asn1_msg.h

@@ -77,7 +77,13 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
 @param configuration Pointer Configuration Request structure  
 @return size of encoded bit stream in bytes*/
 
-uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,int Mod_id,int CC_id, RrcConfigurationReq *configuration
+uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,int Mod_id,int CC_id
+#ifdef Rel14
+                , BOOLEAN_t brOption
+#endif
+#if defined(ENABLE_ITTI)
+                ,RrcConfigurationReq *configuration
+#endif
                );
 
 /**