creating a complete seperation between PHY/defs.h file and PHY/defs_nb_iot.h file, replacing

all include of defs.h by defs_nb_iot.h in 33 files.

openair1/PHY/CODING/defs_nb_iot.h

@@ -29,7 +29,8 @@
 #define OPENAIR1_PHY_CODING_DEFS_NB_IOT_H_
 
 #include <stdint.h>
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 
 /** \fn uint32_t sub_block_interleaving_cc(uint32_t D, uint8_t *d,uint8_t *w)
 \brief This is the subblock interleaving algorithm for convolutionally coded blocks from 36-212 (Release 13.4, 2017).

openair1/PHY/CODING/lte_rate_matching_NB_IoT.c

@@ -16,7 +16,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #endif
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "assertions.h"
 
 #include "PHY/LTE_REFSIG/defs_NB_IoT.h"   // does this file is needed ?

openair1/PHY/INIT/defs_nb_iot.h

@@ -23,7 +23,8 @@
 #ifndef __INIT_DEFS_NB_IoT__H__
 #define __INIT_DEFS_NB_IoT__H__
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h"
 
 #include "SystemInformationBlockType2.h"

openair1/PHY/INIT/lte_init_nb_iot.c

@@ -355,7 +355,7 @@ void NB_phy_config_dedicated_eNB(uint8_t Mod_id,
 							  extra_phyConfig_t *extra_parms
 							  )
 {
-	  PHY_VARS_eNB *eNB = PHY_vars_eNB_g[Mod_id][CC_id];
+	  PHY_VARS_eNB_NB_IoT *eNB = PHY_vars_eNB_g[Mod_id][CC_id];
 	  NB_IoT_eNB_NPDCCH_t *npdcch;
 	  uint8_t UE_id = find_ue(rnti,eNB);
 	

openair1/PHY/LTE_REFSIG/defs_NB_IoT.h

@@ -16,7 +16,7 @@
 
 #ifndef __LTE_REFSIG_DEFS_NB_IOT__H__
 #define __LTE_REFSIG_DEFS_NB_IOT__H__
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 
 /** @ingroup _PHY_REF_SIG
@@ -38,7 +38,7 @@ void lte_gold_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table[
 @param p antenna index
 @param RB_IoT_ID the ID of the RB dedicated for NB_IoT
 */
-int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
+int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
                      int32_t *output,
                      short amp,
                      unsigned char Ns,

openair1/PHY/LTE_REFSIG/lte_dl_cell_spec_NB_IoT.c

@@ -18,12 +18,12 @@
 #endif
 
 #include "defs.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 
 #include "defs_NB_IoT.h"
 #include "PHY/defs_nb_iot.h"
 
-int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
+int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
                      int32_t *output,
                      short amp,
                      unsigned char Ns,

openair1/PHY/LTE_TRANSPORT/dci_nb_iot.c

@@ -34,7 +34,8 @@
 #include <stdlib.h>
 #include <string.h>
 #endif
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h"
 #include "SCHED/defs.h"
 #include "SIMULATION/TOOLS/defs.h" // for taus 

openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c

@@ -29,7 +29,7 @@
  * \note
  * \warning
  */
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/extern.h"
 #include "SCHED/defs.h"
 #ifdef DEBUG_DCI_TOOLS
@@ -64,7 +64,7 @@ void add_dci_NB_IoT(DCI_PDU_NB *DCI_pdu,void *pdu,rnti_t rnti,unsigned char dci_
 }
 
 
-int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
+int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
                                               eNB_rxtx_proc_t *proc,
                                               DCI_CONTENT *DCI_Content,
                                               uint16_t rnti,
@@ -140,7 +140,7 @@ int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
 //map the Isf (DCI param) to the number of subframes (Nsf)
 int resource_to_subframe[8] = {1,2,3,4,5,6,8,10}; 
 
-int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
+int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
                                               int frame,
                                               uint8_t subframe,
                                               DCI_CONTENT *DCI_Content,

openair1/PHY/LTE_TRANSPORT/defs_nb_iot.h

@@ -13,7 +13,8 @@
 */
 //#ifndef __LTE_TRANSPORT_DEFS_NB_IOT__H__
 //#define __LTE_TRANSPORT_DEFS_NB_IOT__H__
-//#include "PHY/defs.h"
+////#include "PHY/defs.h"
+//#include "PHY/defs_nb_iot.h"
 //#include "dci_nb_iot.h"
 //#include "dci.h"
 //#include "uci.h"

openair1/PHY/LTE_TRANSPORT/dlsch_coding_NB_IoT.c

