(Almost) Remove all PHY/phy_vars* and PHY/phy_extern

openair1/PHY/LTE_ESTIMATION/lte_sync_time.c

@@ -28,7 +28,7 @@
 //#include <string.h>
 #include <math.h>
 #include "PHY/defs_UE.h"
-#include "PHY/phy_extern_ue.h"
+#include "PHY/phy_extern.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 
 // Note: this is for prototype of generate_drs_pusch (OTA synchronization of RRUs)

openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c

@@ -38,6 +38,7 @@
 //#include "defs.h"
 #include "PHY/defs_UE.h"
 #include "PHY/phy_extern_ue.h"
+#include "PHY/phy_extern.h"
 
 #if defined(__x86_64__) || defined(__i386__)
 #include "pss6144.h"

openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c

@@ -23,6 +23,7 @@
 
 #include "PHY/defs_UE.h"
 #include "PHY/phy_extern_ue.h"
+#include "PHY/phy_extern.h"
 #include "common/utils/LOG/log.h"
 #include "PHY/sse_intrin.h"
 

openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c

@@ -20,7 +20,7 @@
  */
 
 #include "PHY/defs_eNB.h"
-//#include "PHY/phy_extern.h"
+#include "PHY/phy_extern.h"
 #include "PHY/sse_intrin.h"
 //#define DEBUG_CH
 #include "common/utils/LOG/log.h"
@@ -35,8 +35,6 @@ static int16_t ru_90c[2*128] = {32767, 0,32766, -402,32758, -804,32746, -1206,32
 
 #define SCALE 0x3FFF
 
-static const short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
-
 int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
                                   L1_rxtx_proc_t *proc,
 				  LTE_eNB_ULSCH_t * ulsch,