Reduce difference with OSA develop branch for merge

targets/ARCH/rfsimulator/simulator.c

@@ -720,7 +720,6 @@ int rfsimulator_read(openair0_device *device, openair0_timestamp *ptimestamp, vo
                     );
         else { // no channel modeling
           sample_t *out=(sample_t *)samplesVoid[a];
-
           int nbAnt_tx = ptr->th.nbAnt;//number of Tx antennas
           //LOG_I(HW, "nbAnt_tx %d\n",nbAnt_tx);
           for (int i=0; i < nsamps; i++) {//loop over nsamps
@@ -729,7 +728,6 @@ int rfsimulator_read(openair0_device *device, openair0_timestamp *ptimestamp, vo
         		  out[i].i+=ptr->circularBuf[((t->nextTimestamp+i)*nbAnt_tx+a_tx)%CirSize].i;
         	  } // end for a_tx
           } // end for i (number of samps)
-
         } // end of no channel modeling
       } // end for a (number of rx antennas)
     }

targets/COMMON/create_tasks.c

@@ -56,7 +56,6 @@ int create_tasks(uint32_t enb_nb) {
   rc = itti_create_task (TASK_ENB_APP, eNB_app_task, NULL);
   AssertFatal(rc >= 0, "Create task for eNB APP failed\n");
 
-  // No more rrc thread, as many race conditions are hidden behind
   LOG_I(RRC,"Creating RRC eNB Task\n");
   rc = itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL);
   AssertFatal(rc >= 0, "Create task for RRC eNB failed\n");

targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.106PRB.30kHz,usrpb2x0.conf

@@ -200,7 +200,7 @@ gNBs =
                           );
 
     ///X2
-    enable_x2 = "no";
+    enable_x2 = "yes";
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     target_enb_x2_ip_address      = (

targets/RT/USER/lte-softmodem.c

@@ -444,7 +444,6 @@ int restart_L1L2(module_id_t enb_id) {
   init_UE_info(&RC.mac[enb_id]->UE_info);
   LOG_I(ENB_APP, "attempting to create ITTI tasks\n");
 
-  // No more rrc thread, as many race conditions are hidden behind
   if (itti_create_task (TASK_RRC_ENB, rrc_enb_task, NULL) < 0) {
     LOG_E(RRC, "Create task for RRC eNB failed\n");
     return -1;