openairinterface5g: Fix multi definition of UE/eNB NB_MAX

In openairinterface5g many definitions in many layers of UE or eNB NB_MAX.
We created a file called openairinterface5g_limits.h
located at openairinterface5g_dir/targets/COMMON/ declaring the number max
of UE and eNB to be used in ALL layers depending on launching conditions
(LARGE_SCALE for example).
This commit is contained in:
Imad ALAWE
2017-01-25 13:58:53 +01:00
committed by Frédéric Leroy
parent a731de2f13
commit b3ded7799a
7 changed files with 36 additions and 28 deletions
+2 -1
View File
@@ -19,6 +19,7 @@
* contact@openairinterface.org
*/
#include "openairinterface5g_limits.h"
#ifndef _UE_IP_CST
#define _UE_IP_CST
@@ -51,7 +52,7 @@
#define UE_IP_NB_INSTANCES_MAX 8
#define UE_IP_NB_INSTANCES_MAX NUMBER_OF_UE_MAX
#endif
+5 -6
View File
@@ -31,13 +31,12 @@
#ifndef STRUCTURES_H
#define STRUCTURES_H
#include "openairinterface5g_limits.h"
#ifndef __PHY_IMPLEMENTATION_DEFS_H__
#define Maxneighbor 64
#define NUMBER_OF_UE_MAX 64
#define NUMBER_OF_eNB_MAX 3
#ifndef NB_ANTENNAS_RX
# define NB_ANTENNAS_RX 4
#endif
#define Maxneighbor NUMBER_OF_UE_MAX
#ifndef NB_ANTENNAS_RX
#define NB_ANTENNAS_RX 4
#endif
#endif
//
+4 -4
View File
@@ -33,12 +33,12 @@
#ifndef __OTG_DEFS_H__
# define __OTG_DEFS_H__
/* \brief To define the NUMBER_OF_eNB_MAX and NUMBER_OF_UE_MAX */
#if STANDALONE==1
# define NUMBER_OF_eNB_MAX 3
# define NUMBER_OF_UE_MAX 3
#include "openairinterface5g_limits.h"
#else
#include "PHY/impl_defs_top.h" /* \brief To define the NUMBER_OF_eNB_MAX and NUMBER_OF_UE_MAX */
// impl_defs_top.h includes openairinterface5g_limits.h
#include "PHY/impl_defs_top.h"
#endif
#include "otg_config.h"