Pushing changes before incorporating new merges into develop and develop-nr

executables/nr-ru.c

@@ -87,11 +87,15 @@
 unsigned short config_frames[4] = {2,9,11,13};
 #endif
 
-/* these variables have to be defined before including ENB_APP/enb_paramdef.h */
+/* these variables have to be defined before including ENB_APP/enb_paramdef.h and GNB_APP/gnb_paramdef.h */
 static int DEFBANDS[] = {7};
 static int DEFENBS[] = {0};
 
+static int DEFNRBANDS[] = {7};
+static int DEFGNBS[] = {0};
+
 #include "ENB_APP/enb_paramdef.h"
+#include "GNB_APP/gnb_paramdef.h"
 #include "common/config/config_userapi.h"
 
 #ifndef OPENAIR2
@@ -1660,7 +1664,7 @@ void init_RU_proc(RU_t *ru) {
   if (opp_enabled == 1) threadCreate(&ru->ru_stats_thread,ru_stats_thread,(void *)ru, "emulateRF", -1, OAI_PRIORITY_RT_LOW);
 }
 
-void kill_RU_proc(int inst) {
+void kill_NR_RU_proc(int inst) {
   RU_t *ru = RC.ru[inst];
   RU_proc_t *proc = &ru->proc;
   pthread_mutex_lock(&proc->mutex_FH);
@@ -2136,7 +2140,7 @@ void init_RU(char *rf_config_file) {
 void stop_RU(int nb_ru) {
   for (int inst = 0; inst < nb_ru; inst++) {
     LOG_I(PHY, "Stopping RU %d processing threads\n", inst);
-    kill_RU_proc(inst);
+    kill_NR_RU_proc(inst);
   }
 }
 
@@ -2144,11 +2148,10 @@ void stop_RU(int nb_ru) {
 /* --------------------------------------------------------*/
 /* from here function to use configuration module          */
 void RCconfig_RU(void) {
-  int               j                             = 0;
-  int               i                             = 0;
+  int i = 0, j = 0;
   paramdef_t RUParams[] = GNBRUPARAMS_DESC;
   paramlist_def_t RUParamList = {CONFIG_STRING_RU_LIST,NULL,0};
-  config_getlist( &RUParamList,RUParams,sizeof(RUParams)/sizeof(paramdef_t), NULL);
+  config_getlist( &RUParamList, RUParams, sizeof(RUParams)/sizeof(paramdef_t), NULL);
 
   if ( RUParamList.numelt > 0) {
     RC.ru = (RU_t **)malloc(RC.nb_RU*sizeof(RU_t *));