@@ -12,7 +12,8 @@
 * \warning
 */
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h"
 #include "PHY/CODING/defs.h"
 #include "PHY/CODING/extern.h"

openair1/PHY/LTE_TRANSPORT/dlsch_modulation_NB_IoT.c

@@ -12,7 +12,8 @@
 * \warning
 */
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h"
 #include "PHY/CODING/defs.h"
 #include "PHY/CODING/extern.h"

openair1/PHY/LTE_TRANSPORT/dlsch_scrambling_NB_IoT.c

@@ -14,7 +14,8 @@
 
 //#define DEBUG_SCRAMBLING 1
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "PHY/CODING/extern.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
 #include "defs.h"

openair1/PHY/LTE_TRANSPORT/npbch_NB_IoT.c

@@ -12,7 +12,7 @@
 * \warning
 */
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 #include "PHY/CODING/extern.h"
 #include "PHY/CODING/lte_interleaver_inline.h"

openair1/PHY/LTE_TRANSPORT/npss_NB_IoT.c

@@ -12,7 +12,7 @@
 * \warning
 */
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h"
 #include "PHY/LTE_REFSIG/primary_synch_NB_IoT.h"
@@ -67,7 +67,7 @@ int generate_npss_NB_IoT(int32_t **txdataF,
 }
 
 /* (for LTE)
-int generate_pss_emul(PHY_VARS_eNB *phy_vars_eNb,uint8_t sect_id)
+int generate_pss_emul(PHY_VARS_eNB_NB_IoT *phy_vars_eNb,uint8_t sect_id)
 {
 
   msg("[PHY] EMUL eNB generate_pss_emul eNB %d, sect_id %d\n",phy_vars_eNb->Mod_id,sect_id);

openair1/PHY/LTE_TRANSPORT/nsss_NB_IoT.c

@@ -13,7 +13,7 @@
 */
 
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 #include "defs.h"
 #include "PHY/extern.h"

openair1/PHY/LTE_TRANSPORT/pilots_NB_IoT.c

@@ -12,11 +12,11 @@
 * \warning
 */
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 #include "PHY/LTE_REFSIG/defs_NB_IoT.h"
 
-void generate_pilots_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
+void generate_pilots_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
                      int32_t **txdataF,
                      int16_t amp,
                      uint16_t Ntti, 					// Ntti = 10

openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h

@@ -55,7 +55,7 @@ int generate_sss_NB_IoT(int32_t **txdataF,
 
 //NRS
 
-void generate_pilots_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
+void generate_pilots_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
                             int32_t **txdataF,
                             int16_t amp,
                             uint16_t Ntti,                // Ntti = 10
@@ -100,7 +100,7 @@ void add_dci_NB_IoT(DCI_PDU_NB *DCI_pdu,
                     uint8_t npdcch_start_symbol);
 
 /*Use the UL DCI Information to configure PHY and also Pack the DCI*/
-int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
+int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
                                               eNB_rxtx_proc_t *proc,
                                               DCI_CONTENT *DCI_Content,
                                               uint16_t rnti,
@@ -110,7 +110,7 @@ int generate_eNB_ulsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
 									                            uint8_t npdcch_start_symbol);
 
 /*Use the DL DCI Information to configure PHY and also Pack the DCI*/
-int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
+int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
                                               int frame,
                                               uint8_t subframe,
                                               DCI_CONTENT *DCI_Content,

openair1/SCHED/IF_Module_L1_primitives_nb_iot.c

@@ -2,13 +2,14 @@
 #include "../SCHED/defs.h"
 #include "../SCHED/defs_nb_iot.h"
 #include "common/utils/itti/assertions.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h"
 #include "PHY/vars.h"
 #include "PHY/INIT/defs_nb_iot.h"
 
 
