5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix nr activation guards

Browse Source
master
Francisco Paisana 5 years ago
parent 29e126a583
commit d7138b7752
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
lib/src/upper/pdcp.cc
Unescape Escape View File

@ -20,7 +20,7 @@
*/ */
#include "srslte/upper/pdcp.h" #include "srslte/upper/pdcp.h"
#ifdef ENABLE_5GNR #ifdef HAVE_5GNR
#include "srslte/upper/pdcp_entity_nr.h" #include "srslte/upper/pdcp_entity_nr.h"
#endif #endif
@ -109,7 +109,7 @@ void pdcp::add_bearer(uint32_t lcid, pdcp_config_t cfg)
if (cfg.sn_len == srslte::PDCP_SN_LEN_18) { if (cfg.sn_len == srslte::PDCP_SN_LEN_18) {
// create NR entity for 18bit SN length // create NR entity for 18bit SN length
#ifdef ENABLE_5GNR #ifdef HAVE_5GNR
entity.reset(new pdcp_entity_nr{rlc, rrc, gw, task_executor, pdcp_log, lcid, cfg}); entity.reset(new pdcp_entity_nr{rlc, rrc, gw, task_executor, pdcp_log, lcid, cfg});
#else #else
pdcp_log->error("Invalid PDCP configuration.\n"); pdcp_log->error("Invalid PDCP configuration.\n");

7
srsenb/src/enb.cc
Unescape Escape View File

@ -24,7 +24,7 @@
#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 #ifdef HAVE_5GNR
#include "srsenb/hdr/phy/vnf_phy_nr.h" #include "srsenb/hdr/phy/vnf_phy_nr.h"
#include "srsenb/hdr/stack/gnb_stack_nr.h" #include "srsenb/hdr/stack/gnb_stack_nr.h"
#endif #endif
@ -113,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 #ifdef HAVE_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));
@ -146,7 +146,8 @@ int enb::init(const all_args_t& args_, srslte::logger* logger_)
phy = std::move(nr_phy); phy = std::move(nr_phy);
radio = std::move(nr_radio); radio = std::move(nr_radio);
#else #else
log->error("5G NR stack not compiled. Please, activate CMAKE ENABLE_5GNR flag.\n"); log->console("ERROR: 5G NR stack not compiled. Please, activate CMAKE HAVE_5GNR flag.\n");
log->error("5G NR stack not compiled. Please, activate CMAKE HAVE_5GNR flag.\n");
#endif #endif
} }

2
srsue/src/main.cc
Unescape Escape View File

@ -70,7 +70,7 @@ static int parse_args(all_args_t* args, int argc, char* argv[])
common.add_options() common.add_options()
("ue.radio", bpo::value<string>(&args->rf.type)->default_value("multi"), "Type of the radio [multi]") ("ue.radio", bpo::value<string>(&args->rf.type)->default_value("multi"), "Type of the radio [multi]")
("ue.phy", bpo::value<string>(&args->phy.type)->default_value("lte"), "Type of the PHY [lte]") ("ue.phy", bpo::value<string>(&args->phy.type)->default_value("lte"), "Type of the PHY [lte]")
("ue.stack", bpo::value<string>(&args->stack.type)->default_value("lte"), "Type of the upper stack [lte]") ("ue.stack", bpo::value<string>(&args->stack.type)->default_value("lte"), "Type of the upper stack [lte, nr]")
("rf.dl_earfcn", bpo::value<string>(&args->phy.dl_earfcn)->default_value("3400"), "Downlink EARFCN list") ("rf.dl_earfcn", bpo::value<string>(&args->phy.dl_earfcn)->default_value("3400"), "Downlink EARFCN list")
("rf.ul_earfcn", bpo::value<string>(&args->phy.ul_earfcn), "Uplink EARFCN list. Optional.") ("rf.ul_earfcn", bpo::value<string>(&args->phy.ul_earfcn), "Uplink EARFCN list. Optional.")

8
srsue/src/ue.cc
Unescape Escape View File

@ -27,7 +27,7 @@
#include "srslte/srslte.h" #include "srslte/srslte.h"
#include "srsue/hdr/phy/phy.h" #include "srsue/hdr/phy/phy.h"
#include "srsue/hdr/stack/ue_stack_lte.h" #include "srsue/hdr/stack/ue_stack_lte.h"
#ifdef ENABLE_5GNR #ifdef HAVE_5GNR
#include "srsue/hdr/phy/vnf_phy_nr.h" #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 #endif
@ -122,7 +122,8 @@ 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 log.info("Initializing NR stack.\n");
#ifdef HAVE_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));
@ -155,7 +156,8 @@ int ue::init(const all_args_t& args_, srslte::logger* logger_)
phy = std::move(nr_phy); phy = std::move(nr_phy);
radio = std::move(nr_radio); radio = std::move(nr_radio);
#else #else
log.error("5G NR stack not compiled. Please, activate CMAKE ENABLE_5GNR flag.\n"); log.console("ERROR: 5G NR stack not compiled. Please, activate CMAKE HAVE_5GNR flag.\n");
log.error("5G NR stack not compiled. Please, activate CMAKE HAVE_5GNR flag.\n");
#endif #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());

Write Preview
Loading…
Cancel
Save