From 10a5e5fd759a80c6ac17098b69d69a85a10a86a5 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Sat, 23 Mar 2019 16:57:26 +0100 Subject: [PATCH] Use OAI NUM_ENB/UE defines for F1U (removes warnings) --- openair2/LAYER2/PROTO_AGENT/proto_agent.h | 2 -- openair2/LAYER2/PROTO_AGENT/proto_agent_common.c | 2 -- openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h | 7 +++---- openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c | 6 +++--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent.h b/openair2/LAYER2/PROTO_AGENT/proto_agent.h index c6416cd5f9..0c5cd3fa8d 100644 --- a/openair2/LAYER2/PROTO_AGENT/proto_agent.h +++ b/openair2/LAYER2/PROTO_AGENT/proto_agent.h @@ -38,8 +38,6 @@ #ifndef PROTO_AGENT_H_ #define PROTO_AGENT_H_ #include "ENB_APP/enb_config.h" // for enb properties -/* avoid warnings */ -#undef NUM_MAX_ENB #include "proto_agent_common.h" diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c index 4d3abfdab5..1eca32b162 100644 --- a/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c +++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_common.c @@ -39,8 +39,6 @@ #include #include "PHY/phy_extern.h" -/* avoid warnings */ -#undef NUM_MAX_ENB #include "proto_agent_common.h" #include "common/utils/LOG/log.h" diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h b/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h index 8724906d1a..08c91e7085 100644 --- a/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h +++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_defs.h @@ -41,10 +41,9 @@ #include #include +#include "openairinterface5g_limits.h" #include "UTIL/ASYNC_IF/link_manager.h" -#define NUM_MAX_ENB 10 -#define NUM_MAX_UE 2048 #define DEFAULT_PROTO_AGENT_IPv4_ADDRESS "127.0.0.1" #define DEFAULT_PROTO_AGENT_PORT 2210 #define DEFAULT_PROTO_AGENT_CACHE "/mnt/oai_agent_cache" @@ -108,8 +107,8 @@ typedef struct { uint32_t total_rx_msg; uint32_t total_tx_msg; - uint32_t rx_msg[NUM_MAX_ENB]; - uint32_t tx_msg[NUM_MAX_ENB]; + uint32_t rx_msg[NUMBER_OF_eNB_MAX]; + uint32_t tx_msg[NUMBER_OF_eNB_MAX]; } proto_agent_info_t; diff --git a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c b/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c index d396748d76..f64a58f8e1 100644 --- a/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c +++ b/openair2/LAYER2/PROTO_AGENT/proto_agent_net_comm.c @@ -37,7 +37,7 @@ #include "proto_agent_net_comm.h" #include "common/utils/LOG/log.h" -proto_agent_channel_t *proto_channel[NUM_MAX_ENB][ENB_AGENT_MAX]; +proto_agent_channel_t *proto_channel[NUMBER_OF_eNB_MAX][ENB_AGENT_MAX]; proto_agent_channel_instance_t channel_instance; int proto_agent_channel_id = 0; @@ -106,7 +106,7 @@ int proto_agent_destroy_channel(int channel_id) { } /*Unregister the channel from all agents*/ - for (i = 0; i < NUM_MAX_ENB; i++) { + for (i = 0; i < NUMBER_OF_eNB_MAX; i++) { for (j = 0; j < ENB_AGENT_MAX; j++) { if (proto_channel[i][j] != NULL) { if (proto_channel[i][j]->channel_id == e->channel_id) { @@ -130,7 +130,7 @@ err_code_t proto_agent_init_channel_container(void) { RB_INIT(&channel_instance.proto_agent_head); - for (i = 0; i < NUM_MAX_ENB; i++) { + for (i = 0; i < NUMBER_OF_eNB_MAX; i++) { for (j = 0; j < ENB_AGENT_MAX; j++) { proto_channel[i][j] = NULL; }