-void handle_nfapi_dlsch_pdu_NB(PHY_VARS_eNB *eNB,
+void handle_nfapi_dlsch_pdu_NB(PHY_VARS_eNB_NB_IoT *eNB,
 						  eNB_rxtx_proc_t *proc,
 		       	   	   	   nfapi_dl_config_request_pdu_t *dl_config_pdu,
 						   uint8_t *sdu)
@@ -158,7 +159,7 @@ void handle_nfapi_dlsch_pdu_NB(PHY_VARS_eNB *eNB,
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 //Memo for initialization TODO: target/SIMU/USER/init_lte.c/init_lte_eNB --> new_eNB_dlsch(..) //
-//this is where the allocation of PHy_vars_eNB and all the ndlsch structures happen            //
+//this is where the allocation of PHy_vars_eNB_NB_IoT and all the ndlsch structures happen            //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -167,7 +168,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
 {
 
   //XXX check if correct to take eNB like this
-  PHY_VARS_eNB *eNB = PHY_vars_eNB_g[0][Sched_INFO->CC_id];
+  PHY_VARS_eNB_NB_IoT *eNB = PHY_vars_eNB_g[0][Sched_INFO->CC_id];
   eNB_rxtx_proc_t *proc = &eNB->proc.proc_rxtx[0];
   NB_IoT_eNB_NPBCH_t *npbch;
 

openair1/SCHED/IF_Module_L1_primitives_nb_iot.h

@@ -13,7 +13,8 @@ void schedule_response(Sched_Rsp_t *Sched_INFO);
  * Trigger the phy_config_xxx functions using parameters from the shared PHY_Config structure
  * */
 void PHY_config_req(PHY_Config_t* config_INFO);
-void handle_nfapi_dlsch_pdu_NB(PHY_VARS_eNB *eNB,
+
+void handle_nfapi_dlsch_pdu_NB(PHY_VARS_eNB_NB_IoT *eNB,
 						  	   eNB_rxtx_proc_t *proc,
 		       	   	   	   	   nfapi_dl_config_request_pdu_t *dl_config_pdu,
 						   	   uint8_t *sdu);

openair1/SCHED/defs_nb_iot.h

@@ -3,28 +3,28 @@
 #ifndef __openair_SCHED_NB_IOT_H__
 #define __openair_SCHED_NB_IOT_H__
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 #include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h"
 
 void process_schedule_rsp_NB_IoT(Sched_Rsp_t *sched_rsp,
-                          		 PHY_VARS_eNB *eNB,
+                          		 PHY_VARS_eNB_NB_IoT *eNB,
                           		 eNB_rxtx_proc_t *proc);
 
 /*Processing the ue-specific resources for uplink in NB-IoT*/
-void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, UL_IND_t *UL_INFO);
+void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc, UL_IND_t *UL_INFO);
 
 /* For NB-IoT, we put NPBCH in later part, since it would be scheduled by MAC scheduler,this generates NRS/NPSS/NSSS*/
-void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc); 
+void common_signal_procedures_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc); 
 
 /*Generate the ulsch params and do the mapping for the FAPI style parameters to OAI, and then do the packing*/
-void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu);
+void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc,nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu);
 
 /*Generate the dlsch params and do the mapping for the FAPI style parameters to OAI, and then do the packing*/
-void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
+void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu);
 
 /*Process all the scheduling result from MAC and also common signals.*/
-void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,int do_meas);
+void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc,int do_meas);
 #endif
 
 

openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c

@@ -30,7 +30,7 @@
  * \warning
  */
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h" //where we get the global Sched_Rsp_t structure filled
 #include "SCHED/defs.h"
@@ -103,7 +103,7 @@ extern int rx_sig_fifo;
 * It generates NRS/NPSS/NSSS
 *
 */
-void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) 
+void common_signal_procedures_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc) 
 {
   NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms;
   int **txdataF = eNB->common_vars.txdataF[0];
@@ -159,7 +159,7 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
   
 }
 
