srsgnb: use lcg=3 for as a default for drb. Pass lcg to MAC config

master
Ismael Gomez 3 years ago committed by Andre Puschmann
parent 78dad52cc8
commit a1294ed06a

@ -45,10 +45,11 @@ void ue_buffer_manager<isNR>::config_lcid(uint32_t lcid, const mac_lc_ch_cfg_t&
channels[lcid].bucket_size = channels[lcid].cfg.bsd * channels[lcid].cfg.pbr; channels[lcid].bucket_size = channels[lcid].cfg.bsd * channels[lcid].cfg.pbr;
channels[lcid].Bj = 0; channels[lcid].Bj = 0;
} }
logger.info("SCHED: bearer configured: lcid=%d, mode=%s, prio=%d", logger.info("SCHED: bearer configured: lcid=%d, mode=%s, prio=%d, lcg=%d",
lcid, lcid,
to_string(channels[lcid].cfg.direction), to_string(channels[lcid].cfg.direction),
channels[lcid].cfg.priority); channels[lcid].cfg.priority,
channels[lcid].cfg.group);
} }
} }

@ -1466,6 +1466,7 @@ void rrc_nr::ue::crnti_ce_received()
// Add DRB1 to MAC // Add DRB1 to MAC
for (auto& drb : cell_group_cfg.rlc_bearer_to_add_mod_list) { for (auto& drb : cell_group_cfg.rlc_bearer_to_add_mod_list) {
uecfg.ue_bearers[drb.lc_ch_id].direction = mac_lc_ch_cfg_t::BOTH; uecfg.ue_bearers[drb.lc_ch_id].direction = mac_lc_ch_cfg_t::BOTH;
uecfg.ue_bearers[drb.lc_ch_id].group = drb.mac_lc_ch_cfg.ul_specific_params.lc_ch_group;
} }
parent->mac->ue_cfg(rnti, uecfg); parent->mac->ue_cfg(rnti, uecfg);
} }
@ -1516,7 +1517,7 @@ int rrc_nr::ue::add_drb()
rlc.mac_lc_ch_cfg.ul_specific_params.bucket_size_dur = rlc.mac_lc_ch_cfg.ul_specific_params.bucket_size_dur =
asn1::rrc_nr::lc_ch_cfg_s::ul_specific_params_s_::bucket_size_dur_opts::ms100; asn1::rrc_nr::lc_ch_cfg_s::ul_specific_params_s_::bucket_size_dur_opts::ms100;
rlc.mac_lc_ch_cfg.ul_specific_params.lc_ch_group_present = true; rlc.mac_lc_ch_cfg.ul_specific_params.lc_ch_group_present = true;
rlc.mac_lc_ch_cfg.ul_specific_params.lc_ch_group = 6; rlc.mac_lc_ch_cfg.ul_specific_params.lc_ch_group = 3;
rlc.mac_lc_ch_cfg.ul_specific_params.sched_request_id_present = true; rlc.mac_lc_ch_cfg.ul_specific_params.sched_request_id_present = true;
rlc.mac_lc_ch_cfg.ul_specific_params.sched_request_id = 0; rlc.mac_lc_ch_cfg.ul_specific_params.sched_request_id = 0;
// TODO: add LC config to MAC // TODO: add LC config to MAC

Loading…
Cancel
Save