commit before merge

cmake_targets/CMakeLists.txt

@@ -1736,6 +1736,9 @@ add_executable(oaisim
   ${s1ap_h}
   ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
+  ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
+  ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
   ${OPENAIR_TARGETS}/SIMU/USER/oaisim_config.c
@@ -1779,6 +1782,9 @@ add_executable(oaisim_nos1
   ${s1ap_h}
   ${x2ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
+  ${OPENAIR_TARGETS}/RT/USER/lte-ue.c
+  ${OPENAIR_TARGETS}/RT/USER/lte-enb.c
+  ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
   ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
   ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
   ${OPENAIR_TARGETS}/SIMU/USER/oaisim_config.c

openair1/PHY/defs.h

@@ -171,6 +171,7 @@ typedef enum {
 } eNB_timing_t;
 
 
+
 typedef struct UE_SCAN_INFO_s {
   /// 10 best amplitudes (linear) for each pss signals
   int32_t amp[3][10];
@@ -310,10 +311,16 @@ typedef struct {
   uint8_t              CC_id;
   /// Last RX timestamp
   openair0_timestamp timestamp_rx;
+  /// pthread attributes for main UE thread
+  pthread_attr_t attr_ue;
+  /// scheduling parameters for main UE thread
+  struct sched_param sched_param_ue;
+  /// pthread descriptor main UE thread
+  pthread_t pthread_ue;
   /// \brief Instance count for synch thread.
   /// \internal This variable is protected by \ref mutex_synch.
   int instance_cnt_synch;
-  /// pthread attributes for prach processing thread
+  /// pthread attributes for synch processing thread
   pthread_attr_t attr_synch;
   /// scheduling parameters for synch thread
   struct sched_param sched_param_synch;
@@ -770,6 +777,9 @@ typedef struct {
   time_stats_t dlsch_tc_intl2_stats;
   time_stats_t tx_prach;
 
+  /// RF and Interface devices per CC
+  openair0_device rfdevice; 
+
 #if ENABLE_RAL
   hash_table_t    *ral_thresholds_timed;
   SLIST_HEAD(ral_thresholds_gen_poll_s, ral_threshold_phy_t) ral_thresholds_gen_polled[RAL_LINK_PARAM_GEN_MAX];

openair1/PHY/extern.h

@@ -111,6 +111,9 @@ extern double p_qam64[8];
 extern double beta1_dlsch[6][MCS_COUNT];
 extern double beta2_dlsch[6][MCS_COUNT];
 
+extern char eNB_functions[5][20];
+extern char eNB_timing[2][20];
+
 
 #endif /*__PHY_EXTERN_H__ */
 

openair1/PHY/vars.h

@@ -139,6 +139,9 @@ double beta2_dlsch[6][MCS_COUNT] = { {2.52163, 0.83231, 0.77472, 1.36536, 1.1682
 
 */
 
+char eNB_functions[5][20]={"eNodeB_3GPP","eNodeB_3GPP_BBU","NGFI_RRU_IF5","NGFI_RRU_IF4","NGFI_RCC_IF4"};
+char eNB_timing[2][20]={"synch_to_ext_device","synch_to_other"};
+
 
 
 #endif /*__PHY_VARS_H__ */

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -3236,99 +3236,3 @@ int phy_procedures_RN_eNB_TX(unsigned char last_slot, unsigned char next_slot, r
   return do_proc;
 }
 #endif
-/*
-void phy_procedures_eNB_lte(unsigned char subframe,PHY_VARS_eNB **eNB,uint8_t abstraction_flag,
-                            relaying_type_t r_type, PHY_VARS_RN *rn)
-{
-#if defined(ENABLE_ITTI)
-  MessageDef   *msg_p;
-  const char   *msg_name;
-  instance_t    instance;
-  unsigned int  Mod_id;
-  int           result;
-#endif
-
-
-  int CC_id=0;
-
-
-  VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX_ENB, eNB[0]->proc[subframe].frame_tx);
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_LTE,1);
-  start_meas(&eNB[0]->phy_proc);
-
-#if defined(ENABLE_ITTI)
-
-  do {
-    // Checks if a message has been sent to PHY sub-task
-    itti_poll_msg (TASK_PHY_ENB, &msg_p);
-
-    if (msg_p != NULL) {
-      msg_name = ITTI_MSG_NAME (msg_p);
-      instance = ITTI_MSG_INSTANCE (msg_p);
-      Mod_id = instance;
-
-      switch (ITTI_MSG_ID(msg_p)) {
-
-        // Messages from eNB app
-      case PHY_CONFIGURATION_REQ:
-        LOG_I(PHY, "[eNB %d] Received %s\n", instance, msg_name);
-        // TODO
-
-        break;
-
-      default:
-        LOG_E(PHY, "[ENB %d] Received unexpected message %s\n", Mod_id, msg_name);
-        break;
-      }
-
-      result = itti_free (ITTI_MSG_ORIGIN_ID(msg_p), msg_p);
-      AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
-    }
-  } while(msg_p != NULL);
-
-#endif
-
-
-  for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    if ((((eNB[CC_id]->frame_parms.frame_type == TDD)&&
-          (subframe_select(&eNB[CC_id]->frame_parms,eNB[CC_id]->proc[0].subframe_tx)==SF_DL))||
-         (eNB[CC_id]->frame_parms.frame_type == FDD))) {
-#ifdef Rel10
-
-      if (phy_procedures_RN_eNB_TX(eNB[CC_id]->proc[0].subframe_rx, eNB[CC_id]->proc[0].subframe_tx, r_type) != 0 )
-#endif
-        phy_procedures_eNB_TX(subframe,eNB[CC_id],abstraction_flag,r_type,rn);
-    }
-
-    if ((((eNB[CC_id]->frame_parms.frame_type == TDD )&&
-          (subframe_select(&eNB[CC_id]->frame_parms,eNB[CC_id]->proc[0].subframe_rx)==SF_UL)) ||
-         (eNB[CC_id]->frame_parms.frame_type == FDD))) {
-      phy_procedures_eNB_RX(subframe,eNB[CC_id],abstraction_flag,r_type);
-    }
-
-    if (subframe_select(&eNB[CC_id]->frame_parms,eNB[CC_id]->proc[0].subframe_tx)==SF_S) {
-#ifdef Rel10
-
-      if (phy_procedures_RN_eNB_TX(subframe, subframe, r_type) != 0 )
-#endif
-        phy_procedures_eNB_TX(subframe,eNB[CC_id],abstraction_flag,r_type,rn);
-    }
-
-    if ((subframe_select(&eNB[CC_id]->frame_parms,eNB[CC_id]->proc[0].subframe_rx)==SF_S)) {
-      phy_procedures_eNB_S_RX(subframe,eNB[CC_id],abstraction_flag,r_type);
-    }
-
-    eNB[CC_id]->proc[0].frame_tx++;
-    eNB[CC_id]->proc[0].frame_rx++;
-
-    if (eNB[CC_id]->proc[0].frame_tx>=MAX_FRAME_NUMBER) // defined in impl_defs_top.h
-      eNB[CC_id]->proc[0].frame_tx-=MAX_FRAME_NUMBER;
-
-    if (eNB[CC_id]->proc[0].frame_rx>=MAX_FRAME_NUMBER)
-      eNB[CC_id]->proc[0].frame_rx-=MAX_FRAME_NUMBER;
-  }
-
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_LTE,0);
-  stop_meas(&eNB[0]->phy_proc);
-}
-*/

openair2/UTIL/OCG/OCG.h

@@ -707,6 +707,8 @@ typedef struct {
   // phy related params
   unsigned int n_frames;
   unsigned int n_frames_flag; // if set, then let the emulation goes to infinity
+  node_function_t node_function[MAX_NUM_CCs];
+  node_timing_t node_timing[MAX_NUM_CCS];
   unsigned char frame_type[MAX_NUM_CCs]; //! LTE frame type (TDD=1, FDD=0). \note this should be converted to \ref lte_frame_type_t (header file reorganization needed)
   char * frame_type_name[MAX_NUM_CCs];
   unsigned char tdd_config[MAX_NUM_CCs];

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf

@@ -23,6 +23,8 @@ eNBs =
 
     component_carriers = (
       {
+        node_function                                         = "eNodeB_3GPP";
+        node_timing                                           = "SYNCH_TO_OTHER";
         frame_type					      = "FDD";
         tdd_config 					      = 3;
         tdd_config_s            			      = 0;

targets/RT/USER/lte-softmodem.c

@@ -119,14 +119,14 @@ unsigned short config_frames[4] = {2,9,11,13};
 
 // In lte-enb.c
 extern int setup_eNB_buffers(PHY_VARS_eNB **phy_vars_eNB, openair0_config_t *openair0_cfg, openair0_rf_map rf_map[MAX_NUM_CCs]);
-extern void init_eNB(eNB_func_t);
+extern void init_eNB(eNB_func_t,int);
 extern void stop_eNB(void);
 extern void kill_eNB_proc(void);
 
 // In lte-ue.c
 extern int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg, openair0_rf_map rf_map[MAX_NUM_CCs]);
 extern void fill_ue_band_info(void);
-extern void init_UE(void);
+extern void init_UE(int);
 
 #ifdef XFORMS
 // current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0)
@@ -284,9 +284,6 @@ eth_params_t *eth_params;
 
 openair0_config_t openair0_cfg[MAX_CARDS];
 
-// Change to openair_global to handle UE
-openair0_device openair0;
-
 double cpuf;
 
 char uecap_xer[1024],uecap_xer_in=0;
@@ -1677,40 +1674,15 @@ int main( int argc, char **argv )
       }
     }
   }
-  /* device host type is set*/
-  openair0.host_type = BBU_HOST;
-  /* device type is initialized NONE_DEV (no RF device) when the RF device will be initiated device type will be set */
-  openair0.type = NONE_DEV;
-  /* transport type is initialized NONE_TP (no transport protocol) when the transport protocol will be initiated transport protocol type will be set */
-  openair0.transp_type = NONE_TP;
-  
-  // Legacy BBU - RRH init  
-  //int returns=-1;
-  ///* BBU can have either a local or a remote radio head */  
-  //if (local_remote_radio == BBU_LOCAL_RADIO_HEAD) { //local radio head active  - load library of radio head and initiate it
-  //if (mode!=loop_through_memory) {
-  //returns=openair0_device_load(&openair0, &openair0_cfg[0]);
-  //printf("openair0_device_init returns %d\n",returns);
-  //if (returns<0) {
-  //printf("Exiting, cannot initialize device\n");
-  //exit(-1);
-  //}
-  //}
-  //else if (mode==loop_through_memory) {    
-  //}
-  //}  else { //remote radio head active - load library of transport protocol and initiate it 
-  //if (mode!=loop_through_memory) {
-  //returns=openair0_transport_load(&openair0, &openair0_cfg[0], eth_params);
-  //printf("openair0_transport_init returns %d\n",returns);
-  //if (returns<0) { 
-  //printf("Exiting, cannot initialize transport protocol\n");
-  //exit(-1);
-  //}
-  //}
-  //else if (mode==loop_through_memory) {    
-  //}
-  //}   
-    
+  else {
+    /* device host type is set*/
+    PHY_vars_UE_g[0][0]->rfdevice.host_type = BBU_HOST;
+    /* device type is initialized NONE_DEV (no RF device) when the RF device will be initiated device type will be set */
+    PHY_vars_UE_g[0][0]->rfdevice.type = NONE_DEV;
+    /* transport type is initialized NONE_TP (no transport protocol) when the transport protocol will be initiated transport protocol type will be set */
+    PHY_vars_UE_g[0][0]->rfdevice.transp_type = NONE_TP;
+  }
+
   int returns=-1;
     
   // Handle spatially distributed MIMO antenna ports   
@@ -1720,7 +1692,7 @@ int main( int argc, char **argv )
       if (mode!=loop_through_memory) {
         returns= (UE_flag == 0) ? 
 	  openair0_device_load(&(PHY_vars_eNB_g[0][CC_id]->rfdevice), &openair0_cfg[0]) :
-	  openair0_device_load(&openair0, &openair0_cfg[0]);
+	  openair0_device_load(&(PHY_vars_UE_g[0][CC_id]->rfdevice), &openair0_cfg[0]);
 
         printf("openair0_device_init returns %d for CC_id %d\n",returns,CC_id);
         if (returns<0) {
@@ -1904,8 +1876,8 @@ int main( int argc, char **argv )
 
 
   // start the main thread
-  if (UE_flag == 1) init_UE();
-  else init_eNB(node_function);
+  if (UE_flag == 1) init_UE(1);
+  else init_eNB(node_function,1);
 
   // Sleep to allow all threads to setup
   sleep(3);
@@ -1978,16 +1950,18 @@ int main( int argc, char **argv )
   pthread_mutex_destroy(&sync_mutex);
 
   // *** Handle per CC_id openair0
-  if (UE_flag==1)
-    openair0.trx_end_func(&openair0);
-
-  for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-    if (PHY_vars_eNB_g[0][CC_id]->rfdevice.trx_end_func)
-      PHY_vars_eNB_g[0][CC_id]->rfdevice.trx_end_func(&PHY_vars_eNB_g[0][CC_id]->rfdevice);  
-    if (PHY_vars_eNB_g[0][CC_id]->ifdevice.trx_end_func)
-      PHY_vars_eNB_g[0][CC_id]->ifdevice.trx_end_func(&PHY_vars_eNB_g[0][CC_id]->ifdevice);  
+  if (UE_flag==1) {
+    if (PHY_vars_UE_g[0][0]->rfdevice.trx_end_func)
+      PHY_vars_UE_g[0][0]->rfdevice.trx_end_func(&PHY_vars_UE_g[0][0]->rfdevice);
+  }
+  else {
+    for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
+      if (PHY_vars_eNB_g[0][CC_id]->rfdevice.trx_end_func)
+	PHY_vars_eNB_g[0][CC_id]->rfdevice.trx_end_func(&PHY_vars_eNB_g[0][CC_id]->rfdevice);  
+      if (PHY_vars_eNB_g[0][CC_id]->ifdevice.trx_end_func)
+	PHY_vars_eNB_g[0][CC_id]->ifdevice.trx_end_func(&PHY_vars_eNB_g[0][CC_id]->ifdevice);  
+    }
   }
-
   if (ouput_vcd)
     VCD_SIGNAL_DUMPER_CLOSE();
 

targets/SIMU/USER/oaisim.c

@@ -61,22 +61,15 @@
 #include "LAYER2/MAC/proto.h"
 #include "LAYER2/MAC/vars.h"
 #include "pdcp.h"
-#ifndef CELLULAR
 #include "RRC/LITE/vars.h"
-#endif
-#include "PHY_INTERFACE/vars.h"
-//#endif
 #include "RRC/NAS/nas_config.h"
 
-#ifdef IFFT_FPGA
-//#include "PHY/LTE_REFSIG/mod_table.h"
-#endif //IFFT_FPGA
 #include "SCHED/defs.h"
 #include "SCHED/vars.h"
 
-//#ifdef XFORMS
+
 #include "PHY/TOOLS/lte_phy_scope.h"
-//#endif
+
 
 #ifdef SMBV
 // Rohde&Schwarz SMBV100A vector signal generator
@@ -143,6 +136,28 @@ channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX][MAX_NUM_CCs];
 //Added for PHY abstraction
 node_desc_t *enb_data[NUMBER_OF_eNB_MAX];
 node_desc_t *ue_data[NUMBER_OF_UE_MAX];
+
+pthread_cond_t sync_cond;
+pthread_mutex_t sync_mutex;
+int sync_var;
+
+
+openair0_config_t openair0_cfg[MAX_CARDS];
+uint32_t          downlink_frequency[MAX_NUM_CCs][4];
+int32_t           uplink_frequency_offset[MAX_NUM_CCs][4];
+openair0_rf_map rf_map[MAX_NUM_CCs];
+
+#if defined(ENABLE_ITTI)
+volatile int             start_eNB = 0;
+volatile int             start_UE = 0;
+#endif
+volatile int                    oai_exit = 0;
+
+
+//int32_t **rxdata;
+//int32_t **txdata;
+
+
 // Added for PHY abstraction
 extern node_list* ue_node_list;
 extern node_list* enb_node_list;
@@ -164,6 +179,9 @@ extern uint16_t Nid_cell;
 
 extern LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs];
 
+extern Enb_properties_array_t enb_properties;
+
+
 //#ifdef XFORMS
 int otg_enabled;
 int xforms=0;
@@ -728,23 +746,32 @@ l2l1_task (void *args_p)
 #endif
 
 	    CC_id=0;
-	    PHY_vars_eNB_g[eNB_inst][CC_id]->proc.frame_rx                     = frame;
-	    PHY_vars_eNB_g[eNB_inst][CC_id]->proc.subframe_rx                  = sf;
-	    PHY_vars_eNB_g[eNB_inst][CC_id]->proc.proc_rxtx[sf&1].frame_rx    = frame;
-	    PHY_vars_eNB_g[eNB_inst][CC_id]->proc.proc_rxtx[sf&1].subframe_rx = sf;
-	    PHY_vars_eNB_g[eNB_inst][CC_id]->proc.proc_rxtx[sf&1].subframe_tx = (sf+4)%10;
-	    PHY_vars_eNB_g[eNB_inst][CC_id]->proc.proc_rxtx[sf&1].frame_tx    = (sf<6) ? frame : frame+1;
-	    phy_procedures_eNB_common_RX(PHY_vars_eNB_g[eNB_inst][CC_id],
-					 abstraction_flag);
-	    phy_procedures_eNB_uespec_RX(PHY_vars_eNB_g[eNB_inst][CC_id],
-					 &PHY_vars_eNB_g[eNB_inst][CC_id]->proc.proc_rxtx[sf&1],
-					 abstraction_flag,
-					 no_relay);
-	    phy_procedures_eNB_TX(PHY_vars_eNB_g[eNB_inst][CC_id],
-				  &PHY_vars_eNB_g[eNB_inst][CC_id]->proc.proc_rxtx[sf&1],
-				  0,no_relay,NULL);
-
-
+	    // trigger synch event to RAN FH thread for CC_id
+	    eNB_proc_t *proc =  &PHY_vars_eNB_g[eNB_inst][CC_id]->proc;
+
+
+	    if (pthread_mutex_lock(&proc->mutex_FH) != 0) {
+	      LOG_E( PHY, "error locking mutex for FH\n");
+	      exit_fun( "error locking mutex" );
+	      break;
+	    }	    
+	    int cnt_FH       = ++proc->instance_cnt_FH;
+	    proc->frame_rx    = frame;
+            proc->subframe_rx = sf;
+	    proc->timestamp_rx += PHY_vars_eNB_g[eNB_inst][CC_id]->frame_parms.samples_per_tti;
+
+	    if (proc->instance_cnt_FH == 0) {
+	      if (pthread_cond_signal(&proc->cond_FH) != 0) {
+		LOG_E(PHY,"ERROR pthread_cond_signal for eNB FH CCid %d\n",proc->CC_id);
+		exit_fun("ERROR pthread_cond_signal");
+		break;
+	      }
+	    }
+	    else {
+	      LOG_W(PHY,"[eNB] Frame %d, FH CC_id %d thread busy!! (cnt_FH %d)\n",proc->instance_cnt_FH);
+	      exit_fun("FH thread busy");
+              break;
+	    }
 #ifdef PRINT_STATS
 
             if((sf==9) && frame%10==0)
@@ -780,109 +807,9 @@ l2l1_task (void *args_p)
         log_set_instance_type (LOG_INSTANCE_UE);
 #endif
 
+	/*
 	clear_UE_transport_info (oai_emulation.info.nb_ue_local);
 
-        for (UE_inst = oai_emulation.info.first_ue_local;
-             (UE_inst < (oai_emulation.info.first_ue_local + oai_emulation.info.nb_ue_local));
-             UE_inst++) {
-          if (oai_emulation.info.cli_start_ue[UE_inst] != 0) {
-#if defined(ENABLE_ITTI) && defined(ENABLE_USE_MME)
-
-#else
-
-            if (frame >= (UE_inst * 20)) // activate UE only after 20*UE_id frames so that different UEs turn on separately
-#endif
-	      { // UE_PROCEDURES
-		LOG_D(EMU,
-		      "PHY procedures UE %d for frame %d, subframe %d\n",
-		      UE_inst, frame % MAX_FRAME_NUMBER, sf);
-
-		if (PHY_vars_UE_g[UE_inst][0]->UE_mode[0]
-		    != NOT_SYNCHED) {
-		  if (frame > 0) {
-		    PHY_vars_UE_g[UE_inst][0]->proc.proc_rxtx[sf&1].frame_rx    = frame % MAX_FRAME_NUMBER;
-		    PHY_vars_UE_g[UE_inst][0]->proc.proc_rxtx[sf&1].subframe_rx = sf;
-		    PHY_vars_UE_g[UE_inst][0]->proc.proc_rxtx[sf&1].frame_tx    = ((sf<6) ? frame : frame+1)% MAX_FRAME_NUMBER;
-		    PHY_vars_UE_g[UE_inst][0]->proc.proc_rxtx[sf&1].subframe_tx = (sf+4)%10;
-
-#ifdef OPENAIR2
-		    //Application
-		    update_otg_UE (UE_inst, oai_emulation.info.time_ms);
-
-		    //Access layer
-		    PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, UE_inst, 0, ENB_FLAG_NO, NOT_A_RNTI, frame % MAX_FRAME_NUMBER, sf);
-		    pdcp_run (&ctxt);
-#endif
-
-		    for (CC_id = 0; CC_id < MAX_NUM_CCs;
-			 CC_id++) {
-		      phy_procedures_UE_RX(PHY_vars_UE_g[UE_inst][CC_id],
-					   &PHY_vars_UE_g[UE_inst][CC_id]->proc.proc_rxtx[sf&1],
-					   0, abstraction_flag,
-					   normal_txrx, no_relay,
-					   NULL);
-		      phy_procedures_UE_TX(PHY_vars_UE_g[UE_inst][CC_id],
-					   &PHY_vars_UE_g[UE_inst][CC_id]->proc.proc_rxtx[sf&1],
-					   0,
-					   abstraction_flag,
-					   normal_txrx,
-					   no_relay);
-		    }
-
-		    ue_data[UE_inst]->tx_power_dBm =
-		      PHY_vars_UE_g[UE_inst][0]->tx_power_dBm;
-		  }
-		} else {
-		  if (abstraction_flag == 1) {
-		    LOG_E(EMU,
-			  "sync not supported in abstraction mode (UE%d,mode%d)\n",
-			  UE_inst,
-			  PHY_vars_UE_g[UE_inst][0]->UE_mode[0]);
-		    exit (-1);
-		  }
-
-		  if ((frame > 0)
-		      && (sf==9)){
-
-		    initial_sync (PHY_vars_UE_g[UE_inst][0],
-				  normal_txrx);
-
-		    /*
-		      write_output("dlchan00.m","dlch00",&(PHY_vars_UE_g[0]->common_vars.dl_ch_estimates[0][0][0]),(6*(PHY_vars_UE_g[0]->frame_parms.ofdm_symbol_size)),1,1);
-		      if (PHY_vars_UE_g[0]->frame_parms.nb_antennas_rx>1)
-		      write_output("dlchan01.m","dlch01",&(PHY_vars_UE_g[0]->common_vars.dl_ch_estimates[0][1][0]),(6*(PHY_vars_UE_g[0]->frame_parms.ofdm_symbol_size)),1,1);
-		      write_output("dlchan10.m","dlch10",&(PHY_vars_UE_g[0]->common_vars.dl_ch_estimates[0][2][0]),(6*(PHY_vars_UE_g[0]->frame_parms.ofdm_symbol_size)),1,1);
-		      if (PHY_vars_UE_g[0]->frame_parms.nb_antennas_rx>1)
-		      write_output("dlchan11.m","dlch11",&(PHY_vars_UE_g[0]->common_vars.dl_ch_estimates[0][3][0]),(6*(PHY_vars_UE_g[0]->frame_parms.ofdm_symbol_size)),1,1);
-		      write_output("rxsig.m","rxs",PHY_vars_UE_g[0]->common_vars.rxdata[0],PHY_vars_UE_g[0]->frame_parms.samples_per_tti*10,1,1);
-		      write_output("rxsigF.m","rxsF",PHY_vars_UE_g[0]->common_vars.rxdataF[0],2*PHY_vars_UE_g[0]->frame_parms.symbols_per_tti*PHY_vars_UE_g[0]->frame_parms.ofdm_symbol_size,2,1);
-		      write_output("pbch_rxF_ext0.m","pbch_ext0",PHY_vars_UE_g[0]->lte_ue_pbch_vars[0]->rxdataF_ext[0],6*12*4,1,1);
-		      write_output("pbch_rxF_comp0.m","pbch_comp0",PHY_vars_UE_g[0]->lte_ue_pbch_vars[0]->rxdataF_comp[0],6*12*4,1,1);
-		      write_output("pbch_rxF_llr.m","pbch_llr",PHY_vars_UE_g[0]->lte_ue_pbch_vars[0]->llr,(frame_parms->Ncp==0) ? 1920 : 1728,1,4);
-		    */
-		  }
-		}
-
-#ifdef PRINT_STATS
-
-		if((sf==1) && frame%10==0) {
-		  if (UE_stats_th[UE_inst]) {
-		    fprintf(UE_stats_th[UE_inst],"%d %d\n",frame % MAX_FRAME_NUMBER, PHY_vars_UE_g[UE_inst][0]->bitrate[0]/1000);
-		  }
-		}
-
-		if (UE_stats[UE_inst]) {
-		  len = dump_ue_stats (PHY_vars_UE_g[UE_inst][0], &PHY_vars_UE_g[UE_inst][0]->proc.proc_rxtx[sf&1],stats_buffer, 0, normal_txrx, 0);
-		  rewind (UE_stats[UE_inst]);
-		  fwrite (stats_buffer, 1, len, UE_stats[UE_inst]);
-		  fflush(UE_stats[UE_inst]);
-		}
-
-#endif
-	      } // UE_PROCEDURES
-          }
-        } // UE_inst
-
         emu_transport (frame % MAX_FRAME_NUMBER, sf<<1, ((sf+4)%10)<<1, subframe_select(&PHY_vars_eNB_g[0][0]->frame_parms,sf),
                        oai_emulation.info.frame_type[0], ethernet_flag);
 
@@ -942,6 +869,7 @@ l2l1_task (void *args_p)
 	
 	stop_meas (&ul_chan_stats);
 
+	*/
 
 	if ((sf == 0) && ((frame % MAX_FRAME_NUMBER) == 0) && (abstraction_flag == 0)
 	    && (oai_emulation.info.n_frames == 1)) {
@@ -1200,7 +1128,7 @@ main (int argc, char **argv)
 
   // oai performance profiler is enabled
   if (oai_emulation.info.opp_enabled == 1)
-    reset_opp_meas ();
+    reset_opp_meas_oaisim ();
 
   init_time ();
 
@@ -1242,7 +1170,7 @@ main (int argc, char **argv)
 }
 
 void
-reset_opp_meas (void)
+reset_opp_meas_oaisim (void)
 {
   uint8_t eNB_id = 0, UE_id = 0;
 
@@ -1383,7 +1311,7 @@ reset_opp_meas (void)
 }
 
 void
-print_opp_meas (void)
+print_opp_meas_oaisim (void)
 {
 
   uint8_t eNB_id = 0, UE_id = 0;
@@ -1687,7 +1615,7 @@ oai_shutdown (void)
     kpi_gen ();
   }
   if (oai_emulation.info.opp_enabled == 1)
-    print_opp_meas ();
+    print_opp_meas_oaisim ();
 
   // relase all rx state
   if (ethernet_flag == 1) {

targets/SIMU/USER/oaisim_functions.c

@@ -772,12 +772,13 @@ void get_simulation_options(int argc, char *argv[])
     AssertFatal (oai_emulation.info.nb_enb_local <= enb_properties->number,
                  "Number of eNB is greater than eNB defined in configuration file %s (%d/%d)!",
                  conf_config_file_name, oai_emulation.info.nb_enb_local, enb_properties->number);
-
+    
     /* Update some simulation parameters */
     oai_emulation.info.frame_type[0] =           enb_properties->properties[0]->frame_type[0];
     oai_emulation.info.tdd_config[0] =           enb_properties->properties[0]->tdd_config[0];
     oai_emulation.info.tdd_config_S[0] =         enb_properties->properties[0]->tdd_config_s[0];
     oai_emulation.info.extended_prefix_flag[0] = enb_properties->properties[0]->prefix_type[0];
+
   }
 
   free(conf_config_file_name);
@@ -1016,23 +1017,26 @@ void init_openair1(void)
       } else {
         PHY_vars_eNB_g[eNB_id][CC_id]->N_TA_offset = 0;
       }
-    }
-  }
+    } // eNB_id
+  } // CC_id
 
-  for (eNB_id=0; eNB_id<NB_eNB_INST; eNB_id++)
+  for (eNB_id=0; eNB_id<NB_eNB_INST; eNB_id++) {
     for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
       if (phy_test==1)
 	PHY_vars_eNB_g[eNB_id][CC_id]->mac_enabled=0;
       else
 	PHY_vars_eNB_g[eNB_id][CC_id]->mac_enabled=1;
     }
+  }
+
+   init_eNB(eNodeB_3GPP,NB_eNB_INST);
 
   // init_ue_status();
-  for (UE_id=0; UE_id<NB_UE_INST; UE_id++)
+  for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
     for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-
+      
       PHY_vars_UE_g[UE_id][CC_id]->tx_power_max_dBm=23;
-
+      
       PHY_vars_UE_g[UE_id][CC_id]->rx_total_gain_dB=100;
 
       // update UE_mode for each eNB_id not just 0
@@ -1065,8 +1069,10 @@ void init_openair1(void)
 
 #endif
 
+    } // CC_id
+  } // UE_id
+  init_UE(NB_UE_INST);
     }
-}
 
 void init_openair2(void)
 {