-void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,UL_IND_t *UL_INFO)
+void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc,UL_IND_t *UL_INFO)
 {
   //RX processing for ue-specific resources (i
 
@@ -480,7 +480,7 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc
 
 /*Generate eNB ndlsch params for NB-IoT from the NPDCCH PDU of the DCI, modify the input to the Sched Rsp variable*/
 
-void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu) 
+void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu) 
 {
   int UE_id = -1;
   NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_nb_iot;
@@ -612,7 +612,7 @@ void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,n
 
 
 
-void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu) {
+void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc,nfapi_hi_dci0_request_pdu_t *hi_dci0_pdu) {
 
   int UE_id = -1;
   int harq_pid = 0;
@@ -667,7 +667,7 @@ void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nf
  * ** CQI and PMI are not present in NB-IoT
  * ** redundancy version exist only in UL for NB-IoT and not in DL
  */
-void npdsch_procedures(PHY_VARS_eNB *eNB,
+void npdsch_procedures(PHY_VARS_eNB_NB_IoT *eNB,
 						eNB_rxtx_proc_t *proc, //Context data structure for RX/TX portion of subframe processing
 						NB_IoT_eNB_NDLSCH_t *ndlsch,
 						//int num_pdcch_symbols, (BCOM says are not needed
@@ -933,7 +933,7 @@ extern int oai_exit;
  * (in OAI in principle is every subframe)
  */
 
-void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB *eNB,
+void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
          	 	 	 	 	  eNB_rxtx_proc_t *proc,
 							  int do_meas)
 {

openair2/LAYER2/MAC/defs_nb_iot.h

@@ -40,7 +40,8 @@
 //#include "COMMON/openair_defs.h"
 #include "COMMON/platform_constants.h"
 #include "COMMON/mac_rrc_primitives.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "RadioResourceConfigCommonSIB-NB-r13.h"
 #include "RadioResourceConfigDedicated-NB-r13.h"
 #include "RACH-ConfigCommon-NB-r13.h"

openair2/LAYER2/MAC/eNB_scheduler_RA_nb_iot.c

@@ -31,7 +31,7 @@
 
 #include "assertions.h"
 #include "platform_types.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/extern.h"
 #include "msc.h"
 
@@ -52,6 +52,7 @@
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 
 //NB-IoT
+#include "PHY/defs_nb_iot.h"
 #include "proto_nb_iot.h"
 #include "defs_nb_iot.h"
 #include "math.h"

openair2/LAYER2/MAC/eNB_scheduler_dlsch_nb_iot.c

@@ -30,7 +30,7 @@
  */
 
 #include "assertions.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/extern.h"
 
 #include "SCHED/defs.h"
@@ -45,6 +45,7 @@
 #include "OCG.h"
 #include "OCG_extern.h"
 //NB-IoT
+#include "PHY/defs_nb_iot.h"
 #include "defs_nb_iot.h"
 #include "proto_nb_iot.h"
 

openair2/LAYER2/MAC/eNB_scheduler_nb_iot.c

@@ -30,7 +30,8 @@
  */
 
 #include "assertions.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h"
 
 #include "SCHED/defs.h"

openair2/LAYER2/MAC/eNB_scheduler_primitives_nb_iot.c

@@ -30,7 +30,7 @@
  */
 
 #include "assertions.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/extern.h"
 
 #include "SCHED/defs.h"
@@ -49,6 +49,7 @@
 #include "RRC/LITE/extern.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 //NB-IoT
+#include "PHY/defs_nb_iot.h"
 #include "defs_nb_iot.h"
 #include "proto_nb_iot.h"
 //#include "LAYER2/MAC/pre_processor.c"

openair2/LAYER2/MAC/eNB_scheduler_ulsch_nb_iot.c

@@ -30,7 +30,7 @@
  */
 
 #include "assertions.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "PHY/extern.h"
 
 #include "SCHED/defs.h"
@@ -48,6 +48,7 @@
 #include "RRC/LITE/extern.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 //NB-IoT
+#include "PHY/defs_nb_iot.h"
 #include "LAYER2/MAC/defs_nb_iot.h"
 #include "LAYER2/MAC/proto_nb_iot.h"
 

openair2/PHY_INTERFACE/IF_Module_nb_iot.h

@@ -63,7 +63,7 @@ typedef struct{
 
 	/*Dedicated configuration -->not supported by FAPI (may not needed)
 	 * In OAI at least are needed when we manage the phy_procedures_eNB_TX in which we call the phy_config_dedicated_eNB_step2
-	 * that use the physicalConfigDedicated info previously stored in the PHY_VARS_eNB structure through the phy_config_dedicated procedure
+	 * that use the physicalConfigDedicated info previously stored in the PHY_VARS_eNB_NB_IoT structure through the phy_config_dedicated procedure
 	 */
 	//PhysicalConfigDedicated_NB_r13_t *phy_config_dedicated;
 

openair2/RRC/LITE/L2_interface_nb_iot.c

@@ -26,7 +26,8 @@
  * \company Eurecom
  * \email: raymond.knopp@eurecom.fr
  */
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "PHY/INIT/defs_nb_iot.h"
 #include "SCHED/defs.h"
 #include "platform_types.h"

openair2/RRC/LITE/MESSAGES/asn1_msg_nb_iot.c

@@ -71,10 +71,10 @@
 #include "SIB-Type-NB-r13.h"
 #include "RRCConnectionResume-NB.h"
 #include "RRCConnectionReestablishment-NB.h"
-
+#include "PHY/defs_nb_iot.h"
 //----------------------------------------
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "enb_config.h"
 
 #if defined(ENABLE_ITTI)

openair2/RRC/LITE/defs_nb_iot.h

@@ -39,7 +39,8 @@
 
 #include "collection/tree.h"
 #include "rrc_types.h"
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
+#include "PHY/defs_nb_iot.h"
 #include "COMMON/platform_constants.h"
 #include "COMMON/platform_types.h"