merge develop, compile ok, no test

executables/main-ocp.c

@@ -1093,9 +1093,13 @@ int restart_L1L2(module_id_t enb_id) {
   pthread_mutex_lock(&sync_mutex);
   sync_var = -1;
   pthread_mutex_unlock(&sync_mutex);
+
   /* copy the changed frame parameters to the RU */
   /* TODO this should be done for all RUs associated to this eNB */
   memcpy(&ru->frame_parms, &RC.eNB[enb_id][0]->frame_parms, sizeof(LTE_DL_FRAME_PARMS));
+
+  RC.ru_mask |= (1 << ru->idx);
+
   /* reset the list of connected UEs in the MAC, since in this process with
    * loose all UEs (have to reconnect) */
   init_UE_info(&RC.mac[enb_id]->UE_info);
@@ -1320,9 +1324,14 @@ int main ( int argc, char **argv ) {
 
   // end of CI modifications
   //getchar();
+<<<<<<< HEAD
   if(IS_SOFTMODEM_DOFORMS) {
     load_softscope("enb",NULL);
   }
+=======
+  if(IS_SOFTMODEM_DOFORMS)
+    load_softscope("enb", NULL);
+>>>>>>> 7f28f8d10dc0d73fd4b10d4a89fde554158f9fb5
 
   itti_wait_tasks_end();
   oai_exit=1;

executables/nr-softmodem.c

@@ -726,9 +726,6 @@ int restart_L1L2(module_id_t gnb_id) {
   
 
   RC.ru_mask |= (1 << ru->idx);
-  /* copy the changed frame parameters to the RU */
-  /* TODO this should be done for all RUs associated to this gNB */
-  memcpy(&ru->nr_frame_parms, &RC.gNB[gnb_id]->frame_parms, sizeof(NR_DL_FRAME_PARMS));
   set_function_spec_param(RC.ru[gnb_id]);
   LOG_I(GNB_APP, "attempting to create ITTI tasks\n");
   // No more rrc thread, as many race conditions are hidden behind

executables/nr-ue.c

@@ -35,9 +35,7 @@
 #include "NR_MAC_UE/mac_proto.h"
 #include "RRC/NR_UE/rrc_proto.h"
 
-//#ifndef NO_RAT_NR
-#include "SCHED_NR/phy_frame_config_nr.h"
-//#endif
+#include "SCHED_NR_UE/phy_frame_config_nr.h"
 #include "SCHED_NR_UE/defs.h"
 
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
@@ -577,12 +575,6 @@ void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp *timestamp) {
 
 int computeSamplesShift(PHY_VARS_NR_UE *UE) {
 
-  if (IS_SOFTMODEM_RFSIM) {
-    LOG_D(PHY,"SET rx_offset %d \n",UE->rx_offset);
-    //UE->rx_offset_diff=0;
-    return 0;
-  }
-
   // compute TO compensation that should be applied for this frame
   if ( UE->rx_offset < UE->frame_parms.samples_per_frame/2  &&
        UE->rx_offset > 0 ) {