Fix L1 bugs

openair1/PHY/INIT/defs_NB_IoT.h

@@ -26,17 +26,8 @@
 #define __INIT_DEFS_NB_IOT__H__
 
 //#include "PHY/defs_NB_IoT.h"
-#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"  
-
-#include "nfapi_interface.h"  
-
-
-//#include "SystemInformationBlockType2.h"
-//#include "RadioResourceConfigCommonSIB.h"
-//#include "RadioResourceConfigDedicated.h"
-//#include "TDD-Config.h"
-//#include "MBSFN-SubframeConfigList.h"
-//#include "MobilityControlInfo.h"
+#include "nfapi_interface.h"
+//#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"  
 
 //#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
 
@@ -45,9 +36,6 @@
 
 /*brief Configure LTE_DL_FRAME_PARMS with components derived after initial synchronization (MIB-NB decoding + primary/secondary synch).*/
 void phy_config_mib_eNB_NB_IoT(int  		Mod_id,
-
-						    
-
 						       int              eutra_band,
 						       int              Nid_cell,
 						       int              Ncp,
@@ -69,11 +57,10 @@ void phy_config_mib_eNB_NB_IoT(int  		Mod_id,
 //                         );
 
 void phy_config_sib2_eNB_NB_IoT(uint8_t Mod_id,
-
                          	nfapi_nb_iot_config_t *config,
-				nfapi_rf_config_t *rf_config,
-				nfapi_uplink_reference_signal_config_t* ul_nrs_config,
-				extra_phyConfig_t* extra_phy_parms);
+							nfapi_rf_config_t *rf_config,
+							nfapi_uplink_reference_signal_config_t* ul_nrs_config,
+							extra_phyConfig_t* extra_phy_parms);
 
 void phy_config_dedicated_eNB_NB_IoT(module_id_t Mod_id,
 				     rnti_t rnti,

openair1/PHY/INIT/lte_init_NB_IoT.c

@@ -198,7 +198,7 @@ void phy_config_mib_eNB_NB_IoT(int  			Mod_id,
 
 void phy_config_sib2_eNB_NB_IoT(uint8_t 								  Mod_id,
                          		int 									  CC_id,
-                         		nfapi_config_NB_IoT_t 					  *config,
+                         		nfapi_nb_iot_config_t 					  *config,
 						 		nfapi_rf_config_t 						  *rf_config,
 						 		nfapi_uplink_reference_signal_config_t	  *ul_nrs_config,
 						 		extra_phyConfig_t						  *extra_phy_parms)

openair1/PHY/NBIoT_TRANSPORT/SIB_NB_IoT.c

@@ -30,8 +30,8 @@
 */
 
 
-#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
-#include "PHY/LTE_TRANSPORT/proto_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/defs_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/proto_NB_IoT.h"
 //#include "PHY/CODING/defs_NB_IoT.h"
 //#include "PHY/LTE_REFSIG/defs_NB_IoT.h"
 //#include "PHY/impl_defs_lte_NB_IoT.h"

openair1/PHY/NBIoT_TRANSPORT/dci_tools_NB_IoT.c

@@ -41,13 +41,13 @@
 */
 //#include "assertions.h"
 //#include "dlsch_tbs_full.h"
-#include "PHY/LTE_TRANSPORT/dlsch_tbs_full_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/dlsch_tbs_full_NB_IoT.h"
 
 //#define DEBUG_HARQ
 
 //#include "LAYER2/MAC/extern_NB_IoT.h"
 //#include "LAYER2/MAC/defs_NB_IoT.h"
-#include "PHY/defs_NB_IoT.h"
+#include "PHY/defs_L1_NB_IoT.h"
 
 //#define DEBUG_DCI
 

openair1/PHY/NBIoT_TRANSPORT/dlsch_modulation_NB_IoT.c

@@ -33,12 +33,12 @@
 //#include "PHY/defs.h"
 //#include "PHY/defs_NB_IoT.h"
 //#include "PHY/extern_NB_IoT.h"
-#include "PHY/impl_defs_lte.h"
+//#include "PHY/impl_defs_lte.h"
 //#include "PHY/CODING/defs_nb_iot.h"
 //#include "PHY/CODING/extern.h"
 //#include "PHY/CODING/lte_interleaver_inline.h"
-#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
-#include "PHY/LTE_TRANSPORT/proto_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/defs_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/proto_NB_IoT.h"
 #include "PHY/impl_defs_lte_NB_IoT.h"
 #include "PHY/impl_defs_top_NB_IoT.h"
 //#include "defs.h"

openair1/PHY/NBIoT_TRANSPORT/dlsch_scrambling_NB_IoT.c

@@ -41,7 +41,7 @@
 //#include "PHY/extern_NB_IoT.h"
 //#include "UTIL/LOG/vcd_signal_dumper.h"
 
-#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/defs_NB_IoT.h"
 #include "PHY/impl_defs_lte_NB_IoT.h"
 #include "PHY/impl_defs_lte.h"
 #include "PHY/LTE_REFSIG/defs_NB_IoT.h"

openair1/PHY/NBIoT_TRANSPORT/lte_Isc_NB_IoT.c

@@ -32,7 +32,7 @@
 
 //#include "PHY/defs.h"
 //#include "PHY/extern.h"
-#include "PHY/LTE_TRANSPORT/proto_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/proto_NB_IoT.h"
 
 uint8_t tab_ack_15khz[16]= {0,1,2,3,0,1,2,3,0,1,2,3,0,1,2,3};
 uint8_t tab_ack_3_75khz[16]= {38,39,40,41,42,43,44,45,38,39,40,41,42,43,44,45};

openair1/PHY/NBIoT_TRANSPORT/lte_mcs_NB_IoT.c

@@ -33,8 +33,8 @@
 //#include "PHY/defs.h"
 //#include "PHY/extern.h"
 
-#include "PHY/LTE_TRANSPORT/proto_NB_IoT.h"
-#include "PHY/LTE_TRANSPORT/extern_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/proto_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/extern_NB_IoT.h"
 
 
 uint8_t get_Qm_UL_NB_IoT(unsigned char I_mcs, uint8_t N_sc_RU, uint8_t I_sc, uint8_t Msg3_flag)

openair1/PHY/NBIoT_TRANSPORT/npbch_NB_IoT.c

@@ -36,7 +36,7 @@
 //#include "extern_NB_IoT.h"
 //#include "PHY/extern_NB_IoT.h"
 //#include "PHY/sse_intrin.h"
-#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
+#include "PHY/NBIoT_TRANSPORT/defs_NB_IoT.h"
 #include "PHY/CODING/defs_NB_IoT.h"
 #include "PHY/LTE_REFSIG/defs_NB_IoT.h"
 #include "PHY/impl_defs_lte_NB_IoT.h"

openair1/PHY/impl_defs_lte.h

@@ -33,6 +33,7 @@
 #ifndef __PHY_IMPLEMENTATION_DEFS_LTE_H__
 #define __PHY_IMPLEMENTATION_DEFS_LTE_H__
 
+#include "types.h"
 
 typedef struct {
   /// \brief Holds the transmit data in the frequency domain.

openair1/PHY/impl_defs_lte_NB_IoT.h

@@ -33,7 +33,9 @@
 #ifndef __PHY_IMPL_DEFS_NB_IOT__H__
 #define __PHY_IMPL_DEFS_NB_IOT__H__
 
-#include "types_NB_IoT.h"
+#include "types.h"
+
+//#include "types_NB_IoT.h"
 //#include "defs.h"
 
 typedef enum {TDD_NB_IoT=1,FDD_NB_IoT=0} NB_IoT_frame_type_t;

openair2/PHY_INTERFACE/nfapi_interface.h

@@ -19,7 +19,7 @@
 #define _NFAPI_INTERFACE_H_
 
 #include "stddef.h"
-#include "ACK-NACK-NumRepetitions-NB-r13.h"
+#include "LTE_ACK-NACK-NumRepetitions-NB-r13.h"
 
 // Constants - update based on implementation
 #define NFAPI_MAX_PHY_RF_INSTANCES 2