From cfec3ffd56610b200b0ee14c51ae67685d88988f Mon Sep 17 00:00:00 2001 From: Wang Tsu-Han <wangts@eurecom.fr> Date: Tue, 16 Jan 2018 15:50:57 +0100 Subject: [PATCH] adding EMULATE_RF into CMakelist --- cmake_targets/CMakeLists.txt | 1 + common/utils/itti/intertask_interface.c | 3 --- openair1/PHY/defs.h | 4 ++-- targets/COMMON/create_tasks.c | 3 --- targets/RT/USER/lte-ru.c | 3 --- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt index 723ad38d67..6cce5e306e 100644 --- a/cmake_targets/CMakeLists.txt +++ b/cmake_targets/CMakeLists.txt @@ -597,6 +597,7 @@ add_boolean_option(NAS_ADDRESS_FIX False "specific to oaisim: for nasmesh driver add_boolean_option(NAS_NETLINK False "???? Must be True to compile nasmesh driver without rtai") add_boolean_option(OAISIM False "specific to oaisim") add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????") +add_boolean_option(EMULATE_RF True "allows to run lte-softmodem without HW") add_boolean_option(USE_MME False "this flag is used only one time in lte-softmodem.c") add_list_string_option(PACKAGE_NAME "NotDefined" "As per attribute name") diff --git a/common/utils/itti/intertask_interface.c b/common/utils/itti/intertask_interface.c index fc366f6057..5462c97523 100644 --- a/common/utils/itti/intertask_interface.c +++ b/common/utils/itti/intertask_interface.c @@ -99,9 +99,6 @@ const int itti_debug = (ITTI_DEBUG_ISSUES | ITTI_DEBUG_MP_STATISTICS); # define ITTI_MEM_SIZE (16 * 1024 * 1024) #endif -#ifndef EMULATE_RF -#define EMULATE_RF -#endif typedef enum task_state_s { TASK_STATE_NOT_CONFIGURED, TASK_STATE_STARTING, TASK_STATE_READY, TASK_STATE_ENDED, TASK_STATE_MAX, diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h index a21f3b1378..f8645fec97 100644 --- a/openair1/PHY/defs.h +++ b/openair1/PHY/defs.h @@ -676,8 +676,8 @@ typedef enum { REMOTE_MBP_IF5 =2, REMOTE_IF4p5 =3, REMOTE_IF1pp =4, - MAX_RU_IF_TYPES =5, - EMULATE_RF =6 + MAX_RU_IF_TYPES =5 + //EMULATE_RF =6 } RU_if_south_t; typedef struct RU_t_s{ diff --git a/targets/COMMON/create_tasks.c b/targets/COMMON/create_tasks.c index 65aed76742..25b5828e06 100644 --- a/targets/COMMON/create_tasks.c +++ b/targets/COMMON/create_tasks.c @@ -40,9 +40,6 @@ # endif # include "enb_app.h" -#ifndef EMULATE_RF -#define EMULATE_RF -#endif int create_tasks(uint32_t enb_nb, uint32_t ue_nb) { diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c index e196584e25..0b5a1e6087 100644 --- a/targets/RT/USER/lte-ru.c +++ b/targets/RT/USER/lte-ru.c @@ -110,9 +110,6 @@ unsigned short config_frames[4] = {2,9,11,13}; #include "T.h" -#ifndef EMULATE_RF -#define EMULATE_RF -#endif extern volatile int oai_exit; extern int numerology; -- GitLab