seperation completed for /LTE_TRANSPORT

openair1/PHY/LTE_TRANSPORT/extern.h

@@ -22,7 +22,7 @@
 extern unsigned int dlsch_tbs25[27][25],TBStable[27][110],TBStable1C[32];
 
 //NB-Iot
-extern unsigned int TBStable_NB_IoT[14][8];
+//extern unsigned int TBStable_NB_IoT[14][8];
 
 
 extern unsigned short lte_cqi_eff1024[16];

openair1/PHY/LTE_TRANSPORT/npbch_NB_IoT.c

@@ -17,8 +17,8 @@
 //#include "PHY/CODING/extern.h"
 //#include "PHY/CODING/lte_interleaver_inline.h"
 #include "PHY/LTE_TRANSPORT/defs_nb_iot.h"
-#include "extern_NB_IoT.h"
-#include "PHY/extern_NB_IoT.h"
+//#include "extern_NB_IoT.h"
+//#include "PHY/extern_NB_IoT.h"
 //#include "PHY/sse_intrin.h"
 
 #include "PHY/CODING/defs_nb_iot.h"

openair1/PHY/LTE_TRANSPORT/npss_NB_IoT.c

@@ -13,8 +13,12 @@
 */
 
 //#include "PHY/defs.h"
-#include "PHY/defs_nb_iot.h"
-#include "PHY/extern.h"
+///////////////#include "PHY/defs_nb_iot.h"
+//#include "PHY/extern.h"
+#include <math.h>
+#include "PHY/impl_defs_lte_nb_iot.h"
+#include "PHY/impl_defs_top_NB_IoT.h"
+//or #include "PHY/defs_nb_iot.h"
 #include "PHY/LTE_REFSIG/primary_synch_NB_IoT.h"
 
 int generate_npss_NB_IoT(int32_t **txdataF,
@@ -34,7 +38,7 @@ int generate_npss_NB_IoT(int32_t **txdataF,
    primary_sync = primary_synch_NB_IoT;     		// primary_synch_NB_IoT[264] of primary_synch_NB_IoT.h
 
    // Signal amplitude
-   a = (frame_parms->nb_antennas_tx == 1) ? amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
+   a = (frame_parms->nb_antennas_tx == 1) ? amp: (amp*ONE_OVER_SQRT2_Q15_NB_IoT)>>15;
 
    // Testing if the total number of RBs is even or odd (i.e. Identification of the bandwidth: 1.4, 3, 5, 10, ... MHz)
    bandwidth_even_odd = frame_parms->N_RB_DL % 2;  		// 0 for even, 1 for odd

openair1/PHY/LTE_TRANSPORT/nsss_NB_IoT.c

@@ -16,7 +16,7 @@
 //#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 //#include "defs.h"
-#include "PHY/extern_NB_IoT.h"
+//#include "PHY/extern_NB_IoT.h"
 #include "nsss_NB_IoT.h"
 
 int generate_sss_NB_IoT(int32_t **txdataF,

openair1/PHY/LTE_TRANSPORT/ulsch_decoding_NB_IoT.c

@@ -35,9 +35,9 @@
 //#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h"
-#include "PHY/CODING/extern.h"
-#include "extern_NB_IoT.h"
-#include "SCHED/extern.h"
+//#include "PHY/CODING/extern.h"
+//#include "extern_NB_IoT.h"
+//#include "SCHED/extern.h"
 #ifdef OPENAIR2
 #include "LAYER2/MAC/defs.h"
 #include "LAYER2/MAC/extern.h"