Merge branch 'ru_rau_enhancement' of...

Merge branch 'ru_rau_enhancement' of https://gitlab.eurecom.fr/oai/openairinterface5g into ru_rau_enhancement

Conflicts:
	targets/SIMU/USER/oaisim.c

targets/RT/USER/lte-ru.c

@@ -691,7 +691,7 @@ void fh_if4p5_north_asynch_in(RU_t *ru,int *frame,int *subframe) {
       pthread_mutex_lock(&proc->mutex_ru);
       proc->instance_cnt_ru = -1;
       pthread_mutex_unlock(&proc->mutex_ru);
-      ru->cmd=EMPTY;
+      ru->cmd=STOP_RU;
       return;
     } 
     if ((subframe_select(fp,subframe_tx) == SF_DL) && (symbol_number == 0)) start_meas(&ru->rx_fhaul);
@@ -1839,8 +1839,7 @@ static void* ru_thread( void* param ) {
 	break;
       }
             
-	    
-      if (ru->fh_south_in && ru->state == RU_RUN) ru->fh_south_in(ru,&frame,&subframe);
+      if (ru->fh_south_in && ru->state == RU_RUN ) ru->fh_south_in(ru,&frame,&subframe);
       else AssertFatal(1==0, "No fronthaul interface at south port");
 
       if ((ru->do_prach>0) && (is_prach_subframe(fp, proc->frame_rx, proc->subframe_rx)==1)) {
@@ -1879,6 +1878,7 @@ static void* ru_thread( void* param ) {
 	 
       if (ru->fh_north_out) ru->fh_north_out(ru);
 
+      LOG_I(PHY,"ru->state = %d (RU_RUN is %d)\n",ru->state,RU_RUN);
     }
 
   } // while !oai_exit

targets/SIMU/USER/oaisim.c

@@ -737,7 +737,6 @@ l2l1_task (void *args_p)
 
 	CC_id=0;
         int all_done=0;
-
         while (all_done==0) {
 
           pthread_mutex_lock(&subframe_mutex);
@@ -746,10 +745,8 @@ l2l1_task (void *args_p)
           pthread_mutex_unlock(&subframe_mutex);
           LOG_D(EMU,"Frame %d, Subframe %d, NB_RU %d, NB_UE %d: Checking masks %x,%x\n",frame,sf,NB_RU,NB_UE_INST,subframe_ru_mask_local,subframe_UE_mask_local);
           if ((subframe_ru_mask_local == ((1<<NB_RU)-1)) &&
-              (subframe_UE_mask_local == ((1<<NB_UE_INST)-1)))
-             all_done=1;
-          else
-	    usleep(1500);
+              (subframe_UE_mask_local == ((1<<NB_UE_INST)-1))) all_done=1;
+          else usleep(1500);
         }