Merge branch 'develop' into iqfixes_nrue

openair1/SIMULATION/LTE_PHY/dlsim.c

@@ -49,7 +49,6 @@
 #include "PHY/MODULATION/modulation_common.h"
 #include "PHY/MODULATION/modulation_eNB.h"
 #include "PHY/MODULATION/modulation_UE.h"
-#include "PHY/TOOLS/lte_phy_scope.h"
 #include "SCHED/sched_eNB.h"
 #include "SCHED_UE/sched_UE.h"
 #include "SIMULATION/TOOLS/sim.h"
@@ -493,7 +492,6 @@ int test_perf=0;
 int n_frames;
 int n_ch_rlz = 1;
 int rx_sample_offset = 0;
-int xforms=0;
 int dump_table=0;
 int loglvl=OAILOG_INFO;
 int mcs1=0,mcs2=0,mcs_i=0,dual_stream_UE = 0,awgn_flag=0;
@@ -565,8 +563,6 @@ int main(int argc, char **argv) {
   short *uncoded_ber_bit=NULL;
   int osf=1;
   frame_t frame_type = FDD;
-  FD_lte_phy_scope_ue *form_ue = NULL;
-  char title[255];
   int numCCE=0;
   //int dci_length_bytes=0,dci_length=0;
   //double channel_bandwidth = 5.0, sampling_rate=7.68;
@@ -679,7 +675,6 @@ int main(int argc, char **argv) {
     { "uEdual", "Enables the Interference Aware Receiver for TM5 (default is normal receiver)",0, iptr:NULL,  defintval:0, TYPE_INT, 0 },
     { "xTransmission","Transmission mode (1,2,6,7 for the moment)",0, iptr:NULL,  defintval:25, TYPE_INT, 0 },
     { "yn_tx_phy","Number of TX antennas used in eNB",0, iptr:NULL,  defintval:25, TYPE_INT, 0 },
-    { "XForms", "Display the soft scope", PARAMFLAG_BOOL, iptr:&xforms,  defintval:0, TYPE_INT, 0 },
     { "Yperfect_ce","Perfect CE", PARAMFLAG_BOOL, iptr:&perfect_ce,  defintval:0, TYPE_INT, 0 },
     { "Zdump", "dump table",PARAMFLAG_BOOL,  iptr:&dump_table, defintval:0, TYPE_INT, 0 },
     { "Loglvl", "log level",0, iptr:&loglvl,  defintval:OAILOG_INFO, TYPE_INT, 0 },
@@ -952,24 +947,6 @@ int main(int argc, char **argv) {
     AssertFatal(NB_RB <= N_RB_DL,"illegal NB_RB %d\n",NB_RB);
   }
 
-  if (xforms==1) {
-    fl_initialize (&argc, argv, NULL, 0, 0);
-    form_ue = create_lte_phy_scope_ue();
-    sprintf (title, "LTE PHY SCOPE eNB");
-    fl_show_form (form_ue->lte_phy_scope_ue, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
-
-    if (!dual_stream_UE==0) {
-      if (UE) {
-        UE->use_ia_receiver = 1;
-        fl_set_button(form_ue->button_0,1);
-        fl_set_object_label(form_ue->button_0, "IA Receiver ON");
-        fl_set_object_color(form_ue->button_0, FL_GREEN, FL_GREEN);
-      } else {
-        printf("UE  is NULL\n");
-        exit(-1);
-      }
-    }
-  }
 
   if (transmission_mode==5) {
     n_users = 2;
@@ -1792,13 +1769,6 @@ int main(int argc, char **argv) {
             //      UE->dlsch[UE->current_thread_id[subframe]][0][0]->harq_processes[0]->round++;
           }
 
-          if (xforms==1) {
-            phy_scope_UE(form_ue,
-                         UE,
-                         eNB_id,
-                         0,// UE_id
-                         subframe);
-          }
 
           UE->proc.proc_rxtx[UE->current_thread_id[subframe]].frame_rx++;
         }  //round

openair1/SIMULATION/LTE_PHY/ulsim.c

@@ -42,7 +42,6 @@
 #include "PHY/INIT/phy_init.h"
 #include "PHY/LTE_TRANSPORT/transport_proto.h"
 #include "PHY/LTE_UE_TRANSPORT/transport_proto_ue.h"
-#include "PHY/TOOLS/lte_phy_scope.h"
 #include "SCHED/sched_eNB.h"
 #include "SCHED_UE/sched_UE.h"
 #include "SIMULATION/TOOLS/sim.h"
@@ -69,18 +68,15 @@ double cpuf;
 #include <openair1/SIMULATION/LTE_PHY/common_sim.h>
 channel_desc_t *eNB2UE[NUMBER_OF_eNB_MAX][NUMBER_OF_UE_MAX];
 channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX];
-//Added for PHY abstractionopenair1/PHY/TOOLS/lte_phy_scope.h
 node_desc_t *enb_data[NUMBER_OF_eNB_MAX];
 node_desc_t *ue_data[NUMBER_OF_UE_MAX];
 //double sinr_bler_map[MCS_COUNT][2][16];
 
 extern uint16_t beta_ack[16],beta_ri[16],beta_cqi[16];
 //extern  char* namepointer_chMag ;
-int xforms=0;
 THREAD_STRUCT thread_struct;
 nfapi_ue_release_request_body_t release_rntis;
 
-FD_lte_phy_scope_enb *form_enb;
 char title[255];
 
 /*the following parameters are used to control the processing times*/
@@ -435,7 +431,6 @@ int main(int argc, char **argv) {
     { "delay_chan", "Channel delay",0, iptr:&delay,  defintval:0, TYPE_INT, 0 },
     { "Doppler", "Maximum doppler shift",0, dblptr:&maxDoppler,  defdblval:0.0, TYPE_DOUBLE, 0 },
     { "Zdump", "dump table",PARAMFLAG_BOOL,  iptr:&dump_table, defintval:0, TYPE_INT, 0 },
-    { "Forms", "Display the soft scope", PARAMFLAG_BOOL, iptr:&xforms,  defintval:0, TYPE_INT, 0 },
     { "Lparallel", "Enable parallel execution",0, strptr:NULL,  defstrval:NULL, TYPE_STRING,  0 },
     { "Iterations", "Number of iterations of turbo decoder", 0, iptr:&max_turbo_iterations,  defintval:4, TYPE_INT, 0 },
     { "Performance", "Display CPU perfomance of each L1 piece", PARAMFLAG_BOOL,  iptr:NULL,  defintval:0, TYPE_INT, 0 },
@@ -695,13 +690,6 @@ int main(int argc, char **argv) {
     fprintf(csv_fdUL,"data_all%d=[",mcs);
   }
 
-  if (xforms==1) {
-    fl_initialize (&argc, argv, NULL, 0, 0);
-    form_enb = create_lte_phy_scope_enb();
-    sprintf (title, "LTE PHY SCOPE eNB");
-    fl_show_form (form_enb->lte_phy_scope_enb, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
-  }
-
   UE->pdcch_vars[0][0]->crnti = 14;
   UE->frame_parms.soundingrs_ul_config_common.enabled_flag = srs_flag;
   UE->frame_parms.soundingrs_ul_config_common.srs_BandwidthConfig = 2;
@@ -1265,9 +1253,6 @@ int main(int argc, char **argv) {
         if ((errs[0]>=100) && (trials>(n_frames/2)))
           break;
 
-        if (xforms==1)
-          phy_scope_eNB(form_enb,eNB,0);
-
         double t_tx = inMicroS(UE->phy_proc_tx.p_time);
         double t_tx_ifft = inMicroS(UE->ofdm_mod_stats.p_time);
         double t_tx_mod = inMicroS(UE->ulsch_modulation_stats.p_time);