adding all changes from ornage private branch

openair2/COMMON/rrc_messages_types.h

@@ -166,6 +166,43 @@ typedef struct RrcConfigurationReq_s {
   long                    ue_TimersAndConstants_n310[MAX_NUM_CCs];
   long                    ue_TimersAndConstants_n311[MAX_NUM_CCs];
   long                    ue_TransmissionMode[MAX_NUM_CCs];
+
+
+  //MIB
+  long					  schedulingInfoSIB1_BR_r13[MAX_NUM_CCs];
+  //SIB1 BR options
+  
+
+  uint16_t*				  hyperSFN_r13[MAX_NUM_CCs];
+  long*					  eDRX_Allowed_r13[MAX_NUM_CCs];
+  BOOLEAN_t				  cellSelectionInfoCE_r13[MAX_NUM_CCs];
+  long					  q_RxLevMinCE_r13[MAX_NUM_CCs];
+  long*					  q_QualMinRSRQ_CE_r13[MAX_NUM_CCs];
+  BOOLEAN_t				  bandwidthReducedAccessRelatedInfo_r13[MAX_NUM_CCs];
+  long					  si_WindowLength_BR_r13[MAX_NUM_CCs];
+  long					  si_RepetitionPattern_r13[MAX_NUM_CCs];
+  BOOLEAN_t				  fdd_DownlinkOrTddSubframeBitmapBR_r13[MAX_NUM_CCs];
+  uint64_t				  fdd_DownlinkOrTddSubframeBitmapBR_val_r13[MAX_NUM_CCs];
+  uint16_t				  fdd_UplinkSubframeBitmapBR_r13[MAX_NUM_CCs];
+  long					  startSymbolBR_r13[MAX_NUM_CCs];
+  long					  si_HoppingConfigCommon_r13[MAX_NUM_CCs];
+  long*					  si_ValidityTime_r13[MAX_NUM_CCs];
+  BOOLEAN_t				  freqHoppingParametersDL_r13[MAX_NUM_CCs];
+  long*					  mpdcch_pdsch_HoppingNB_r13[MAX_NUM_CCs];
+  BOOLEAN_t				  interval_DLHoppingConfigCommonModeA_r13[MAX_NUM_CCs];
+  long					  interval_DLHoppingConfigCommonModeA_r13_val[MAX_NUM_CCs];
+  BOOLEAN_t				  interval_DLHoppingConfigCommonModeB_r13[MAX_NUM_CCs];
+  long					  interval_DLHoppingConfigCommonModeB_r13_val[MAX_NUM_CCs];
+  long*					  mpdcch_pdsch_HoppingOffset_r13[MAX_NUM_CCs];
+
+
+  //SIB2 BR Options
+  long*					  preambleTransMax_CE_r13[MAX_NUM_CCs];
+  BOOLEAN_t				  prach_ConfigCommon_v1310[MAX_NUM_CCs];
+  BOOLEAN_t*			  mpdcch_startSF_CSS_RA_r13[MAX_NUM_CCs];
+  long					  mpdcch_startSF_CSS_RA_r13_val[MAX_NUM_CCs];
+  long*					  prach_HoppingOffset_r13[MAX_NUM_CCs];
+
 } RrcConfigurationReq;
 
 // UE: NAS -> RRC messages

openair2/RRC/LITE/MESSAGES/asn1_msg.h

@@ -67,7 +67,7 @@ uint8_t get_adjacent_cell_mod_id(uint16_t phyCellId);
 @param phich_duration PHICH duration parameter
 @param frame radio frame number
 @return size of encoded bit stream in bytes*/
-uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich_Resource, uint32_t phich_duration, uint32_t frame);
+uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich_Resource, uint32_t phich_duration, uint32_t frame, uint32_t schedulingInfoSIB1);
 
 /**
 \brief Generate configuration for SIB1 (eNB).

openair2/RRC/LITE/rrc_eNB.c

@@ -155,9 +155,10 @@ init_SI(
 #ifdef ENABLE_ITTI
 	 configuration->N_RB_DL[CC_id],
 	 configuration->phich_resource[CC_id],
-	 configuration->phich_duration[CC_id]
+     configuration->phich_duration[CC_id],
+     configuration->schedulingInfoSIB1_BR_r13[CC_id]
 #else
-	 50,0,0
+     50, 0, 0, 1
 #endif
 	 ,0);
   
@@ -3731,6 +3732,7 @@ rrc_eNB_generate_RRCConnectionSetup(
 //-----------------------------------------------------------------------------
 {
 
+  bool is_mtc = false;
   LogicalChannelConfig_t             *SRB1_logicalChannelConfig;  //,*SRB2_logicalChannelConfig;
   SRB_ToAddModList_t                **SRB_configList;
   SRB_ToAddMod_t                     *SRB1_config;
@@ -3740,15 +3742,26 @@ rrc_eNB_generate_RRCConnectionSetup(
     T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
 
   SRB_configList = &ue_context_pP->ue_context.SRB_configList;
+  if (is_mtc) {
+      do_RRCConnectionSetup_BR(ctxt_pP,
+                            ue_context_pP,
+                            CC_id,
+                            (uint8_t*) RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.Payload,
+      (uint8_t*) RC.rrc[ctxt_pP->module_id]->carrier[CC_id].p_eNB, //at this point we do not have the UE capability information, so it can only be TM1 or TM2
+      rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id),
+      SRB_configList,
+      &ue_context_pP->ue_context.physicalConfigDedicated);
+  } else {
   RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.payload_size =
     do_RRCConnectionSetup(ctxt_pP,
                           ue_context_pP,
                           CC_id,
                           (uint8_t*) RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.Payload,
-			  (uint8_t) RC.rrc[ctxt_pP->module_id]->carrier[CC_id].p_eNB, //at this point we do not have the UE capability information, so it can only be TM1 or TM2
+              (uint8_t*) RC.rrc[ctxt_pP->module_id]->carrier[CC_id].p_eNB, //at this point we do not have the UE capability information, so it can only be TM1 or TM2
                           rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id),
                           SRB_configList,
                           &ue_context_pP->ue_context.physicalConfigDedicated);
+  }
 
 #ifdef RRC_MSG_PRINT
   LOG_F(RRC,"[MSG] RRC Connection Setup\n");