fix fix-nr-rfsim-gNB-notx-slots2to19

executables/nr-ru.c

@@ -81,6 +81,7 @@
 #include "common/utils/LOG/vcd_signal_dumper.h"
 
 #include "enb_config.h"
+#include <executables/nr-softmodem.h>
 
 #ifdef SMBV
 #include "PHY/TOOLS/smbv.h"
@@ -730,13 +731,15 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
   //nr_subframe_t SF_type     = nr_slot_select(cfg,slot%fp->slots_per_frame);
 
   if ((slot == 0) ||
-      (slot == 1)) {
+      (slot == 1) || IS_SOFTMODEM_RFSIM ) {
     int siglen=fp->samples_per_slot;
     int flags;
     if (slot==0)
       flags = 2;
     else if (slot==1)
       flags=3;
+    else
+      flags=4;
 
     /*
         if (SF_type == SF_S) {

executables/nr-softmodem.h

@@ -49,10 +49,12 @@
 
 #define SOFTMODEM_NOS1_BIT            (1<<0)
 #define SOFTMODEM_NOKRNMOD_BIT        (1<<1)
+#define SOFTMODEM_RFSIM_BIT           (1<<10)
 
 #define IS_SOFTMODEM_NOS1            ( get_softmodem_optmask() & SOFTMODEM_NOS1_BIT)
 #define IS_SOFTMODEM_NOKRNMOD        ( get_softmodem_optmask() & SOFTMODEM_NOKRNMOD_BIT)
 
+#define IS_SOFTMODEM_RFSIM           ( get_softmodem_optmask() & SOFTMODEM_RFSIM_BIT)
 extern uint64_t get_softmodem_optmask(void);
 extern void get_common_options(void);
 

executables/nr-ue.c

@@ -538,6 +538,9 @@ void trashFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
                                dummy_rx,
                                UE->frame_parms.samples_per_subframe,
                                UE->frame_parms.nb_antennas_rx);
+    if (IS_SOFTMODEM_RFSIM ) {
+	 usleep(1000); // slow down, as would do actuall rf to let cpu for the synchro thread
+    }
   }
 
   for (int i=0; i<UE->frame_parms.nb_antennas_tx; i++)