From d2098da06c6582df94305de6631fabf0d4aeeede Mon Sep 17 00:00:00 2001 From: Cedric Roux <cedric.roux@eurecom.fr> Date: Fri, 24 Mar 2017 12:27:46 +0100 Subject: [PATCH] fix targets/COMMON/openairinterface5g_limits.h - LMSSDR was not handled - bad #if usage - bad indentation still not very clean, but better --- targets/COMMON/openairinterface5g_limits.h | 39 ++++++++++++---------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/targets/COMMON/openairinterface5g_limits.h b/targets/COMMON/openairinterface5g_limits.h index d9590873e8..d5a3b7f61c 100644 --- a/targets/COMMON/openairinterface5g_limits.h +++ b/targets/COMMON/openairinterface5g_limits.h @@ -1,25 +1,30 @@ #ifndef OPENAIRINTERFACE5G_LIMITS_H_ #define OPENAIRINTERFACE5G_LIMITS_H_ -#if defined(CBMIMO1) || defined(EXMIMO) || defined(OAI_USRP) - #define NUMBER_OF_eNB_MAX 1 - #define NUMBER_OF_UE_MAX 16 - #define NUMBER_OF_CONNECTED_eNB_MAX 3 +#if defined(CBMIMO1) || defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_LMSSDR) +# define NUMBER_OF_eNB_MAX 1 +# define NUMBER_OF_UE_MAX 16 +# define NUMBER_OF_CONNECTED_eNB_MAX 3 #else - #define NUMBER_OF_eNB_MAX 7 - #define NUMBER_OF_UE_MAX 20 - #define NUMBER_OF_CONNECTED_eNB_MAX 3 +# define NUMBER_OF_eNB_MAX 7 +# define NUMBER_OF_UE_MAX 20 +# define NUMBER_OF_CONNECTED_eNB_MAX 3 - #if STANDALONE==1 - #define NUMBER_OF_eNB_MAX 3 - #define NUMBER_OF_UE_MAX 3 - #endif +# if defined(STANDALONE) && STANDALONE==1 +# undef NUMBER_OF_eNB_MAX +# undef NUMBER_OF_UE_MAX +# define NUMBER_OF_eNB_MAX 3 +# define NUMBER_OF_UE_MAX 3 +# endif - #if LARGE_SCALE - #define NUMBER_OF_eNB_MAX 2 - #define NUMBER_OF_UE_MAX 120 - #define NUMBER_OF_CONNECTED_eNB_MAX 1 // to save some memory - #endif +# if defined(LARGE_SCALE) && LARGE_SCALE +# undef NUMBER_OF_eNB_MAX +# undef NUMBER_OF_UE_MAX +# undef NUMBER_OF_CONNECTED_eNB_MAX +# define NUMBER_OF_eNB_MAX 2 +# define NUMBER_OF_UE_MAX 120 +# define NUMBER_OF_CONNECTED_eNB_MAX 1 // to save some memory +# endif #endif -#endif +#endif /* OPENAIRINTERFACE5G_LIMITS_H_ */ -- 2.26.2