adding PUSCH procedures to gNB side in RT with some logs

- removed gNB RT from "ru_procedures.c" to "nr_ru_procedures"
- added a new thread "nr_feprx_thread"
- added some functionalities for fep for rx in "nr_ru_procedures.c"

executables/nr-gnb.c

@@ -184,17 +184,18 @@ static inline int rxtx(PHY_VARS_gNB *gNB,int frame_rx, int slot_rx, int frame_tx
   // ****************************************
   // Common RX procedures subframe n
   T(T_GNB_PHY_DL_TICK, T_INT(gNB->Mod_id), T_INT(frame_tx), T_INT(slot_tx));
-  /*
-    // if this is IF5 or 3GPP_gNB
-    if (gNB && gNB->RU_list && gNB->RU_list[0] && gNB->RU_list[0]->function < NGFI_RAU_IF4p5) {
-      wakeup_prach_gNB(gNB,NULL,proc->frame_rx,proc->slot_rx);
-    }
+/*
+  // if this is IF5 or 3GPP_gNB
+  if (gNB && gNB->RU_list && gNB->RU_list[0] && gNB->RU_list[0]->function < NGFI_RAU_IF4p5) {
+    wakeup_prach_gNB(gNB,NULL,proc->frame_rx,proc->slot_rx);
+  }
+
+  // UE-specific RX processing for subframe n
+  if (nfapi_mode == 0 || nfapi_mode == 1) */ {
+    nfapi_nr_ul_config_ulsch_pdu_rel15_t *ulsch_pdu_rel15 = &gNB->ulsch[1][0]->harq_processes[0]->ulsch_pdu.ulsch_pdu_rel15;
+    phy_procedures_gNB_uespec_RX(gNB, frame_rx, slot_rx, ulsch_pdu_rel15->start_symbol, ulsch_pdu_rel15->start_symbol + ulsch_pdu_rel15->number_symbols);
+  }
 
-    // UE-specific RX processing for subframe n
-    if (nfapi_mode == 0 || nfapi_mode == 1) {
-      phy_procedures_gNB_uespec_RX(gNB, proc, no_relay );
-    }
-  */
   pthread_mutex_lock(&gNB->UL_INFO_mutex);
   gNB->UL_INFO.frame     = frame_rx;
   gNB->UL_INFO.slot      = slot_rx;

executables/nr-ru.c

@@ -1354,6 +1354,8 @@ static void *ru_thread( void *param ) {
   char               filename[40],threadname[40];
   int                print_frame = 8;
   int                i = 0;
+  int                aa;
+
   // set default return value
   ru_thread_status = 0;
   // set default return value
@@ -1472,6 +1474,15 @@ static void *ru_thread( void *param ) {
     // do RX front-end processing (frequency-shift, dft) if needed
     if (ru->feprx) ru->feprx(ru,proc->tti_rx);
 
+    LOG_I(PHY,"RU proc: frame_rx = %d, tti_rx = %d\n", proc->frame_rx, proc->tti_rx);
+    LOG_I(PHY,"gNB proc: frame_rx = %d, slot_rx = %d\n", RC.gNB[0][0]->proc.frame_rx, RC.gNB[0][0]->proc.slot_rx);
+    LOG_I(PHY,"Copying rxdataF from RU to gNB\n");
+
+    for (aa=0;aa<ru->nb_rx;aa++)
+      memcpy((void*)RC.gNB[0][0]->common_vars.rxdataF[aa],
+         (void*)&ru->common.rxdataF[aa][proc->tti_rx*fp->symbols_per_tti*fp->ofdm_symbol_size],
+         fp->symbols_per_tti*fp->ofdm_symbol_size*sizeof(int32_t));
+
     // At this point, all information for subframe has been received on FH interface
 
     // wakeup all gNB processes waiting for this RU
@@ -1620,14 +1631,6 @@ int stop_rf(RU_t *ru) {
   return 0;
 }
 
-extern void fep_full(RU_t *ru,int slot);
-extern void ru_fep_full_2thread(RU_t *ru,int slot);
-extern void nr_feptx_ofdm(RU_t *ru,int frame_tx,int tti_tx);
-extern void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx);
-extern void feptx_prec(RU_t *ru, int frame_tx,int tti_tx);
-extern void init_fep_thread(RU_t *ru);
-extern void nr_init_feptx_thread(RU_t *ru);
-
 void init_RU_proc(RU_t *ru) {
   int i=0;
   RU_proc_t *proc;
@@ -1692,7 +1695,7 @@ void init_RU_proc(RU_t *ru) {
   }
 
   if (get_thread_worker_conf() == WORKER_ENABLE) {
-    if (ru->feprx) init_fep_thread(ru);
+    if (ru->feprx) nr_init_feprx_thread(ru);
 
     if (ru->feptx_ofdm) nr_init_feptx_thread(ru);
   }
@@ -1985,8 +1988,8 @@ void set_function_spec_param(RU_t *ru) {
         ru->fh_north_out          = fh_if4p5_north_out;       // send_IF4p5 on reception
         ru->fh_south_out          = tx_rf;                    // send output to RF
         ru->fh_north_asynch_in    = fh_if4p5_north_asynch_in; // TX packets come asynchronously
-        ru->feprx                 = (get_thread_worker_conf() == WORKER_ENABLE) ? ru_fep_full_2thread : fep_full;                 // RX DFTs
-        ru->feptx_ofdm            = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm;               // this is fep with idft only (no precoding in RRU)
+        ru->feprx                 = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_fep_full_2thread : nr_fep_full;     // RX DFTs
+        ru->feptx_ofdm            = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm; // this is fep with idft only (no precoding in RRU)
         ru->feptx_prec            = NULL;
         ru->nr_start_if           = nr_start_if;              // need to start the if interface for if4p5
         ru->ifdevice.host_type    = RRU_HOST;
@@ -2007,8 +2010,8 @@ void set_function_spec_param(RU_t *ru) {
         malloc_IF4p5_buffer(ru);
       } else if (ru->function == gNodeB_3GPP) {
         ru->do_prach             = 0;                       // no prach processing in RU
-        ru->feprx                = (get_thread_worker_conf() == WORKER_ENABLE) ? ru_fep_full_2thread : fep_full;                // RX DFTs
-        ru->feptx_ofdm           = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm;              // this is fep with idft and precoding
+        ru->feprx                = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_fep_full_2thread : nr_fep_full;     // RX DFTs
+        ru->feptx_ofdm           = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm; // this is fep with idft and precoding
         ru->feptx_prec           = NULL;              // this is fep with idft and precoding
         ru->fh_north_in          = NULL;                    // no incoming fronthaul from north
         ru->fh_north_out         = NULL;                    // no outgoing fronthaul to north
@@ -2037,13 +2040,13 @@ void set_function_spec_param(RU_t *ru) {
 
     case REMOTE_IF5: // the remote unit is IF5 RRU
       ru->do_prach               = 0;
-      ru->feprx                  = fep_full;                   // this is frequency-shift + DFTs
-      ru->feptx_prec             = feptx_prec;                 // need to do transmit Precoding + IDFTs
-      ru->feptx_ofdm             = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm;                 // need to do transmit Precoding + IDFTs
-      ru->fh_south_in          = fh_if5_south_in;     // synchronous IF5 reception
-      ru->fh_south_out         = fh_if5_south_out;    // synchronous IF5 transmission
-      ru->fh_south_asynch_in   = NULL;                // no asynchronous UL
-      ru->start_rf               = NULL;                 // no local RF
+      ru->feprx                  = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_fep_full_2thread : nr_fep_full;     // this is frequency-shift + DFTs
+      ru->feptx_prec             = feptx_prec;          // need to do transmit Precoding + IDFTs
+      ru->feptx_ofdm             = (get_thread_worker_conf() == WORKER_ENABLE) ? nr_feptx_ofdm_2thread : nr_feptx_ofdm; // need to do transmit Precoding + IDFTs
+      ru->fh_south_in            = fh_if5_south_in;     // synchronous IF5 reception
+      ru->fh_south_out           = fh_if5_south_out;    // synchronous IF5 transmission
+      ru->fh_south_asynch_in     = NULL;                // no asynchronous UL
+      ru->start_rf               = NULL;                // no local RF
       ru->stop_rf                = NULL;
       ru->nr_start_if            = nr_start_if;         // need to start if interface for IF5
       ru->ifdevice.host_type     = RAU_HOST;

openair1/PHY/INIT/nr_init.c

@@ -38,6 +38,7 @@
 #include "PHY/NR_REFSIG/nr_refsig.h"
 #include "SCHED_NR/fapi_nr_l1.h"
 #include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
+#include "nfapi_nr_interface.h"
 
 /*
 extern uint32_t from_nrarfcn(int nr_bandP,uint32_t dl_nrarfcn);
@@ -485,6 +486,26 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
         LOG_E(PHY,"Can't get gNB ulsch structures\n");
         exit(-1);
       }
+
+      LOG_I(PHY,"Initializing nFAPI for ULSCH, UE %d\n",i);
+      // [hna] added here for RT implementation
+      uint8_t harq_pid = 0;
+      nfapi_nr_ul_config_ulsch_pdu *rel15_ul = &gNB->ulsch[i+1][j]->harq_processes[harq_pid]->ulsch_pdu;
+  
+      // --------- setting rel15_ul parameters ----------
+      rel15_ul->rnti                           = 0x1234;
+      rel15_ul->ulsch_pdu_rel15.start_rb       = 30;
+      rel15_ul->ulsch_pdu_rel15.number_rbs     = 50;
+      rel15_ul->ulsch_pdu_rel15.start_symbol   = 2;
+      rel15_ul->ulsch_pdu_rel15.number_symbols = 12;
+      rel15_ul->ulsch_pdu_rel15.nb_re_dmrs     = 6;
+      rel15_ul->ulsch_pdu_rel15.length_dmrs    = 1;
+      rel15_ul->ulsch_pdu_rel15.Qm             = 2;
+      rel15_ul->ulsch_pdu_rel15.mcs            = 9;
+      rel15_ul->ulsch_pdu_rel15.rv             = 0;
+      rel15_ul->ulsch_pdu_rel15.n_layers       = 1;
+      ///////////////////////////////////////////////////
+
       //////////////////////////////////////////////////////////////////////////
     }
 

openair1/PHY/NR_TRANSPORT/nr_ulsch.h

@@ -75,7 +75,8 @@ void nr_ulsch_unscrambling(int16_t* llr,
 
 
 void nr_ulsch_procedures(PHY_VARS_gNB *gNB,
-                         gNB_L1_rxtx_proc_t *proc,
+                         int frame_rx,
+                         int slot_rx,
                          int UE_id,
                          uint8_t harq_pid);
 

openair1/SCHED_NR/nr_ru_procedures.c

@@ -34,7 +34,7 @@
 #include "PHY/phy_extern.h"
 #include "sched_nr.h"
 #include "PHY/MODULATION/modulation_common.h"
-
+#include "PHY/MODULATION/nr_modulation.h"
 #include "PHY/LTE_TRANSPORT/if4_tools.h"
 #include "PHY/LTE_TRANSPORT/if5_tools.h"
 
@@ -248,3 +248,177 @@ void nr_feptx_ofdm(RU_t *ru,int frame_tx,int tti_tx) {
 	dB_fixed(signal_energy_nodc(ru->common.txdataF_BF[aa],2*slot_sizeF)));
 
 }
+
+
+void nr_fep0(RU_t *ru, int first_half) {
+  
+  uint8_t start_symbol, end_symbol, l, aa;
+  RU_proc_t *proc       = &ru->proc;
+  NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
+  
+  if(first_half == 1) {
+    start_symbol = 0;
+    end_symbol = NR_SYMBOLS_PER_SLOT/2;
+  } else {
+    start_symbol = NR_SYMBOLS_PER_SLOT/2;
+    end_symbol = NR_SYMBOLS_PER_SLOT;
+  }
+
+  LOG_I(PHY,"In fep0 for slot = %d, first_half = %d, start_symbol = %d, end_symbol = %d\n", proc->tti_rx, first_half, start_symbol, end_symbol);
+  //  printf("fep0: slot %d\n",slot);
+
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX+proc->tti_rx, 1);
+
+  // remove_7_5_kHz(ru,(slot&1)+(proc->tti_rx<<1));
+  for (l = start_symbol; l < end_symbol; l++) {
+    for (aa = 0; aa < fp->nb_antennas_rx; aa++) {
+      nr_slot_fep_ul(fp,
+                     ru->common.rxdata[aa],
+                     ru->common.rxdataF[aa],
+                     l,
+                     proc->tti_rx,
+                     0,
+                     0);
+    }
+  }
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX+proc->tti_rx, 0);
+}
+
+
+static void *nr_feprx_thread(void *param) {
+
+  RU_t *ru = (RU_t *)param;
+  RU_proc_t *proc  = &ru->proc;
+
+
+  while (!oai_exit) {
+
+    if (wait_on_condition(&proc->mutex_fep,&proc->cond_fep,&proc->instance_cnt_fep,"NR feprx thread")<0) break;
+
+    if (oai_exit) break;
+
+    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX1, 1 );
+
+    nr_fep0(ru, 0);
+
+    VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX1, 0 );
+
+    if (release_thread(&proc->mutex_fep,&proc->instance_cnt_fep,"nr_feprx thread")<0) break;
+
+    if (pthread_cond_signal(&proc->cond_fep) != 0) {
+      printf("[gNB] ERROR pthread_cond_signal for nr_feprx thread exit\n");
+      exit_fun( "ERROR pthread_cond_signal" );
+      return NULL;
+    }
+  }
+
+  return NULL;
+}
+
+
+void nr_init_feprx_thread(RU_t *ru) {
+
+  RU_proc_t *proc = &ru->proc;
+
+  proc->instance_cnt_fep = -1;
+    
+  pthread_mutex_init( &proc->mutex_fep, NULL);
+  pthread_cond_init( &proc->cond_fep, NULL);
+
+  threadCreate(&proc->pthread_fep, nr_feprx_thread, (void*)ru, "feprx", -1, OAI_PRIORITY_RT);
+}
+
+
+void nr_fep_full_2thread(RU_t *ru, int slot) {
+
+  RU_proc_t *proc = &ru->proc;
+
+  struct timespec wait;
+
+  // NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
+
+  // if ((fp->frame_type == TDD) &&
+     // (subframe_select(fp,proc->tti_rx) != SF_UL)) return;
+
+  if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 );
+
+  wait.tv_sec=0;
+  wait.tv_nsec=5000000L;
+
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 );
+  start_meas(&ru->ofdm_demod_stats);
+
+  if (pthread_mutex_timedlock(&proc->mutex_fep,&wait) != 0) {
+    printf("[RU] ERROR pthread_mutex_lock for nr_feprx thread (IC %d)\n", proc->instance_cnt_fep);
+    exit_fun( "error locking mutex_fep" );
+    return;
+  }
+
+  if (proc->instance_cnt_fep==0) {
+    printf("[RU] FEP thread busy\n");
+    exit_fun("FEP thread busy");
+    pthread_mutex_unlock( &proc->mutex_fep );
+    return;
+  }
+  
+  ++proc->instance_cnt_fep;
+
+
+  if (pthread_cond_signal(&proc->cond_fep) != 0) {
+    printf("[RU] ERROR pthread_cond_signal for nr_feprx thread\n");
+    exit_fun( "ERROR pthread_cond_signal" );
+    return;
+  }
+  //start_meas(&ru->ofdm_demod_wakeup_stats);
+  
+  pthread_mutex_unlock( &proc->mutex_fep );
+
+  // call second slot in this symbol
+  nr_fep0(ru, 1);
+
+  start_meas(&ru->ofdm_demod_wait_stats);
+  wait_on_busy_condition(&proc->mutex_fep,&proc->cond_fep,&proc->instance_cnt_fep,"nr_feprx thread");  
+  stop_meas(&ru->ofdm_demod_wait_stats);
+  if(opp_enabled == 1 && ru->ofdm_demod_wakeup_stats.p_time>30*3000){
+    print_meas_now(&ru->ofdm_demod_wakeup_stats,"fep wakeup",stderr);
+    printf("delay in fep wait on codition in frame_rx: %d  subframe_rx: %d \n",proc->frame_rx,proc->tti_rx);
+  }
+
+  stop_meas(&ru->ofdm_demod_stats);
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 0 );
+}
+
+
+
+void nr_fep_full(RU_t *ru, int slot) {
+
+  RU_proc_t *proc = &ru->proc;
+  int l, aa;
+  NR_DL_FRAME_PARMS *fp = ru->nr_frame_parms;
+
+  // if ((fp->frame_type == TDD) && 
+     // (subframe_select(fp,proc->tti_rx) != SF_UL)) return;
+
+  start_meas(&ru->ofdm_demod_stats);
+  if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 1 );
+
+  // remove_7_5_kHz(ru,proc->tti_rx<<1);
+  // remove_7_5_kHz(ru,1+(proc->tti_rx<<1));
+
+  for (l = 0; l < fp->symbols_per_tti; l++) {
+    for (aa = 0; aa < fp->nb_antennas_rx; aa++) {
+      nr_slot_fep_ul(fp,
+                     ru->common.rxdata[aa],
+                     ru->common.rxdataF[aa],
+                     l,
+                     proc->tti_rx,
+                     0,
+                     0);
+    }
+  }
+
+  if (ru->idx == 0) VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPRX, 0 );
+  stop_meas(&ru->ofdm_demod_stats);
+  
+  
+}

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -210,10 +210,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
 }
 
 
-void nr_ulsch_procedures(PHY_VARS_gNB *gNB,
-                         gNB_L1_rxtx_proc_t *proc,
-                         int UE_id,
-                         uint8_t harq_pid)
+void nr_ulsch_procedures(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, int UE_id, uint8_t harq_pid)
 {
   NR_DL_FRAME_PARMS                    *frame_parms           = &gNB->frame_parms;
   nfapi_nr_ul_config_ulsch_pdu         *rel15_ul              = &gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->ulsch_pdu;
@@ -249,9 +246,9 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB,
                     UE_id,
                     gNB->pusch_vars[UE_id]->llr,
                     frame_parms,
-                    proc->frame_rx,
+                    frame_rx,
                     nfapi_ulsch_pdu_rel15->number_symbols,
-                    proc->slot_rx,
+                    slot_rx,
                     harq_pid,
                     0);
         
@@ -261,7 +258,7 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB,
 }
 
 
-void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc) {
+void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
 
   uint8_t symbol;
   unsigned char aa;
@@ -273,7 +270,7 @@ void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc) {
                      gNB->common_vars.rxdata[aa],
                      gNB->common_vars.rxdataF[aa],
                      symbol,
-                     proc->slot_rx,
+                     slot_rx,
                      0,
                      0);
     }
@@ -282,7 +279,7 @@ void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc) {
 }
 
 
-void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, uint8_t symbol_start, uint8_t symbol_end) {
+void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, uint8_t symbol_start, uint8_t symbol_end) {
   
   uint8_t UE_id;
   uint8_t symbol;
@@ -293,11 +290,11 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, u
     
     for(symbol = symbol_start; symbol < symbol_end; symbol++) {
 
-      nr_rx_pusch(gNB, UE_id, proc->frame_rx, proc->slot_rx, symbol, harq_pid);
+      nr_rx_pusch(gNB, UE_id, frame_rx, slot_rx, symbol, harq_pid);
 
     }
       
-    nr_ulsch_procedures(gNB, proc, UE_id, harq_pid);
+    nr_ulsch_procedures(gNB, frame_rx, slot_rx, UE_id, harq_pid);
         
   }
 

openair1/SCHED_NR/sched_nr.h

@@ -37,14 +37,16 @@
 nr_slot_t nr_slot_select (nfapi_nr_config_request_t *cfg, unsigned char slot);
 void nr_set_ssb_first_subcarrier(nfapi_nr_config_request_t *cfg, NR_DL_FRAME_PARMS *fp);
 void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, int frame_tx, int slot_tx, int do_meas);
-void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc);
-void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, uint8_t symbol_start, uint8_t symbol_end);
+void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx);
+void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, uint8_t symbol_start, uint8_t symbol_end);
 void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot);
 void nr_feptx_ofdm(RU_t *ru,int frame_tx,int tti_tx);
 void nr_feptx_ofdm_2thread(RU_t *ru,int frame_tx,int tti_tx);
 void nr_feptx0(RU_t *ru,int tti_tx,int first_symbol, int num_symbols);
 void nr_init_feptx_thread(RU_t *ru);
-void fep_full(RU_t *ru,int slot);
+void nr_init_feprx_thread(RU_t *ru);
+void nr_fep_full(RU_t *ru, int slot);
+void nr_fep_full_2thread(RU_t *ru, int slot);
 void feptx_prec(RU_t *ru,int frame_tx,int tti_tx);
 int nr_phy_init_RU(RU_t *ru);
 

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -326,10 +326,6 @@ int main(int argc, char **argv)
   RC.gNB[0][0] = malloc(sizeof(PHY_VARS_gNB));
   gNB = RC.gNB[0][0];
   //gNB_config = &gNB->gNB_config;
-  gNB_L1_rxtx_proc_t gNB_proc;
-
-  gNB_proc.frame_rx = frame;
-  gNB_proc.slot_rx  = slot;
 
   UE_proc.nr_tti_tx = slot;
   UE_proc.frame_tx = frame;
@@ -486,16 +482,15 @@ int main(int argc, char **argv)
 
       for (i=0; i<frame_length_complex_samples; i++) {
         for (ap=0; ap<frame_parms->nb_antennas_rx; ap++) {
-          // [hna] doesn't work with noise in case of mod_order = 6
           ((short*) gNB->common_vars.rxdata[ap])[2*i]   = (((int16_t *)UE->common_vars.txdata[ap])[(i<<1)])+ (int16_t)(sqrt(sigma/2)*gaussdouble(0.0,1.0)*(double)AMP); // convert to fixed point
           ((short*) gNB->common_vars.rxdata[ap])[2*i+1] = (((int16_t *)UE->common_vars.txdata[ap])[(i<<1)+1])+ (int16_t)(sqrt(sigma/2)*gaussdouble(0.0,1.0)*(double)AMP);
         }
       }
 
       
-      phy_procedures_gNB_common_RX(gNB, &gNB_proc);
+      phy_procedures_gNB_common_RX(gNB, frame, slot);
 
-      phy_procedures_gNB_uespec_RX(gNB, &gNB_proc, rel15_ul->ulsch_pdu_rel15.start_symbol, rel15_ul->ulsch_pdu_rel15.start_symbol + rel15_ul->ulsch_pdu_rel15.number_symbols);
+      phy_procedures_gNB_uespec_RX(gNB, frame, slot, rel15_ul->ulsch_pdu_rel15.start_symbol, rel15_ul->ulsch_pdu_rel15.start_symbol + rel15_ul->ulsch_pdu_rel15.number_symbols);
 
 
       //----------------------------------------------------------