develop-nr merge

2019-10-07 12:04:58 +02:00
parent c348a9eec6 b3bc216df1
commit e5a9f02af6
141 changed files with 18599 additions and 23321 deletions
@@ -664,11 +664,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;
 }