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

Rename drb.conf to rb.conf to reflect the now configurable SRBs.

Browse Source
master
Pedro Alvarez 3 years ago committed by Ismael Gomez
parent 17c09dfd75
commit f0a28ebc88
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
cmake/modules/SRSRAN_install_configs.sh.in
Unescape Escape View File

@ -105,7 +105,7 @@ install_file "ue.conf.example"
install_file "enb.conf.example" install_file "enb.conf.example"
install_file "sib.conf.example" install_file "sib.conf.example"
install_file "rr.conf.example" install_file "rr.conf.example"
install_file "drb.conf.example" install_file "rb.conf.example"
install_file "epc.conf.example" install_file "epc.conf.example"
install_file "mbms.conf.example" install_file "mbms.conf.example"
install_file "user_db.csv.example" install_file "user_db.csv.example"

6
srsenb/CMakeLists.txt
Unescape Escape View File

@ -41,6 +41,6 @@ add_subdirectory(test)
# Default configuration files # Default configuration files
######################################################################## ########################################################################
install(FILES enb.conf.example DESTINATION ${DATA_DIR}) install(FILES enb.conf.example DESTINATION ${DATA_DIR})
install(FILES drb.conf.example DESTINATION ${DATA_DIR}) install(FILES rb.conf.example DESTINATION ${DATA_DIR})
install(FILES rr.conf.example DESTINATION ${DATA_DIR}) install(FILES rr.conf.example DESTINATION ${DATA_DIR})
install(FILES sib.conf.example DESTINATION ${DATA_DIR}) install(FILES sib.conf.example DESTINATION ${DATA_DIR})

4
srsenb/enb.conf.example
Unescape Escape View File

@ -36,12 +36,12 @@ n_prb = 50
# sib_config: SIB1, SIB2 and SIB3 configuration file # sib_config: SIB1, SIB2 and SIB3 configuration file
# note: when enabling mbms, use the sib.conf.mbsfn configuration file which includes SIB13 # note: when enabling mbms, use the sib.conf.mbsfn configuration file which includes SIB13
# rr_config: Radio Resources configuration file # rr_config: Radio Resources configuration file
# drb_config: DRB configuration file # rb_config: SRB/DRB configuration file
##################################################################### #####################################################################
[enb_files] [enb_files]
sib_config = sib.conf sib_config = sib.conf
rr_config = rr.conf rr_config = rr.conf
drb_config = drb.conf rb_config = rb.conf
##################################################################### #####################################################################
# RF configuration # RF configuration

2
srsenb/hdr/enb.h
Unescape Escape View File

