Merge remote-tracking branch 'origin/remove-basic-sim' into integration_2022_wk12_a

openair1/PHY/INIT/lte_param_init.c

@@ -151,11 +151,5 @@ void lte_param_init(PHY_VARS_eNB **eNBp,
     else if (eNB->frame_parms.N_RB_DL == 25)  ru->N_TA_offset = 624/4;
   } else ru->N_TA_offset=0;
 
-  if (IS_SOFTMODEM_BASICSIM)
-    /* this is required for the basic simulator in TDD mode
-     * TODO: find a proper cleaner solution
-     */
-    UE->N_TA_offset = 0;
-
   printf("Done lte_param_init\n");
 }

openair1/PHY/LTE_TRANSPORT/pss.c

@@ -72,10 +72,6 @@ int generate_pss(int32_t **txdataF,
   a = (frame_parms->nb_antenna_ports_eNB == 1) ? amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
   //printf("[PSS] amp=%d, a=%d\n",amp,a);
 
-  if (IS_SOFTMODEM_BASICSIM)
-    /* a hack to remove at some point (the UE doesn't synch with 100 RBs) */
-    a = (frame_parms->nb_antenna_ports_eNB == 1) ? 4*amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
-
   Nsymb = (frame_parms->Ncp==NORMAL)?14:12;
 
   for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {

openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c

@@ -557,11 +557,6 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode) {
     ue->measurements.rx_power_avg_dB[0] = dB_fixed(ue->measurements.rx_power_avg[0]);
     LOG_I(PHY,"[UE%d] Initial sync : Estimated power: %d dB\n",ue->Mod_id,ue->measurements.rx_power_avg_dB[0] );
 
-    if (IS_SOFTMODEM_BASICSIM )
-      phy_adjust_gain(ue,ue->measurements.rx_power_avg_dB[0],0);
-  } else {
-    if (IS_SOFTMODEM_BASICSIM )
-      phy_adjust_gain(ue,dB_fixed(ue->measurements.rssi),0);
   }
 
   return ret;

openair1/PHY/LTE_UE_TRANSPORT/prach_ue.c

@@ -81,29 +81,20 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
   int i, prach_len;
   uint16_t first_nonzero_root_idx=0;
 
-  if ( !(IS_SOFTMODEM_BASICSIM ) ) {
-    prach_start =  (ue->rx_offset+subframe*ue->frame_parms.samples_per_tti-ue->hw_timing_advance-ue->N_TA_offset);
+  prach_start =  (ue->rx_offset+subframe*ue->frame_parms.samples_per_tti-ue->hw_timing_advance-ue->N_TA_offset);
 #ifdef PRACH_DEBUG
-    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);
+  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);
+  if (prach_start<0)
+    prach_start+=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
 
-    if (prach_start>=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
-      prach_start-=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
-  } else { //normal case (simulation)
-    prach_start = subframe*ue->frame_parms.samples_per_tti-ue->N_TA_offset;
-    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);
-  }
+  if (prach_start>=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
+    prach_start-=(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
 
   // First compute physical root sequence
   if (restricted_set == 0) {
@@ -476,40 +467,32 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
   AssertFatal(prach_fmt<4,
               "prach_fmt4 not fully implemented" );
 
-  if (!(IS_SOFTMODEM_BASICSIM ) ) {
-    int j;
-    int overflow = prach_start + prach_len - LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*ue->frame_parms.samples_per_tti;
-    LOG_I( PHY, "prach_start=%d, overflow=%d\n", prach_start, overflow );
+  int j;
+  int overflow = prach_start + prach_len - LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*ue->frame_parms.samples_per_tti;
+  LOG_I( PHY, "prach_start=%d, overflow=%d\n", prach_start, overflow );
 
-    for (i=prach_start,j=0; i<min(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,prach_start+prach_len); i++,j++) {
-      ((int16_t *)ue->common_vars.txdata[0])[2*i] = prach[2*j];
-      ((int16_t *)ue->common_vars.txdata[0])[2*i+1] = prach[2*j+1];
-    }
+  for (i=prach_start,j=0; i<min(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,prach_start+prach_len); i++,j++) {
+    ((int16_t *)ue->common_vars.txdata[0])[2*i] = prach[2*j];
+    ((int16_t *)ue->common_vars.txdata[0])[2*i+1] = prach[2*j+1];
+  }
 
-    for (i=0; i<overflow; i++,j++) {
-      ((int16_t *)ue->common_vars.txdata[0])[2*i] = prach[2*j];
-      ((int16_t *)ue->common_vars.txdata[0])[2*i+1] = prach[2*j+1];
-    }
+  for (i=0; i<overflow; i++,j++) {
+    ((int16_t *)ue->common_vars.txdata[0])[2*i] = prach[2*j];
+    ((int16_t *)ue->common_vars.txdata[0])[2*i+1] = prach[2*j+1];
+  }
 
 #if defined(EXMIMO)
 
-    // handle switch before 1st TX subframe, guarantee that the slot prior to transmission is switch on
-    for (k=prach_start - (ue->frame_parms.samples_per_tti>>1) ; k<prach_start ; k++) {
-      if (k<0)
-        ue->common_vars.txdata[0][k+ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
-      else if (k>(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
-        ue->common_vars.txdata[0][k-ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
-      else
-        ue->common_vars.txdata[0][k] &= 0xFFFEFFFE;
-    }
-
-#endif
-  } else { // simulators
-    for (i=0; i<prach_len; i++) {
-      ((int16_t *)(&ue->common_vars.txdata[0][prach_start]))[2*i] = prach[2*i];
-      ((int16_t *)(&ue->common_vars.txdata[0][prach_start]))[2*i+1] = prach[2*i+1];
-    }
+  // handle switch before 1st TX subframe, guarantee that the slot prior to transmission is switch on
+  for (k=prach_start - (ue->frame_parms.samples_per_tti>>1) ; k<prach_start ; k++) {
+    if (k<0)
+      ue->common_vars.txdata[0][k+ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
+    else if (k>(ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME))
+      ue->common_vars.txdata[0][k-ue->frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME] &= 0xFFFEFFFE;
+    else
+      ue->common_vars.txdata[0][k] &= 0xFFFEFFFE;
   }
+#endif
 
 #if defined(PRACH_WRITE_OUTPUT_DEBUG)
   LOG_M("prach_txF0.m","prachtxF0",prachF,prach_len-Ncp,1,1);

openair1/PHY/defs_RU.h

@@ -458,8 +458,6 @@ typedef struct RU_t_s {
   int emulate_rf;
   /// numerology index
   int numerology;
-  /// flag to indicate basicsim operation
-  int basicsim;
   /// flag to indicate the RU is in sync with a master reference
   int in_synch;
   /// timing offset