Merging latest develop commits

openair1/PHY/INIT/phy_init.h

@@ -37,6 +37,9 @@
 #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
 #include "LTE_SCellToAddMod-r10.h"
 #endif
+#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
+#include "LTE_NonMBSFN-SubframeConfig-r14.h"
+#endif
 /** @addtogroup _PHY_STRUCTURES_
  * @{
  */
@@ -151,7 +154,6 @@ void phy_config_sib1_ue(module_id_t   Mod_id,
                         uint8_t          SIwindowsize,
                         uint16_t           SIperiod);
 
-
 /*!
   \fn void phy_config_sib2_ue(module_id_t Mod_id,uint8_t CC_id,uint8_t CH_index,
       RadioResourceConfigCommonSIB_t *radioResourceConfigCommon,
@@ -262,6 +264,10 @@ void phy_config_sib13_ue(module_id_t Mod_id,
                          int CC_id,uint8_t CH_index,int mbsfn_Area_idx,
                          long mbsfn_AreaId_r9);
 
+void phy_config_sib1_fembms_ue(module_id_t Mod_id,int CC_id,
+                        uint8_t eNB_id,
+			struct LTE_NonMBSFN_SubframeConfig_r14 *nonMBSFN_SubframeConfig);
+
 /**
 \brief Configure eNB MBSFN common parameters.
 \details Invoked upon transmission of SIB13 from eNB.