From 37bdf53f42dd2010aea0f34736c444c4a37249b0 Mon Sep 17 00:00:00 2001 From: Francisco Paisana Date: Wed, 22 Sep 2021 16:45:23 +0200 Subject: [PATCH] sched,nr: fix SR slot derivation in scheduler --- srsenb/src/stack/mac/nr/sched_nr_worker.cc | 2 +- srsenb/src/stack/rrc/rrc_nr.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srsenb/src/stack/mac/nr/sched_nr_worker.cc b/srsenb/src/stack/mac/nr/sched_nr_worker.cc index ca04ef264..74e593c50 100644 --- a/srsenb/src/stack/mac/nr/sched_nr_worker.cc +++ b/srsenb/src/stack/mac/nr/sched_nr_worker.cc @@ -125,7 +125,7 @@ void slot_cc_worker::postprocess_decisions() { auto& bwp_slot = cell.bwps[0].grid[bwp_alloc.get_pdcch_tti()]; srsran_slot_cfg_t slot_cfg{}; - slot_cfg.idx = bwp_alloc.get_pdcch_tti().slot_idx(); + slot_cfg.idx = bwp_alloc.get_pdcch_tti().to_uint(); for (auto& ue_pair : slot_ues) { auto& ue = ue_pair.second; diff --git a/srsenb/src/stack/rrc/rrc_nr.cc b/srsenb/src/stack/rrc/rrc_nr.cc index d424e5a3e..d62b6e7e4 100644 --- a/srsenb/src/stack/rrc/rrc_nr.cc +++ b/srsenb/src/stack/rrc/rrc_nr.cc @@ -500,7 +500,7 @@ void rrc_nr::ue::send_dl_ccch(dl_ccch_msg_s* dl_ccch_msg) // Helper for the RRC Reconfiguration sender to pack hard-coded config int rrc_nr::ue::pack_secondary_cell_group_config_common(asn1::rrc_nr::cell_group_cfg_s& cell_group_cfg_pack) { - auto& pscell_cfg = parent->cfg.cell_list.at(UE_PSCELL_CC_IDX); + auto& pscell_cfg = parent->cfg.cell_list.at(UE_PSCELL_CC_IDX); // RLC for DRB1 (with fixed LCID) cell_group_cfg_pack.rlc_bearer_to_add_mod_list_present = true;