From ecaa20ed1428fc51b9f97ff2b6b01ccf1a071db4 Mon Sep 17 00:00:00 2001
From: Melissa Elkadi <melissa@episci.com>
Date: Mon, 15 Feb 2021 15:08:46 -0800
Subject: [PATCH] Re-do fix for merge issues
---
common/utils/ocp_itti/intertask_interface.cpp | 3 ++-
targets/COMMON/openairinterface5g_limits.h | 16 ++++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp
index 6d9747f3a5b..318e4e9369d 100644
--- a/common/utils/ocp_itti/intertask_interface.cpp
+++ b/common/utils/ocp_itti/intertask_interface.cpp
@@ -26,7 +26,7 @@
#include <sys/eventfd.h>
-extern "C"
+extern "C" {
#include <intertask_interface.h>
#include <common/utils/system.h>
@@ -503,4 +503,5 @@ void log_scheduler(const char* label)
buffer,
label);
}
+} // extern "C"
diff --git a/targets/COMMON/openairinterface5g_limits.h b/targets/COMMON/openairinterface5g_limits.h
index a21f0b0e4bb..3136e4b23d9 100644
--- a/targets/COMMON/openairinterface5g_limits.h
+++ b/targets/COMMON/openairinterface5g_limits.h
@@ -1,5 +1,4 @@
#ifndef OPENAIRINTERFACE5G_LIMITS_H_
-#endif
#define OPENAIRINTERFACE5G_LIMITS_H_
#if 1 /*defined(CBMIMO1) || defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)*/
@@ -14,12 +13,18 @@
// in eNB and UE.
// now , if we use --mu option in UE, compiling error will occur.
// This problem will be fixed in the future.
-# ifndef UESIM_EXPANSION
+# ifndef UESIM_EXPANSION
# define NUMBER_OF_UE_MAX 40
# define NUMBER_OF_NR_UE_MAX 4
# define NUMBER_OF_UCI_VARS_MAX 14
# define NUMBER_OF_CONNECTED_eNB_MAX 1
# define NUMBER_OF_CONNECTED_gNB_MAX 1
+# else
+# define NUMBER_OF_UE_MAX 256
+# define NUMBER_OF_UCI_VARS_MAX 256
+# define NUMBER_OF_CONNECTED_eNB_MAX 1
+# define NUMBER_OF_CONNECTED_gNB_MAX 3
+# endif
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_UCI_VARS_MAX 256
@@ -44,10 +49,17 @@ eNB process will exit because unexpected access happens.
Now some parts are using NUMBER_OF_UE_MAX
and the other are using MAX_MOBILES_PER_ENB in for-loop.
*/
+# ifndef UESIM_EXPANSION
# define NUMBER_OF_UE_MAX 16
# define NUMBER_OF_UCI_VARS_MAX 56
# define NUMBER_OF_CONNECTED_eNB_MAX 3
# define NUMBER_OF_CONNECTED_gNB_MAX 3
+# else
+# define NUMBER_OF_UE_MAX 256
+# define NUMBER_OF_UCI_VARS_MAX 256
+# define NUMBER_OF_CONNECTED_eNB_MAX 1
+# define NUMBER_OF_CONNECTED_gNB_MAX 1
+# endif
# else
# define NUMBER_OF_UE_MAX 256
# define NUMBER_OF_UCI_VARS_MAX 256
--
GitLab