From 35baba676eb5eee91b7b93aa4a5fad4603f0d98d Mon Sep 17 00:00:00 2001 From: Lionel Gauthier Date: Thu, 9 Apr 2015 09:21:11 +0000 Subject: [PATCH] patches13/0021-cosmetic.patch git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7067 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair2/UTIL/OCG/OCG.h | 2 +- targets/SIMU/USER/oaisim_functions.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/openair2/UTIL/OCG/OCG.h b/openair2/UTIL/OCG/OCG.h index 431beed61f..e30849da41 100644 --- a/openair2/UTIL/OCG/OCG.h +++ b/openair2/UTIL/OCG/OCG.h @@ -756,7 +756,7 @@ The following diagram is based on graphviz (http://www.graphviz.org/), you need // phy related params unsigned int n_frames; unsigned int n_frames_flag; // if set, then let the emulation goes to infinity - unsigned char frame_type[MAX_NUM_CCs]; + unsigned char frame_type[MAX_NUM_CCs]; //! LTE frame type (TDD=1, FDD=0). \note this should be converted to \ref lte_frame_type_t (header file reorganization needed) char * frame_type_name[MAX_NUM_CCs]; unsigned char tdd_config[MAX_NUM_CCs]; unsigned char tdd_config_S[MAX_NUM_CCs]; diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c index 9d2ad318b9..f0b44bce3f 100644 --- a/targets/SIMU/USER/oaisim_functions.c +++ b/targets/SIMU/USER/oaisim_functions.c @@ -965,8 +965,20 @@ void init_openair2(void) { void init_ocm(void) { module_id_t UE_id, eNB_id; int CC_id; + /* Added for PHY abstraction */ - LOG_I(OCM,"Running with frame_type %d, Nid_cell %d, N_RB_DL %d, EP %d, mode %d, target dl_mcs %d, rate adaptation %d, nframes %d, abstraction %d, channel %s\n", oai_emulation.info.frame_type[0], Nid_cell, oai_emulation.info.N_RB_DL[0], oai_emulation.info.extended_prefix_flag[0], oai_emulation.info.transmission_mode[0],target_dl_mcs,rate_adaptation_flag,oai_emulation.info.n_frames,abstraction_flag,oai_emulation.environment_system_config.fading.small_scale.selected_option); + + char* frame_type = "unknown"; + switch (oai_emulation.info.frame_type[0]) { + case FDD: + frame_type = "FDD"; + break; + case TDD: + frame_type = "FDD"; + break; + } + LOG_I(OCM,"Running with frame_type %d (%s), Nid_cell %d, N_RB_DL %d, EP %d, mode %d, target dl_mcs %d, rate adaptation %d, nframes %d, abstraction %d, channel %s\n", + oai_emulation.info.frame_type[0], frame_type, Nid_cell, oai_emulation.info.N_RB_DL[0], oai_emulation.info.extended_prefix_flag[0], oai_emulation.info.transmission_mode[0],target_dl_mcs,rate_adaptation_flag,oai_emulation.info.n_frames,abstraction_flag,oai_emulation.environment_system_config.fading.small_scale.selected_option); if (abstraction_flag) {