Seperation completed for PHY/LTE_REFSIG/,

-openair1/PHY/LTE_REFSIG/defs_NB_IoT.h
lte_dl_cell_spec_NB_IoT.c lte_gold_NB_IoT.c[D

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_nb_iot.h"
 
 /** @ingroup _PHY_REF_SIG
@@ -27,7 +27,7 @@
 @param lte_gold_table pointer to table where sequences are stored
 @param Nid_cell Cell Id for NB_IoT (to compute sequences for local and adjacent cells) */
 
-void lte_gold_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table[20][2][14],uint16_t Nid_cell);
+void lte_gold_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table_NB_IoT[20][2][14],uint16_t Nid_cell);
 
 /*! \brief This function generates the Narrowband reference signal (NRS) sequence (36-211, Sec 6.10.1.1)
 @param phy_vars_eNB Pointer to eNB variables
@@ -39,12 +39,12 @@ void lte_gold_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table[
 @param RB_IoT_ID the ID of the RB dedicated for NB_IoT
 */
 int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
-                     int32_t *output,
-                     short amp,
-                     unsigned char Ns,
-                     unsigned char l,
-                     unsigned char p,
-					 unsigned short RB_IoT_ID); 
+                     		int32_t *output,
+                     		short amp,
+                     		unsigned char Ns,
+                     		unsigned char l,
+                     		unsigned char p,
+					 		unsigned short RB_IoT_ID); 
 
 
 unsigned int lte_gold_generic_NB_IoT(unsigned int *x1, unsigned int *x2, unsigned char reset);

openair1/PHY/LTE_REFSIG/lte_dl_cell_spec_NB_IoT.c

@@ -17,26 +17,23 @@
 #include <stdlib.h>
 #endif
 
-#include "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_NB_IoT *phy_vars_eNB,
-                     int32_t *output,
-                     short amp,
-                     unsigned char Ns,
-                     unsigned char l,
-                     unsigned char p,
-					 unsigned short RB_IoT_ID) 			// the ID of the RB dedicated for NB_IoT
+                            int32_t *output,
+                            short amp,
+                            unsigned char Ns,
+                            unsigned char l,
+                            unsigned char p,
+					                  unsigned short RB_IoT_ID) 			// the ID of the RB dedicated for NB_IoT
 {
   unsigned char nu,mprime,mprime_dword,mprime_qpsk_symb,m;
   unsigned short k,a;
   unsigned short NB_IoT_start,bandwidth_even_odd;
   int32_t qpsk[4];
 
-  a = (amp*ONE_OVER_SQRT2_Q15)>>15;
+  a = (amp*ONE_OVER_SQRT2_Q15_NB_IoT)>>15;
   ((short *)&qpsk[0])[0] = a;
   ((short *)&qpsk[0])[1] = a;
   ((short *)&qpsk[1])[0] = -a;
@@ -55,7 +52,7 @@ int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
   else if ((p==1) && (l>0))
     nu = 0;
   else {
-    printf("lte_dl_cell_spec: p %d, l %d -> ERROR\n",p,l);
+    printf("lte_dl_cell_spec_NB_IoT: p %d, l %d -> ERROR\n",p,l);
     return(-1);
   }
 
@@ -79,7 +76,7 @@ int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
   DevAssert( l < 2 );
 
   for (m=0; m<2; m++) {
-    output[k] = qpsk[(phy_vars_eNB->lte_gold_table[Ns][l][0]) & 3]; //TODO should be defined one for NB-IoT
+    output[k] = qpsk[(phy_vars_eNB->lte_gold_table_NB_IoT[Ns][l][0]) & 3]; //TODO should be defined one for NB-IoT
     k+=6;
   }
 

openair1/PHY/LTE_REFSIG/lte_gold_NB_IoT.c

@@ -12,7 +12,7 @@
 * \warning
 */
 
-#include "defs.h"
+//#include "defs.h"
 #include "defs_NB_IoT.h"
 
 void lte_gold_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table_NB_IoT[20][2][14],uint16_t Nid_cell)  //  Nid_cell = Nid_cell_NB_IoT

openair1/PHY/defs_nb_iot.h

@@ -120,6 +120,7 @@ static inline void* malloc16_clear( size_t size )
 #define UNUSED(x) (void)x;
 
 
+#include "impl_defs_top_NB_IoT.h"
 #include "impl_defs_top.h"
 #include "impl_defs_lte.h"
 #include "impl_defs_lte_nb_iot.h"
@@ -491,7 +492,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
 
 
   /// cell-specific reference symbols
-  uint32_t         lte_gold_table[20][2][14];
+  uint32_t         lte_gold_table_NB_IoT[20][2][14];
 
   /// UE-specific reference symbols (p=5), TM 7
   uint32_t         lte_gold_uespec_port5_table[NUMBER_OF_UE_MAX_NB_IoT][20][38];