mirror of https://github.com/PentHertz/srsLTE.git
added initial_dl_cqi to the enb rr.cfg parser
This commit is contained in:
parent
bcbb08ebae
commit
9ad80ee29f
|
@ -409,6 +409,7 @@ struct cell_cfg_t {
|
||||||
float dl_freq_hz;
|
float dl_freq_hz;
|
||||||
uint32_t ul_earfcn;
|
uint32_t ul_earfcn;
|
||||||
float ul_freq_hz;
|
float ul_freq_hz;
|
||||||
|
uint32_t initial_dl_cqi;
|
||||||
std::vector<scell_cfg_t> scell_list;
|
std::vector<scell_cfg_t> scell_list;
|
||||||
};
|
};
|
||||||
typedef std::vector<cell_cfg_t> cell_list_t;
|
typedef std::vector<cell_cfg_t> cell_list_t;
|
||||||
|
|
|
@ -88,6 +88,7 @@ public:
|
||||||
|
|
||||||
uint32_t nrb_cqi;
|
uint32_t nrb_cqi;
|
||||||
uint32_t ncs_an;
|
uint32_t ncs_an;
|
||||||
|
uint32_t initial_dl_cqi;
|
||||||
|
|
||||||
uint32_t srs_subframe_config;
|
uint32_t srs_subframe_config;
|
||||||
uint32_t srs_subframe_offset;
|
uint32_t srs_subframe_offset;
|
||||||
|
|
|
@ -717,6 +717,7 @@ static int parse_cell_list(all_args_t* args, rrc_cfg_t* rrc_cfg, Setting& root)
|
||||||
cell_cfg.ul_earfcn = cellroot["ul_earfcn"]; // will be derived from DL EARFCN If not set
|
cell_cfg.ul_earfcn = cellroot["ul_earfcn"]; // will be derived from DL EARFCN If not set
|
||||||
parse_default_field(
|
parse_default_field(
|
||||||
cell_cfg.root_seq_idx, cellroot, "root_seq_idx", rrc_cfg->sibs[1].sib2().rr_cfg_common.prach_cfg.root_seq_idx);
|
cell_cfg.root_seq_idx, cellroot, "root_seq_idx", rrc_cfg->sibs[1].sib2().rr_cfg_common.prach_cfg.root_seq_idx);
|
||||||
|
parse_default_field(cell_cfg.initial_dl_cqi, cellroot, "initial_dl_cqi", 5u);
|
||||||
|
|
||||||
if (cellroot["ho_active"]) {
|
if (cellroot["ho_active"]) {
|
||||||
HANDLEPARSERCODE(parse_meas_cell_list(&rrc_cfg->meas_cfg, cellroot["meas_cell_list"]));
|
HANDLEPARSERCODE(parse_meas_cell_list(&rrc_cfg->meas_cfg, cellroot["meas_cell_list"]));
|
||||||
|
|
|
@ -44,7 +44,6 @@ namespace srsenb {
|
||||||
|
|
||||||
namespace sched_utils {
|
namespace sched_utils {
|
||||||
|
|
||||||
const uint32_t initial_dl_cqi = 5;
|
|
||||||
const uint32_t conres_ce_size = 6;
|
const uint32_t conres_ce_size = 6;
|
||||||
|
|
||||||
//! Obtains TB size *in bytes* for a given MCS and N_{PRB}
|
//! Obtains TB size *in bytes* for a given MCS and N_{PRB}
|
||||||
|
@ -1193,7 +1192,7 @@ sched_ue_carrier::sched_ue_carrier(const sched_interface::ue_cfg_t& cfg_,
|
||||||
// only PCell starts active. Remaining ones wait for valid CQI
|
// only PCell starts active. Remaining ones wait for valid CQI
|
||||||
active = ue_cc_idx == 0;
|
active = ue_cc_idx == 0;
|
||||||
dl_cqi_rx = false;
|
dl_cqi_rx = false;
|
||||||
dl_cqi = (ue_cc_idx == 0) ? sched_utils::initial_dl_cqi : 0;
|
dl_cqi = (ue_cc_idx == 0) ? cell_params->cfg.initial_dl_cqi : 0;
|
||||||
|
|
||||||
// set max mcs
|
// set max mcs
|
||||||
max_mcs_ul = cell_params->sched_cfg->pusch_max_mcs >= 0 ? cell_params->sched_cfg->pusch_max_mcs : 28;
|
max_mcs_ul = cell_params->sched_cfg->pusch_max_mcs >= 0 ? cell_params->sched_cfg->pusch_max_mcs : 28;
|
||||||
|
|
|
@ -791,6 +791,7 @@ void rrc::config_mac()
|
||||||
cfg.sibs[1].sib2().rr_cfg_common.rach_cfg_common.ra_supervision_info.ra_resp_win_size.to_number();
|
cfg.sibs[1].sib2().rr_cfg_common.rach_cfg_common.ra_supervision_info.ra_resp_win_size.to_number();
|
||||||
item.prach_freq_offset = cfg.sibs[1].sib2().rr_cfg_common.prach_cfg.prach_cfg_info.prach_freq_offset;
|
item.prach_freq_offset = cfg.sibs[1].sib2().rr_cfg_common.prach_cfg.prach_cfg_info.prach_freq_offset;
|
||||||
item.maxharq_msg3tx = cfg.sibs[1].sib2().rr_cfg_common.rach_cfg_common.max_harq_msg3_tx;
|
item.maxharq_msg3tx = cfg.sibs[1].sib2().rr_cfg_common.rach_cfg_common.max_harq_msg3_tx;
|
||||||
|
item.initial_dl_cqi = cfg.cell_list[ccidx].initial_dl_cqi;
|
||||||
|
|
||||||
item.nrb_pucch = SRSLTE_MAX(cfg.sr_cfg.nof_prb, cfg.cqi_cfg.nof_prb);
|
item.nrb_pucch = SRSLTE_MAX(cfg.sr_cfg.nof_prb, cfg.cqi_cfg.nof_prb);
|
||||||
rrc_log->info("Allocating %d PRBs for PUCCH\n", item.nrb_pucch);
|
rrc_log->info("Allocating %d PRBs for PUCCH\n", item.nrb_pucch);
|
||||||
|
|
|
@ -110,6 +110,7 @@ inline srsenb::sched_interface::cell_cfg_t generate_default_cell_cfg(uint32_t no
|
||||||
cell_cfg.prach_freq_offset = (cell_cfg_phy.nof_prb == 6) ? 0 : 2;
|
cell_cfg.prach_freq_offset = (cell_cfg_phy.nof_prb == 6) ? 0 : 2;
|
||||||
cell_cfg.prach_rar_window = 3;
|
cell_cfg.prach_rar_window = 3;
|
||||||
cell_cfg.maxharq_msg3tx = 3;
|
cell_cfg.maxharq_msg3tx = 3;
|
||||||
|
cell_cfg.initial_dl_cqi = 5;
|
||||||
|
|
||||||
return cell_cfg;
|
return cell_cfg;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue