From 95cc6238a53e29f90286fb8b380052820974b139 Mon Sep 17 00:00:00 2001 From: Francisco Date: Sat, 21 Nov 2020 01:07:07 +0000 Subject: [PATCH] compilation time reduction - avoid including enb_stack_lte.h in main.cc and include enb_stack_base instead --- srsenb/hdr/enb.h | 6 +++--- srsenb/src/enb.cc | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/srsenb/hdr/enb.h b/srsenb/hdr/enb.h index b2effc1a5..eb0a493fd 100644 --- a/srsenb/hdr/enb.h +++ b/srsenb/hdr/enb.h @@ -38,7 +38,6 @@ #include "srsenb/hdr/phy/enb_phy_base.h" #include "srsenb/hdr/stack/enb_stack_base.h" -#include "srsenb/hdr/stack/enb_stack_lte.h" #include "srslte/common/bcd_helpers.h" #include "srslte/common/buffer_pool.h" @@ -107,6 +106,8 @@ struct all_args_t { stack_args_t stack; }; +struct rrc_cfg_t; + /******************************************************************************* Main eNB class *******************************************************************************/ @@ -135,7 +136,7 @@ public: private: const static int ENB_POOL_SIZE = 1024 * 10; - int parse_args(const all_args_t& args_); + int parse_args(const all_args_t& args_, rrc_cfg_t& rrc_cfg); // eNB components std::unique_ptr stack; @@ -153,7 +154,6 @@ private: bool started = false; phy_cfg_t phy_cfg = {}; - rrc_cfg_t rrc_cfg = {}; srslte::LOG_LEVEL_ENUM level(std::string l); diff --git a/srsenb/src/enb.cc b/srsenb/src/enb.cc index 1dbcd0733..a2a9eacbc 100644 --- a/srsenb/src/enb.cc +++ b/srsenb/src/enb.cc @@ -55,7 +55,8 @@ int enb::init(const all_args_t& args_, srslte::logger* logger_) log->info("%s", get_build_string().c_str()); // Validate arguments - if (parse_args(args_)) { + rrc_cfg_t rrc_cfg = {}; + if (parse_args(args_, rrc_cfg)) { srslte::console("Error processing arguments.\n"); return SRSLTE_ERROR; } @@ -183,7 +184,7 @@ void enb::stop() } } -int enb::parse_args(const all_args_t& args_) +int enb::parse_args(const all_args_t& args_, rrc_cfg_t& rrc_cfg) { // set member variable args = args_;