From 91dfec62272a222d259b9b36290dd9a6c0dfc4ce Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Sun, 15 Dec 2013 22:29:35 +0000
Subject: [PATCH] - Fix some more compiler warnings
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4731 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/UTIL/OCG/OCG.h | 3 +-
targets/SIMU/USER/oaisim_config.c | 56 ++++++++++++++--------------
targets/SIMU/USER/oaisim_functions.c | 2 +-
3 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/openair2/UTIL/OCG/OCG.h b/openair2/UTIL/OCG/OCG.h
index 6ae42a59b9..5f94d283a7 100644
--- a/openair2/UTIL/OCG/OCG.h
+++ b/openair2/UTIL/OCG/OCG.h
@@ -686,7 +686,8 @@ The following diagram is based on graphviz (http://www.graphviz.org/), you need
double time_s;
double time_ms;
unsigned int g_log_level;
- char * g_log_verbosity;
+ unsigned int g_log_verbosity;
+ char *g_log_verbosity_option;
// phy related params
unsigned int n_frames;
unsigned int n_frames_flag; // if set, then let the emulation goes to infinity
diff --git a/targets/SIMU/USER/oaisim_config.c b/targets/SIMU/USER/oaisim_config.c
index f443f344fb..2145479bf1 100644
--- a/targets/SIMU/USER/oaisim_config.c
+++ b/targets/SIMU/USER/oaisim_config.c
@@ -173,15 +173,15 @@ void init_oai_emulation() {
oai_emulation.environment_system_config.fading.shadowing.inter_site_correlation = 0;
oai_emulation.environment_system_config.antenna.eNB_antenna.number_of_sectors = 1;
oai_emulation.environment_system_config.antenna.eNB_antenna.beam_width_dB = 1.13;
+ oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[0] = 0;
oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[1] = 0;
oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[2] = 0;
- oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[3] = 0;
oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_gain_dBi = 0;
oai_emulation.environment_system_config.antenna.eNB_antenna.tx_power_dBm = 15;
oai_emulation.environment_system_config.antenna.eNB_antenna.rx_noise_level_dB = 0;
+ oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[0] = 0;
oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[1] = 0;
oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[2] = 0;
- oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[3] = 0;
oai_emulation.environment_system_config.antenna.UE_antenna.antenna_gain_dBi = 0;
oai_emulation.environment_system_config.antenna.UE_antenna.tx_power_dBm = 20;
oai_emulation.environment_system_config.antenna.UE_antenna.rx_noise_level_dB = 0; // noise figure
@@ -364,22 +364,22 @@ void init_oai_emulation() {
for (i=0; i < NUMBER_OF_eNB_MAX+NUMBER_OF_UE_MAX; i++)
oai_emulation.info.oai_ifup[i]=0;
- oai_emulation.info.nb_master =0;
- oai_emulation.info.ethernet_id=0;
- oai_emulation.info.multicast_group=0;
- oai_emulation.info.multicast_ifname=NULL;
- oai_emulation.info.g_log_level= LOG_INFO;
- oai_emulation.info.g_log_verbosity= "medium";
+ oai_emulation.info.nb_master =0;
+ oai_emulation.info.ethernet_id=0;
+ oai_emulation.info.multicast_group=0;
+ oai_emulation.info.multicast_ifname=NULL;
+ oai_emulation.info.g_log_level= LOG_INFO;
+ oai_emulation.info.g_log_verbosity = 0x15;
+ oai_emulation.info.g_log_verbosity_option = "medium";
- oai_emulation.info.frame_type=1;
- oai_emulation.info.tdd_config=3;
- oai_emulation.info.tdd_config_S=0;
- oai_emulation.info.extended_prefix_flag=0;
- oai_emulation.info.N_RB_DL=25;
- oai_emulation.info.transmission_mode=2;
-
- oai_emulation.profile = "EURECOM";
-
+ oai_emulation.info.frame_type=1;
+ oai_emulation.info.tdd_config=3;
+ oai_emulation.info.tdd_config_S=0;
+ oai_emulation.info.extended_prefix_flag=0;
+ oai_emulation.info.N_RB_DL=25;
+ oai_emulation.info.transmission_mode=2;
+
+ oai_emulation.profile = "EURECOM";
}
@@ -436,12 +436,12 @@ int olg_config() {
// fix me:
oai_emulation.info.g_log_level = ((oai_emulation.info.ocg_enabled == 1) && (ocg_log_level != -1)) ? ocg_log_level : oai_emulation.info.g_log_level;
oai_emulation.info.g_log_verbosity = (((oai_emulation.info.ocg_enabled == 1) && (ocg_log_verbosity != -1)) ? ocg_log_verbosity :
- map_str_to_int(log_verbosity_names, oai_emulation.info.g_log_verbosity));
+ map_str_to_int(log_verbosity_names, oai_emulation.info.g_log_verbosity_option));
- LOG_N(EMU,"global log level is set to (%s,%d) with vebosity (%s, 0x%x) and frequency %d\n",
+ LOG_N(EMU, "global log level is set to (%s,%d) with vebosity (%s, 0x%x) and frequency %d\n",
map_int_to_str (log_level_names, oai_emulation.info.g_log_level),
oai_emulation.info.g_log_level,
- map_int_to_str (log_verbosity_names,oai_emulation.info.g_log_verbosity),
+ map_int_to_str (log_verbosity_names, oai_emulation.info.g_log_verbosity),
oai_emulation.info.g_log_verbosity,
oai_emulation.emulation_config.log_emu.interval );
set_glog(oai_emulation.info.g_log_level, oai_emulation.info.g_log_verbosity ); //g_glog
@@ -610,7 +610,7 @@ int ocg_config_topo() {
-int ocg_config_app(){
+int ocg_config_app(void){
char colon[] = ":";
char comma[] = ",";
@@ -619,8 +619,8 @@ int ocg_config_app(){
char *check_format1;
char *check_format2;
char *check_format1_dst;
- char *source_id_start;
- char *source_id_end;
+ char *source_id_start = NULL;
+ char *source_id_end = NULL;
char *destination_id_start;
char *destination_id_end;
int sid_start;
@@ -1003,11 +1003,11 @@ g_otg->application_idx[source_id_index][destination_id_index]+=1;
}
init_predef_traffic(oai_emulation.info.nb_ue_local, oai_emulation.info.nb_enb_local);
- for (i=0; i<16; i++){//maxServiceCount
- for (j=0; j<28; j++){ // maxSessionPerPMCH
- for (k=0; k<MAX_NUM_APPLICATION; k++){
- g_otg_multicast->application_type[i][j][k] = map_str_to_int( otg_multicast_app_type_names, oai_emulation.info.otg_traffic);
- }
+ for (i=0; i<NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX; i++){//maxServiceCount
+ for (j=0; j<NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX; j++){ // maxSessionPerPMCH
+ for (k=0; k<MAX_NUM_APPLICATION; k++){
+ g_otg_multicast->application_type[i][j][k] = map_str_to_int( otg_multicast_app_type_names, oai_emulation.info.otg_traffic);
+ }
}
}
init_predef_multicast_traffic();
diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c
index 2081749086..b899e4c84a 100644
--- a/targets/SIMU/USER/oaisim_functions.c
+++ b/targets/SIMU/USER/oaisim_functions.c
@@ -362,7 +362,7 @@ void get_simulation_options(int argc, char *argv[]) {
oai_emulation.info.g_log_level = atoi(optarg);
break;
case 'Y':
- oai_emulation.info.g_log_verbosity = optarg;
+ oai_emulation.info.g_log_verbosity_option = strdup(optarg);
break;
case 'c':
strcpy(oai_emulation.info.local_server, optarg);
--
GitLab