diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c
index d877a581d154efceaff559179abb2ddb351feb12..50afd8bcefe2477b8ae2311c8c2b767b0113a7ea 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim.c
@@ -48,7 +48,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
#include "SCHED/defs.h"
#include "SCHED/vars.h"
diff --git a/openair1/SIMULATION/LTE_PHY/mbmssim.c b/openair1/SIMULATION/LTE_PHY/mbmssim.c
index 8522b7be9a80693df3c8f2eb78c9ad6b7a42deaa..8b6e4f937e64f59c2ad0f029a372d08f1cdc837e 100644
--- a/openair1/SIMULATION/LTE_PHY/mbmssim.c
+++ b/openair1/SIMULATION/LTE_PHY/mbmssim.c
@@ -38,7 +38,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
diff --git a/openair1/SIMULATION/LTE_PHY/pbchsim.c b/openair1/SIMULATION/LTE_PHY/pbchsim.c
index 739c7e121fa41e1baf3ee78c034aa1d29e7c0d37..e99da5041bbcbfbfa5ba39381f5c38475a966f6b 100644
--- a/openair1/SIMULATION/LTE_PHY/pbchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pbchsim.c
@@ -38,7 +38,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
diff --git a/openair1/SIMULATION/LTE_PHY/pdcchsim.c b/openair1/SIMULATION/LTE_PHY/pdcchsim.c
index 0c51959f148371209f8fc42f3c28d55af05dd49a..b87711348fc9973017ecea704ac18dad20816529 100644
--- a/openair1/SIMULATION/LTE_PHY/pdcchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pdcchsim.c
@@ -34,7 +34,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
diff --git a/openair1/SIMULATION/LTE_PHY/prachsim.c b/openair1/SIMULATION/LTE_PHY/prachsim.c
index 796cb8eb81914079c36513b5d809091742c56d0c..37fc3a6a102d30d5883e3a6d78deeb5a4627007d 100644
--- a/openair1/SIMULATION/LTE_PHY/prachsim.c
+++ b/openair1/SIMULATION/LTE_PHY/prachsim.c
@@ -34,10 +34,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
-#ifdef IFFT_FPGA
-#include "PHY/LTE_REFSIG/mod_table.h"
-#endif
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
@@ -70,9 +66,6 @@ int main(int argc, char **argv)
uint8_t snr1set=0;
uint8_t ue_speed1set=0;
//mod_sym_t **txdataF;
-#ifdef IFFT_FPGA
- int **txdataF2;
-#endif
int **txdata;
double **s_re,**s_im,**r_re,**r_im;
double iqim=0.0;
@@ -554,14 +547,6 @@ int main(int argc, char **argv)
// printf("(%f,%f)\n",SNR,(double)prach_errors/(double)n_frames);
} //SNR loop
-#ifdef IFFT_FPGA
- free(txdataF2[0]);
- free(txdataF2[1]);
- free(txdataF2);
- free(txdata[0]);
- free(txdata[1]);
- free(txdata);
-#endif
for (i=0; i<2; i++) {
free(s_re[i]);
diff --git a/openair1/SIMULATION/LTE_PHY/pucchsim.c b/openair1/SIMULATION/LTE_PHY/pucchsim.c
index 42de78ac7428e0ad1334e06a6ef0721beefb034d..fa96ac584338633f266594fa79f47d8c51dc0c8c 100644
--- a/openair1/SIMULATION/LTE_PHY/pucchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pucchsim.c
@@ -34,10 +34,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
-#ifdef IFFT_FPGA
-#include "PHY/LTE_REFSIG/mod_table.h"
-#endif
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
@@ -67,9 +63,6 @@ int main(int argc, char **argv)
double sigma2, sigma2_dB=0,SNR,snr0=-2.0,snr1=0.0;
uint8_t snr1set=0;
//mod_sym_t **txdataF;
-#ifdef IFFT_FPGA
- int **txdataF2;
-#endif
int **txdata;
double **s_re,**s_im,**r_re,**r_im;
double ricean_factor=0.0000005,iqim=0.0;
@@ -338,23 +331,7 @@ int main(int argc, char **argv)
frame_parms = &PHY_vars_eNB->lte_frame_parms;
-#ifdef IFFT_FPGA
- txdata = (int **)malloc16(2*sizeof(int*));
- txdata[0] = (int *)malloc16(FRAME_LENGTH_BYTES);
- txdata[1] = (int *)malloc16(FRAME_LENGTH_BYTES);
-
- bzero(txdata[0],FRAME_LENGTH_BYTES);
- bzero(txdata[1],FRAME_LENGTH_BYTES);
-
- txdataF2 = (int **)malloc16(2*sizeof(int*));
- txdataF2[0] = (int *)malloc16(FRAME_LENGTH_BYTES_NO_PREFIX);
- txdataF2[1] = (int *)malloc16(FRAME_LENGTH_BYTES_NO_PREFIX);
-
- bzero(txdataF2[0],FRAME_LENGTH_BYTES_NO_PREFIX);
- bzero(txdataF2[1],FRAME_LENGTH_BYTES_NO_PREFIX);
-#else
txdata = PHY_vars_eNB->lte_eNB_common_vars.txdata[eNB_id];
-#endif
s_re = malloc(2*sizeof(double*));
s_im = malloc(2*sizeof(double*));
@@ -420,27 +397,6 @@ int main(int argc, char **argv)
&pucch_payload,
AMP, //amp,
subframe); //subframe
-#ifdef IFFT_FPGA_UE
- tx_lev=0;
-
- for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
-
- if (frame_parms->Ncp == 1)
- PHY_ofdm_mod(txdataF2[aa], // input
- txdata[aa], // output
- frame_parms->ofdm_symbol_size,
- 2*nsymb, // number of symbols
- frame_parms->nb_prefix_samples, // number of prefix samples
- CYCLIC_PREFIX);
- else
- normal_prefix_mod(txdataF2[aa],txdata[aa],2*nsymb,frame_parms);
- }
-
- tx_lev += signal_energy(&txdata[aa][OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES],
- OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
-
-#else
-
write_output("txsigF0.m","txsF0", &PHY_vars_UE->lte_ue_common_vars.txdataF[0][2*subframe*nsymb*OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES_NO_PREFIX],OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES_NO_PREFIX*nsymb,1,1);
tx_lev = 0;
@@ -472,7 +428,6 @@ int main(int argc, char **argv)
OFDM_SYMBOL_SIZE_COMPLEX_SAMPLES);
}
-#endif
write_output("txsig0.m","txs0", txdata[0], FRAME_LENGTH_COMPLEX_SAMPLES,1,1);
@@ -655,15 +610,6 @@ int main(int argc, char **argv)
}
-#ifdef IFFT_FPGA
- free(txdataF2[0]);
- free(txdataF2[1]);
- free(txdataF2);
- free(txdata[0]);
- free(txdata[1]);
- free(txdata);
-#endif
-
for (i=0; i<2; i++) {
free(s_re[i]);
free(s_im[i]);
diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c
index 4117ac1a7def96c346d1e934000de3d7a6a07fad..440a5ec5679f755eb17e7b81de76b837647bee9d 100644
--- a/openair1/SIMULATION/LTE_PHY/ulsim.c
+++ b/openair1/SIMULATION/LTE_PHY/ulsim.c
@@ -45,7 +45,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
-#include "MAC_INTERFACE/vars.h"
#include "SCHED/defs.h"
#include "SCHED/vars.h"