PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add ifdef guards for NR code

This commit is contained in:
Francisco Paisana 2020-06-18 13:07:59 +01:00
parent 0938c447f7
commit ddff68a546
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
srsenb/src/enb.cc
View File

@ -20,12 +20,14 @@
*/ */
#include "srsenb/hdr/enb.h" #include "srsenb/hdr/enb.h"
#include "srsenb/hdr/phy/vnf_phy_nr.h"
#include "srsenb/hdr/stack/enb_stack_lte.h" #include "srsenb/hdr/stack/enb_stack_lte.h"
#include "srsenb/hdr/stack/gnb_stack_nr.h"
#include "srsenb/src/enb_cfg_parser.h" #include "srsenb/src/enb_cfg_parser.h"
#include "srslte/build_info.h" #include "srslte/build_info.h"
#include "srslte/radio/radio_null.h" #include "srslte/radio/radio_null.h"
#ifdef ENABLE_5GNR
#include "srsenb/hdr/phy/vnf_phy_nr.h"
#include "srsenb/hdr/stack/gnb_stack_nr.h"
#endif
#include <iostream> #include <iostream>
namespace srsenb { namespace srsenb {
@ -111,7 +113,7 @@ int enb::init(const all_args_t& args_, srslte::logger* logger_)
radio = std::move(lte_radio); radio = std::move(lte_radio);
} else if (args.stack.type == "nr") { } else if (args.stack.type == "nr") {
#ifdef ENABLE_5GNR
std::unique_ptr<srsenb::gnb_stack_nr> nr_stack(new srsenb::gnb_stack_nr(logger)); std::unique_ptr<srsenb::gnb_stack_nr> nr_stack(new srsenb::gnb_stack_nr(logger));
std::unique_ptr<srslte::radio_null> nr_radio(new srslte::radio_null(logger)); std::unique_ptr<srslte::radio_null> nr_radio(new srslte::radio_null(logger));
std::unique_ptr<srsenb::vnf_phy_nr> nr_phy(new srsenb::vnf_phy_nr(logger)); std::unique_ptr<srsenb::vnf_phy_nr> nr_phy(new srsenb::vnf_phy_nr(logger));
@ -143,6 +145,9 @@ int enb::init(const all_args_t& args_, srslte::logger* logger_)
stack = std::move(nr_stack); stack = std::move(nr_stack);
phy = std::move(nr_phy); phy = std::move(nr_phy);
radio = std::move(nr_radio); radio = std::move(nr_radio);
#else
log->error("5G NR stack not compiled. Please, activate CMAKE ENABLE_5GNR flag.\n");
#endif
} }
started = true; // set to true in any case to allow stopping the eNB if an error happened started = true; // set to true in any case to allow stopping the eNB if an error happened

8
srsue/src/ue.cc
View File

@ -26,9 +26,11 @@
#include "srslte/radio/radio_null.h" #include "srslte/radio/radio_null.h"
#include "srslte/srslte.h" #include "srslte/srslte.h"
#include "srsue/hdr/phy/phy.h" #include "srsue/hdr/phy/phy.h"
#include "srsue/hdr/phy/vnf_phy_nr.h"
#include "srsue/hdr/stack/ue_stack_lte.h" #include "srsue/hdr/stack/ue_stack_lte.h"
#ifdef ENABLE_5GNR
#include "srsue/hdr/phy/vnf_phy_nr.h"
#include "srsue/hdr/stack/ue_stack_nr.h" #include "srsue/hdr/stack/ue_stack_nr.h"
#endif
#include <algorithm> #include <algorithm>
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -120,6 +122,7 @@ int ue::init(const all_args_t& args_, srslte::logger* logger_)
phy = std::move(lte_phy); phy = std::move(lte_phy);
radio = std::move(lte_radio); radio = std::move(lte_radio);
} else if (args.stack.type == "nr") { } else if (args.stack.type == "nr") {
#ifdef ENABLE_5GNR
std::unique_ptr<srsue::ue_stack_nr> nr_stack(new srsue::ue_stack_nr(logger)); std::unique_ptr<srsue::ue_stack_nr> nr_stack(new srsue::ue_stack_nr(logger));
std::unique_ptr<srslte::radio_null> nr_radio(new srslte::radio_null(logger)); std::unique_ptr<srslte::radio_null> nr_radio(new srslte::radio_null(logger));
std::unique_ptr<srsue::vnf_phy_nr> nr_phy(new srsue::vnf_phy_nr(logger)); std::unique_ptr<srsue::vnf_phy_nr> nr_phy(new srsue::vnf_phy_nr(logger));
@ -151,6 +154,9 @@ int ue::init(const all_args_t& args_, srslte::logger* logger_)
gw_inst = std::move(gw_ptr); gw_inst = std::move(gw_ptr);
phy = std::move(nr_phy); phy = std::move(nr_phy);
radio = std::move(nr_radio); radio = std::move(nr_radio);
#else
log.error("5G NR stack not compiled. Please, activate CMAKE ENABLE_5GNR flag.\n");
#endif
} else { } else {
log.console("Invalid stack type %s. Supported values are [lte].\n", args.stack.type.c_str()); log.console("Invalid stack type %s. Supported values are [lte].\n", args.stack.type.c_str());
ret = SRSLTE_ERROR; ret = SRSLTE_ERROR;