From 8333f4cd4a445f59a8a5986e06cba74d2eeaa480 Mon Sep 17 00:00:00 2001
From: Francesco Bronzino <bronzino@winlab.rutgers.edu>
Date: Tue, 24 Nov 2015 14:19:56 +0100
Subject: [PATCH] Fixing some pointer errors
---
targets/SIMU/USER/oaisim_config.c | 42 ++++++++++++++--------------
targets/SIMU/USER/oaisim_functions.c | 4 +--
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/targets/SIMU/USER/oaisim_config.c b/targets/SIMU/USER/oaisim_config.c
index 987abdf8b..747f932c1 100644
--- a/targets/SIMU/USER/oaisim_config.c
+++ b/targets/SIMU/USER/oaisim_config.c
@@ -328,7 +328,7 @@ void init_oai_emulation(void)
}
-void oaisim_config(Enb_properties_array_t *enb_properties)
+void oaisim_config(void)
{
// init log gen first
@@ -398,40 +398,40 @@ void set_log_from_enb_properties(Enb_properties_array_t *enb_properties)
}
printf("configuring for eNB\n");
- set_comp_log(HW, enb_properties->properties->hw_log_level,
- enb_properties->properties-> hw_log_verbosity, 1);
+ set_comp_log(HW, enb_properties->properties[0]->hw_log_level,
+ enb_properties->properties[0]->hw_log_verbosity, 1);
#ifdef OPENAIR2
- set_comp_log(PHY, enb_properties->properties->phy_log_level,
- enb_properties->properties->phy_log_verbosity, 1);
+ set_comp_log(PHY, enb_properties->properties[0]->phy_log_level,
+ enb_properties->properties[0]->phy_log_verbosity, 1);
if (opt_enabled == 1 )
- set_comp_log(OPT, enb_properties->properties->opt_log_level,
- enb_properties->properties->opt_log_verbosity, 1);
+ set_comp_log(OPT, enb_properties->properties[0]->opt_log_level,
+ enb_properties->properties[0]->opt_log_verbosity, 1);
#else
set_comp_log(PHY, LOG_INFO, LOG_HIGH, 1);
#endif
- set_comp_log(MAC, enb_properties->properties->mac_log_level,
- enb_properties->properties->mac_log_verbosity, 1);
- set_comp_log(RLC, enb_properties->properties->rlc_log_level,
- enb_properties->properties->rlc_log_verbosity, 1);
- set_comp_log(PDCP, enb_properties->properties->pdcp_log_level,
- enb_properties->properties->pdcp_log_verbosity, 1);
- set_comp_log(RRC, enb_properties->properties->rrc_log_level,
- enb_properties->properties->rrc_log_verbosity, 1);
+ set_comp_log(MAC, enb_properties->properties[0]->mac_log_level,
+ enb_properties->properties[0]->mac_log_verbosity, 1);
+ set_comp_log(RLC, enb_properties->properties[0]->rlc_log_level,
+ enb_properties->properties[0]->rlc_log_verbosity, 1);
+ set_comp_log(PDCP, enb_properties->properties[0]->pdcp_log_level,
+ enb_properties->properties[0]->pdcp_log_verbosity, 1);
+ set_comp_log(RRC, enb_properties->properties[0]->rrc_log_level,
+ enb_properties->properties[0]->rrc_log_verbosity, 1);
#if defined(ENABLE_ITTI)
set_comp_log(EMU, LOG_INFO, LOG_MED, 1);
#if defined(ENABLE_USE_MME)
- set_comp_log(UDP_, enb_properties->properties->udp_log_level,
- enb_properties->properties->udp_log_verbosity, 1);
- set_comp_log(GTPU, enb_properties->properties->gtpu_log_level,
- enb_properties->properties->gtpu_log_verbosity, 1);
+ set_comp_log(UDP_, enb_properties->properties[0]->udp_log_level,
+ enb_properties->properties[0]->udp_log_verbosity, 1);
+ set_comp_log(GTPU, enb_properties->properties[0]->gtpu_log_level,
+ enb_properties->properties[0]->gtpu_log_verbosity, 1);
set_comp_log(S1AP, LOG_DEBUG, LOG_HIGH, 1);
set_comp_log(SCTP, LOG_INFO, LOG_HIGH, 1);
# endif
#if defined(ENABLE_SECURITY)
- set_comp_log(OSA, enb_properties->properties->osa_log_level,
- enb_properties->properties->osa_log_verbosity, 1);
+ set_comp_log(OSA, enb_properties->properties[0]->osa_log_level,
+ enb_properties->properties[0]->osa_log_verbosity, 1);
#endif
#endif
#ifdef LOCALIZATION
diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c
index 1d36224f1..649b226fc 100644
--- a/targets/SIMU/USER/oaisim_functions.c
+++ b/targets/SIMU/USER/oaisim_functions.c
@@ -733,10 +733,10 @@ Enb_properties_array_t *get_simulation_options(int argc, char *argv[])
//info: global values need to be set here to have command line options context
// i.e. know whether to overwrite config file with command line options
if(!glog_set){
- oai_emulation.info.g_log_level = enb_properties->properties->glog_level;
+ oai_emulation.info.g_log_level = enb_properties->properties[0]->glog_level;
}
if(!glog_verbosity_set) {
- oai_emulation.info.g_log_verbosity = enb_properties->properties->glog_verbosity;
+ oai_emulation.info.g_log_verbosity = enb_properties->properties[0]->glog_verbosity;
}
AssertFatal (oai_emulation.info.nb_enb_local <= enb_properties->number,
--
GitLab