added config file + bug fixing

openair2/COMMON/rrc_messages_types.h

@@ -180,11 +180,11 @@ typedef struct RrcConfigurationReq_s {
 
 
   RadioResourceConfig     radioresourceconfig[MAX_NUM_CCs];
-
+  RadioResourceConfig     radioresourceconfig_BR[MAX_NUM_CCs];
    
 #ifdef Rel14
 
-  RadioResourceConfig     radioresourceconfig_BR[MAX_NUM_CCs];
+
   //MIB
   long	 		  schedulingInfoSIB1_BR_r13[MAX_NUM_CCs];
   //SIB1 BR options

openair2/RRC/LITE/MESSAGES/asn1_msg.c

@@ -852,11 +852,13 @@ uint8_t do_SIB23(uint8_t Mod_id,
   uint8_t                       *buffer;
   SystemInformationBlockType2_t **sib2;
   RadioResourceConfig           *rrconfig;
+
 #ifdef Rel14
   if (brOption) {
     buffer   = RC.rrc[Mod_id]->carrier[CC_id].SIB23_BR;
     sib2     = &RC.rrc[Mod_id]->carrier[CC_id].sib2_BR;
     rrconfig = &configuration->radioresourceconfig_BR[CC_id];
+
   }
   else
 #endif
@@ -956,7 +958,6 @@ uint8_t do_SIB23(uint8_t Mod_id,
   (*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1 = calloc(1, sizeof(struct RACH_ConfigCommon__ext1));
   memset((*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1, 0, sizeof(struct RACH_ConfigCommon__ext1));
 
-
   if (rrconfig->rach_maxHARQ_Msg3Tx)
     {
       (*sib2)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = calloc(1, sizeof(PreambleTransMax_t));

openair2/RRC/LITE/rrc_eNB.c

@@ -214,11 +214,14 @@ init_SI(
     AssertFatal(RC.rrc[ctxt_pP->module_id]->carrier[CC_id].SIB23_BR!=NULL,"cannot allocate memory for SIB");
     RC.rrc[ctxt_pP->module_id]->carrier[CC_id].sizeof_SIB23_BR = do_SIB23(
 									  ctxt_pP->module_id,
-									  CC_id,
+                                      CC_id
+#ifdef Rel14
+                                      ,TRUE
+#endif
 #if defined(ENABLE_ITTI)
-									  configuration,
+                                      ,configuration
+                );
 #endif
-									  0);
   }
 #endif