added minimum CFI to config

master
Francisco Paisana 5 years ago committed by Francisco Paisana
parent 807d177b47
commit 4fc243ae4b

@ -937,9 +937,14 @@ int set_derived_args(all_args_t* args_, rrc_cfg_t* rrc_cfg_, phy_cfg_t* phy_cfg_
rrc_cfg_->enable_mbsfn = args_->stack.embms.enable; rrc_cfg_->enable_mbsfn = args_->stack.embms.enable;
// Check number of control symbols // Check number of control symbols
if (args_->stack.mac.sched.min_nof_ctrl_symbols > args_->stack.mac.sched.max_nof_ctrl_symbols) {
ERROR("Invalid minimum number of control symbols %d. Setting it to 1.\n",
args_->stack.mac.sched.min_nof_ctrl_symbols);
args_->stack.mac.sched.min_nof_ctrl_symbols = 1;
}
if (cell_cfg_.nof_prb < 50 && args_->stack.mac.sched.max_nof_ctrl_symbols != 3) { if (cell_cfg_.nof_prb < 50 && args_->stack.mac.sched.max_nof_ctrl_symbols != 3) {
args_->stack.mac.sched.max_nof_ctrl_symbols = 3; args_->stack.mac.sched.max_nof_ctrl_symbols = 3;
INFO("Setting number of control symbols to %d for %d PRB cell.\n", INFO("Setting maximum number of control symbols to %d for %d PRB cell.\n",
args_->stack.mac.sched.max_nof_ctrl_symbols, args_->stack.mac.sched.max_nof_ctrl_symbols,
cell_cfg_.nof_prb); cell_cfg_.nof_prb);
} }

@ -129,7 +129,8 @@ void parse_args(all_args_t* args, int argc, char* argv[])
("scheduler.pusch_mcs", bpo::value<int>(&args->stack.mac.sched.pusch_mcs)->default_value(-1), "Optional fixed PUSCH MCS (ignores reported CQIs if specified)") ("scheduler.pusch_mcs", bpo::value<int>(&args->stack.mac.sched.pusch_mcs)->default_value(-1), "Optional fixed PUSCH MCS (ignores reported CQIs if specified)")
("scheduler.pusch_max_mcs", bpo::value<int>(&args->stack.mac.sched.pusch_max_mcs)->default_value(-1), "Optional PUSCH MCS limit") ("scheduler.pusch_max_mcs", bpo::value<int>(&args->stack.mac.sched.pusch_max_mcs)->default_value(-1), "Optional PUSCH MCS limit")
("scheduler.max_aggr_level", bpo::value<int>(&args->stack.mac.sched.max_aggr_level)->default_value(-1), "Optional maximum aggregation level index (l=log2(L)) ") ("scheduler.max_aggr_level", bpo::value<int>(&args->stack.mac.sched.max_aggr_level)->default_value(-1), "Optional maximum aggregation level index (l=log2(L)) ")
("scheduler.nof_ctrl_symbols", bpo::value<uint32_t>(&args->stack.mac.sched.max_nof_ctrl_symbols)->default_value(3), "Number of control symbols") ("scheduler.max_nof_ctrl_symbols", bpo::value<uint32_t>(&args->stack.mac.sched.max_nof_ctrl_symbols)->default_value(3), "Number of control symbols")
("scheduler.min_nof_ctrl_symbols", bpo::value<uint32_t>(&args->stack.mac.sched.min_nof_ctrl_symbols)->default_value(1), "Minimum number of control symbols")
/* Downlink Channel emulator section */ /* Downlink Channel emulator section */
("channel.dl.enable", bpo::value<bool>(&args->phy.dl_channel_args.enable)->default_value(false), "Enable/Disable internal Downlink channel emulator") ("channel.dl.enable", bpo::value<bool>(&args->phy.dl_channel_args.enable)->default_value(false), "Enable/Disable internal Downlink channel emulator")

Loading…
Cancel
Save