Merge remote-tracking branch 'origin/develop-nr' into nr_fapi_for_push

2019-10-11 17:26:03 +02:00
parent c0ca7038f1 6548ae15d2
commit 76b55e9cbd
143 changed files with 18683 additions and 23395 deletions
@@ -665,11 +665,7 @@ static void* gNB_thread_prach( void* param ) {
   if (wait_on_condition(&proc->mutex_prach,&proc->cond_prach,&proc->instance_cnt_prach,"gNB_prach_thread") < 0) break;

   LOG_D(PHY,"Running gNB prach procedures\n");
-   prach_procedures(gNB
-#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
-      ,0
-#endif
-      );
+   prach_procedures(gNB ,0);

   if (release_thread(&proc->mutex_prach,&proc->instance_cnt_prach,"gNB_prach_thread") < 0) break;
 }