From 28b956d1286b1fddb2fad8707c7560bcd79681d7 Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Mon, 20 Sep 2021 10:34:42 +0200 Subject: [PATCH] Limit PUCCH ACK resources to the max CCE from the configured max_ctrl_symbols instead of from MAX_CFI --- srsenb/src/stack/mac/sched_grid.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srsenb/src/stack/mac/sched_grid.cc b/srsenb/src/stack/mac/sched_grid.cc index 1e5653846..9d4b07a4c 100644 --- a/srsenb/src/stack/mac/sched_grid.cc +++ b/srsenb/src/stack/mac/sched_grid.cc @@ -80,7 +80,8 @@ void sf_grid_t::init(const sched_cell_params_t& cell_params_) pucch_mask.resize(cc_cfg->nof_prb()); pucch_nrb = (cc_cfg->cfg.nrb_pucch > 0) ? (uint32_t)cc_cfg->cfg.nrb_pucch : 0; srsran_pucch_cfg_t pucch_cfg = cell_params_.pucch_cfg_common; - pucch_cfg.n_pucch = cc_cfg->nof_cce_table[SRSRAN_NOF_CFI - 1] - 1 + cc_cfg->cfg.n1pucch_an; + pucch_cfg.n_pucch = + cc_cfg->nof_cce_table[cell_params_.sched_cfg->max_nof_ctrl_symbols - 1] - 1 + cc_cfg->cfg.n1pucch_an; pucch_nrb = std::max(pucch_nrb, srsran_pucch_m(&pucch_cfg, cc_cfg->cfg.cell.cp) / 2 + 1); if (pucch_nrb > 0) { pucch_mask.fill(0, pucch_nrb);