Allow basic_simulator on different system (use TCPBRIDGE environment var to...

Allow basic_simulator on different system (use TCPBRIDGE environment var to "enb" or the ip address of the eNodeB for the UE), allow hw_timing_advance to be set via -A option on UE.

openair1/PHY/LTE_TRANSPORT/prach_common.c

@@ -544,12 +544,12 @@ int is_prach_subframe0(LTE_DL_FRAME_PARMS *frame_parms,uint8_t prach_ConfigIndex
     t0_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t0_ra;
     t1_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t1_ra;
     t2_ra = tdd_preamble_map[prach_ConfigIndex][tdd_config].map[0].t2_ra;
-#ifdef PRACH_DEBUG
-    LOG_I(PHY,"[PRACH] Checking for PRACH format (ConfigIndex %d) in TDD subframe %d (%d,%d,%d)\n",
-          prach_ConfigIndex,
-          subframe,
-          t0_ra,t1_ra,t2_ra);
-#endif
+    if( LOG_DEBUGFLAG(DEBUG_PRACH)) {
+      LOG_I(PHY,"[PRACH] Checking for PRACH format (ConfigIndex %d) in TDD subframe %d (%d,%d,%d)\n",
+            prach_ConfigIndex,
+            subframe,
+            t0_ra,t1_ra,t2_ra);
+    }
 
     if ((((t0_ra == 1) && ((frame &1)==0))||  // frame is even and PRACH is in even frames
          ((t0_ra == 2) && ((frame &1)==1))||  // frame is odd and PRACH is in odd frames
@@ -601,9 +601,9 @@ void compute_prach_seq(uint16_t rootSequenceIndex,
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_UE_COMPUTE_PRACH, VCD_FUNCTION_IN);
 
-#ifdef PRACH_DEBUG
-  LOG_I(PHY,"compute_prach_seq: NCS_config %d, prach_fmt %d\n",zeroCorrelationZoneConfig, prach_fmt);
-#endif
+  if ( LOG_DEBUGFLAG(DEBUG_PRACH)) {
+    LOG_I(PHY,"compute_prach_seq: NCS_config %d, prach_fmt %d\n",zeroCorrelationZoneConfig, prach_fmt);
+  }
 
   AssertFatal(prach_fmt<4,
 	      "PRACH sequence is only precomputed for prach_fmt<4 (have %"PRIu8")\n", prach_fmt );
@@ -618,15 +618,15 @@ void compute_prach_seq(uint16_t rootSequenceIndex,
   }
 
 
-#ifdef PRACH_DEBUG
-  LOG_I( PHY, "compute_prach_seq: done init prach_tables\n" );
-#endif
+  if (LOG_DEBUGFLAG(DEBUG_PRACH)) {
+    LOG_I( PHY, "compute_prach_seq: done init prach_tables\n" );
+  }
 
   if (highSpeedFlag== 0) {
 
-#ifdef PRACH_DEBUG
-    LOG_I(PHY,"Low speed prach : NCS_config %d\n",zeroCorrelationZoneConfig);
-#endif
+    if ( LOG_DEBUGFLAG(DEBUG_PRACH)) {
+      LOG_I(PHY,"Low speed prach : NCS_config %d\n",zeroCorrelationZoneConfig);
+    }
 
     AssertFatal(zeroCorrelationZoneConfig<=15,
 		"FATAL, Illegal Ncs_config for unrestricted format %"PRIu8"\n", zeroCorrelationZoneConfig );
@@ -639,9 +639,9 @@ void compute_prach_seq(uint16_t rootSequenceIndex,
     preamble_offset = 0;
   } else {
 
-#ifdef PRACH_DEBUG
-    LOG_I( PHY, "high speed prach : NCS_config %"PRIu8"\n", zeroCorrelationZoneConfig );
-#endif
+    if ( LOG_DEBUGFLAG(DEBUG_PRACH)) {
+      LOG_I( PHY, "high speed prach : NCS_config %"PRIu8"\n", zeroCorrelationZoneConfig );
+    }
 
     AssertFatal(zeroCorrelationZoneConfig<=14,
 		"FATAL, Illegal Ncs_config for restricted format %"PRIu8"\n", zeroCorrelationZoneConfig );
@@ -695,13 +695,12 @@ void compute_prach_seq(uint16_t rootSequenceIndex,
     }
   }
 
-#ifdef PRACH_DEBUG
+  if ( LOG_DEBUGFLAG(DEBUG_PRACH)) {
 
-  if (NCS>0)
-    LOG_I( PHY, "Initializing %u preambles for PRACH (NCS_config %"PRIu8", NCS %u, N_ZC/NCS %u)\n",
-           num_preambles, zeroCorrelationZoneConfig, NCS, N_ZC/NCS );
-
-#endif
+    if (NCS>0)
+      LOG_I( PHY, "Initializing %u preambles for PRACH (NCS_config %"PRIu8", NCS %u, N_ZC/NCS %u)\n",
+             num_preambles, zeroCorrelationZoneConfig, NCS, N_ZC/NCS );
+  }
 
   for (i=0; i<num_preambles; i++) {
     int index = (rootSequenceIndex+i+preamble_offset) % N_ZC;
@@ -747,25 +746,13 @@ void init_prach_tables(int N_ZC)
         ZC_inv[i] = m;
         break;
       }
-
-#ifdef PRACH_DEBUG
-
-    if (i<16)
-      printf("i %d : inv %d\n",i,ZC_inv[i]);
-
-#endif
   }
 
   // Compute quantized roots of unity
   for (i=0; i<N_ZC; i++) {
     ru[i<<1]     = (int16_t)(floor(32767.0*cos(2*M_PI*(double)i/N_ZC)));
     ru[1+(i<<1)] = (int16_t)(floor(32767.0*sin(2*M_PI*(double)i/N_ZC)));
-#ifdef PRACH_DEBUG
 
-    if (i<16)
-      printf("i %d : runity %d,%d\n",i,ru[i<<1],ru[1+(i<<1)]);
-
-#endif
   }
 }
 

openair1/PHY/LTE_TRANSPORT/prach_extern.h

@@ -33,8 +33,7 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/phy_extern.h"
 
-//#define PRACH_DEBUG 1
-//#define PRACH_WRITE_OUTPUT_DEBUG 1
+
 
 extern uint16_t NCS_unrestricted[16];
 extern uint16_t NCS_restricted[15];

openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c

@@ -41,7 +41,7 @@
 
 #include "../LTE_TRANSPORT/prach_extern.h"
 
-//#define PRACH_DEBUG 1
+
 
 int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint16_t Nf )
 {
@@ -84,13 +84,13 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
 
 #if defined(EXMIMO) || defined(OAI_USRP)
   prach_start =  (ue->rx_offset+subframe*ue->frame_parms.samples_per_tti-ue->hw_timing_advance-ue->N_TA_offset);
-#ifdef PRACH_DEBUG
+  if ( LOG_DEBUGFLAG(DEBUG_PRACH)) {
     LOG_I(PHY,"[UE %d] prach_start %d, rx_offset %d, hw_timing_advance %d, N_TA_offset %d\n", ue->Mod_id,
         prach_start,
         ue->rx_offset,
         ue->hw_timing_advance,
         ue->N_TA_offset);
-#endif
+  }
 
   if (prach_start<0)
     prach_start+=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
@@ -167,9 +167,9 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
     preamble_shift *= NCS;
   } else { // This is the high-speed case
 
-#ifdef PRACH_DEBUG
-    LOG_I(PHY,"[UE %d] High-speed mode, NCS_config %d\n",ue->Mod_id,Ncs_config);
-#endif
+    if (LOG_DEBUGFLAG(DEBUG_PRACH)) {
+       LOG_I(PHY,"[UE %d] High-speed mode, NCS_config %d\n",ue->Mod_id,Ncs_config);
+    }
 
     not_found = 1;
     preamble_index0 = preamble_index;
@@ -226,14 +226,14 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
   }
 
   // now generate PRACH signal
-#ifdef PRACH_DEBUG
+  if (LOG_DEBUGFLAG(DEBUG_PRACH)) {
 
-  if (NCS>0)
-    LOG_I(PHY,"Generate PRACH for RootSeqIndex %d, Preamble Index %d, NCS %d (NCS_config %d, N_ZC/NCS %d) n_ra_prb %d: Preamble_offset %d, Preamble_shift %d\n",
-          rootSequenceIndex,preamble_index,NCS,Ncs_config,N_ZC/NCS,n_ra_prb,
-          preamble_offset,preamble_shift);
+    if (NCS>0)
+      LOG_I(PHY,"Generate PRACH for RootSeqIndex %d, Preamble Index %d, NCS %d (NCS_config %d, N_ZC/NCS %d) n_ra_prb %d: Preamble_offset %d, Preamble_shift %d\n",
+            rootSequenceIndex,preamble_index,NCS,Ncs_config,N_ZC/NCS,n_ra_prb,
+            preamble_offset,preamble_shift);
 
-#endif
+  }
 
   //  nsymb = (frame_parms->Ncp==0) ? 14:12;
   //  subframe_offset = (unsigned int)frame_parms->ofdm_symbol_size*subframe*nsymb;
@@ -524,12 +524,12 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
   
 
   
-#if defined(PRACH_WRITE_OUTPUT_DEBUG)
-  LOG_M("prach_txF0.m","prachtxF0",prachF,prach_len-Ncp,1,1);
-  LOG_M("prach_tx0.m","prachtx0",prach+(Ncp<<1),prach_len-Ncp,1,1);
-  LOG_M("txsig.m","txs",(int16_t*)(&ue->common_vars.txdata[0][0]),2*ue->frame_parms.samples_per_tti,1,1);
-  exit(-1);
-#endif
+  if (LOG_DUMPFLAG(DEBUG_PRACH)) {
+    LOG_M("prach_txF0.m","prachtxF0",prachF,prach_len-Ncp,1,1);
+    LOG_M("prach_tx0.m","prachtx0",prach+(Ncp<<1),prach_len-Ncp,1,1);
+    LOG_M("txsig.m","txs",(int16_t*)(&ue->common_vars.txdata[0][0]),2*ue->frame_parms.samples_per_tti,1,1);
+    exit(-1);
+  }
 
   return signal_energy( (int*)prach, 256 );
 }

targets/RT/USER/lte-softmodem.h

@@ -127,11 +127,12 @@
 #define CMDLINE_DUMPMEMORY_IDX                  7
 /*------------------------------------------------------------------------------------------------------------------------------------------*/
 
-
+#define START_MSC          softmodem_params.start_msc
 /*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
 /*                                            command line parameters specific to UE                                                                     */
 /*   optname                     helpstr             paramflags                      XXXptr                  defXXXval            type          numelt   */
 /*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
+
 #define CMDLINE_UEPARAMS_DESC {  \
 {"siml1",                      CONFIG_HLP_SIML1,       PARAMFLAG_BOOL,  iptr:&simL1flag,                    defintval:0,          TYPE_INT,      0},   \
 {"U",			       CONFIG_HLP_NUMUE,       0,               u8ptr:&NB_UE_INST,                  defuintval:1,         TYPE_UINT,     0},   \
@@ -152,7 +153,8 @@
 {"mmapped-dma",                CONFIG_HLP_DMAMAP,      PARAMFLAG_BOOL,  uptr:&mmapped_dma,                  defintval:0,          TYPE_INT,      0},   \
 {"clock",                      CONFIG_HLP_CLK,         0,               uptr:&clock_source,                 defintval:0,          TYPE_UINT,     0},   \
 {"s" ,                         CONFIG_HLP_SNR,         0,               iptr:&snr_dB,                       defintval:25,         TYPE_INT,      0},   \
-{"T" ,                         CONFIG_HLP_TDD,         PARAMFLAG_BOOL,  iptr:&tddflag,                      defintval:0,          TYPE_INT,      0}    \
+{"T" ,                         CONFIG_HLP_TDD,         PARAMFLAG_BOOL,  iptr:&tddflag,                      defintval:0,          TYPE_INT,      0},   \
+{"A",                          CONFIG_HLP_TADV,        0,               iptr:&(timingadv),                    defintval:0,          TYPE_INT,      0}    \
 }
 
 /*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -251,6 +253,7 @@ typedef struct {
    unsigned int   start_msc;
    int            nonbiotflag;
    uint32_t       clock_source;
+   int            hw_timing_advance;
 } softmodem_params_t;
 
 #define SOFTMODEM_NOS1            ( get_softmodem_optmask() & SOFTMODEM_NOS1_BIT)

targets/RT/USER/lte-ue.c

@@ -58,7 +58,7 @@
 #include "UTIL/MATH/oml.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
-
+#include "lte-softmodem.h"
 #include "common/config/config_userapi.h"
 #include "T.h"
 
@@ -188,7 +188,7 @@ PHY_VARS_UE* init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms,
     memcpy(&(ue->frame_parms), frame_parms, sizeof(LTE_DL_FRAME_PARMS));
   }
 
-
+  ue->hw_timing_advance=get_softmodem_params()->hw_timing_advance;
   ue->Mod_id      = UE_id;
   ue->mac_enabled = 1;
 
@@ -200,7 +200,6 @@ PHY_VARS_UE* init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms,
       // intialize transport
       init_lte_ue_transport(ue,abstraction_flag);
     }
-
   return(ue);
 }
 

targets/RT/USER/lte-uesoftmodem.c

@@ -34,9 +34,6 @@
 #define _GNU_SOURCE             /* See feature_test_macros(7) */
 #include <sched.h>
 
-
-#include "T.h"
-
 #include "rt_wrapper.h"
 
 
@@ -76,8 +73,6 @@
 #include "UTIL/MATH/oml.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"
-//#include "enb_config.h"
-//#include "PHY/TOOLS/time_meas.h"
 
 #ifndef OPENAIR2
 #include "UTIL/OTG/otg_vars.h"
@@ -208,8 +203,7 @@ extern void get_uethreads_params(void);
 
 int transmission_mode=1;
 
-char *parallel_config = NULL;
-char *worker_config = NULL;
+
 
 char* usrp_args=NULL;
 char* usrp_clksrc=NULL;
@@ -465,7 +459,7 @@ static void get_options(void) {
   int tddflag;
   char *loopfile=NULL;
   int dumpframe;
-
+  int timingadv;
 
   set_default_frame_parms(frame_parms);
   CONFIG_SETRTFLAG(CONFIG_NOEXITONHELP); 
@@ -485,7 +479,7 @@ static void get_options(void) {
       input_fd = fopen(loopfile,"r");
       AssertFatal(input_fd != NULL,"Please provide a valid input file\n");
   }
-
+  get_softmodem_params()->hw_timing_advance = timingadv;
   if ( (cmdline_uemodeparams[CMDLINE_CALIBUERX_IDX].paramflags &  PARAMFLAG_PARAMSET) != 0) mode = rx_calib_ue;
   if ( (cmdline_uemodeparams[CMDLINE_CALIBUERXMED_IDX].paramflags &  PARAMFLAG_PARAMSET) != 0) mode = rx_calib_ue_med;
   if ( (cmdline_uemodeparams[CMDLINE_CALIBUERXBYP_IDX].paramflags &  PARAMFLAG_PARAMSET) != 0) mode = rx_calib_ue_byp;