@ -62,7 +62,7 @@ struct enb_args_t {
struct enb_files_t { struct enb_files_t {
std::string sib_config; std::string sib_config;
std::string rr_config; std::string rr_config;
std::string drb_config; std::string rb_config;
}; };
struct log_args_t { struct log_args_t {

0
srsenb/drb.conf.example → srsenb/rb.conf.example
Unescape Escape View File

2
srsenb/src/enb_cfg_parser.cc
Unescape Escape View File

@ -1735,7 +1735,7 @@ int parse_drb(all_args_t* args_, rrc_cfg_t* rrc_cfg_)
qci.add_field(new field_qci(rrc_cfg_->qci_cfg)); qci.add_field(new field_qci(rrc_cfg_->qci_cfg));
// Run parser with two sections // Run parser with two sections
parser p(args_->enb_files.drb_config); parser p(args_->enb_files.rb_config);
p.add_section(&srb1); p.add_section(&srb1);
p.add_section(&srb2); p.add_section(&srb2);
p.add_section(&qci); p.add_section(&qci);

6
srsenb/src/main.cc
Unescape Escape View File

@ -83,7 +83,7 @@ void parse_args(all_args_t* args, int argc, char* argv[])
("enb_files.sib_config", bpo::value<string>(&args->enb_files.sib_config)->default_value("sib.conf"), "SIB configuration files") ("enb_files.sib_config", bpo::value<string>(&args->enb_files.sib_config)->default_value("sib.conf"), "SIB configuration files")
("enb_files.rr_config", bpo::value<string>(&args->enb_files.rr_config)->default_value("rr.conf"), "RR configuration files") ("enb_files.rr_config", bpo::value<string>(&args->enb_files.rr_config)->default_value("rr.conf"), "RR configuration files")
("enb_files.drb_config", bpo::value<string>(&args->enb_files.drb_config)->default_value("drb.conf"), "DRB configuration files") ("enb_files.rb_config", bpo::value<string>(&args->enb_files.rb_config)->default_value("rb.conf"), "SRB/DRB configuration files")
("rf.dl_earfcn", bpo::value<uint32_t>(&args->enb.dl_earfcn)->default_value(0), "Force Downlink EARFCN for single cell") ("rf.dl_earfcn", bpo::value<uint32_t>(&args->enb.dl_earfcn)->default_value(0), "Force Downlink EARFCN for single cell")
("rf.srate", bpo::value<double>(&args->rf.srate_hz)->default_value(0.0), "Force Tx and Rx sampling rate in Hz") ("rf.srate", bpo::value<double>(&args->rf.srate_hz)->default_value(0.0), "Force Tx and Rx sampling rate in Hz")
@ -436,8 +436,8 @@ void parse_args(all_args_t* args, int argc, char* argv[])
exit(1); exit(1);
} }
if (!config_exists(args->enb_files.drb_config, "drb.conf")) { if (!config_exists(args->enb_files.rb_config, "rb.conf")) {
cout << "Failed to read DRB configuration file " << args->enb_files.drb_config << " - exiting" << endl; cout << "Failed to read DRB configuration file " << args->enb_files.rb_config << " - exiting" << endl;
exit(1); exit(1);
} }

6
srsenb/test/rrc/test_helpers.cc
Unescape Escape View File

@ -28,7 +28,7 @@ int parse_default_cfg_phy(rrc_cfg_t* rrc_cfg, phy_cfg_t* phy_cfg, srsenb::all_ar
*rrc_cfg = {}; *rrc_cfg = {};
args.enb_files.sib_config = argparse::repository_dir + "/sib.conf.example"; args.enb_files.sib_config = argparse::repository_dir + "/sib.conf.example";
args.enb_files.rr_config = argparse::repository_dir + "/rr.conf.example"; args.enb_files.rr_config = argparse::repository_dir + "/rr.conf.example";
args.enb_files.drb_config = argparse::repository_dir + "/drb.conf.example"; args.enb_files.rb_config = argparse::repository_dir + "/rb.conf.example";
srslog::fetch_basic_logger("TEST").debug("sib file path=%s", args.enb_files.sib_config.c_str()); srslog::fetch_basic_logger("TEST").debug("sib file path=%s", args.enb_files.sib_config.c_str());
args.enb.enb_id = 0x19B; args.enb.enb_id = 0x19B;
@ -48,7 +48,7 @@ int parse_default_cfg(rrc_cfg_t* rrc_cfg, srsenb::all_args_t& args)
*rrc_cfg = {}; *rrc_cfg = {};
args.enb_files.sib_config = argparse::repository_dir + "/sib.conf.example"; args.enb_files.sib_config = argparse::repository_dir + "/sib.conf.example";
args.enb_files.rr_config = argparse::repository_dir + "/rr.conf.example"; args.enb_files.rr_config = argparse::repository_dir + "/rr.conf.example";
args.enb_files.drb_config = argparse::repository_dir + "/drb.conf.example"; args.enb_files.rb_config = argparse::repository_dir + "/rb.conf.example";
srslog::fetch_basic_logger("TEST").debug("sib file path=%s", args.enb_files.sib_config.c_str()); srslog::fetch_basic_logger("TEST").debug("sib file path=%s", args.enb_files.sib_config.c_str());
args.enb.enb_id = 0x19B; args.enb.enb_id = 0x19B;
@ -184,4 +184,4 @@ bool is_cell_cfg_equal(const meas_cell_cfg_t& cfg, const cells_to_add_mod_s& cel
return cfg.pci == cell.pci and cell.cell_individual_offset.to_number() == (int8_t)round(cfg.q_offset); return cfg.pci == cell.pci and cell.cell_individual_offset.to_number() == (int8_t)round(cfg.q_offset);
} }
} // namespace srsenb } // namespace srsenb

Write Preview
Loading…
Cancel
Save