Skip to content

Commit ac233da

Browse files
carlo-galcodebot
authored andcommitted
sched: fix other comments in pucch alloc/res mng
Signed-off-by: Carlo Galiotto <[email protected]>
1 parent fd5ebc7 commit ac233da

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

lib/scheduler/pucch_scheduling/pucch_allocator_impl.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,7 @@ pucch_harq_ack_grant pucch_allocator_impl::update_format2_grant(pucch_info&
11331133
}
11341134

11351135
logger.debug("ue={:#x}'s UCI mltplxd on existing PUCCH F2 for slot={}", existing_f2_grant.crnti, sl_tx);
1136+
// When the chosen resource is for CSI only, the resource indicator won't be used and can be set to any value.
11361137
const unsigned res_indicator = use_pucch_f2_csi_res ? 0U : pucch_f2_harq_info.pucch_res_indicator;
11371138
return pucch_harq_ack_grant{.pucch_res_indicator = static_cast<unsigned>(res_indicator),
11381139
.pucch_pdu = &existing_f2_grant};

lib/scheduler/pucch_scheduling/pucch_resource_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ pucch_resource_manager::fetch_allocated_f2_harq_resource(slot_point slo
286286
const pucch_config& pucch_cfg)
287287
{
288288
srsran_sanity_check(slot_harq < last_sl_ind + RES_MANAGER_RING_BUFFER_SIZE,
289-
"PUCCH being allocated to far into the future");
289+
"PUCCH being allocated too far into the future");
290290

291291
// Get resource list of wanted slot.
292292
rnti_pucch_res_id_slot_record& res_counter = get_slot_resource_counter(slot_harq);

lib/scheduler/uci_scheduling/uci_allocator_impl.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,15 @@ void uci_allocator_impl::multiplex_uci_on_pusch(ul_sched_info& pu
208208
const ue_cell_configuration& ue_cell_cfg,
209209
rnti_t crnti)
210210
{
211-
// Note: the UCI bits is capped to the PUCCH Format 2 capacity. When multiplexing UCI to PUSCH, we only "tranfer"
212-
// the bits that would have been fit within the PUCCH, not the all the bits that should have been reported.
213-
// TODO: Check if this approach is correct.
211+
// Move the bits that are carried by the PUCCH into the PUSCH.
214212
const pucch_uci_bits pucch_uci = pucch_alloc.remove_ue_uci_from_pucch(slot_alloc, crnti, ue_cell_cfg);
215213

216214
// In case there are no UCI bits from PUCCH, then there is no UCI to be multiplexed on the PUSCH.
217215
if (pucch_uci.harq_ack_nof_bits == 0 and pucch_uci.csi_part1_bits == 0) {
218216
return;
219217
}
220218

221-
// We assume that at this point, there are no existing UCI grants in the PUSCH; allocate one.
219+
// We assume that at this point, there are no existing UCI grants in the PUSCH; allocate a new one.
222220
uci_info& uci = pusch_grant.uci.emplace();
223221
fill_uci_on_pusch(uci,
224222
ue_cell_cfg.cfg_dedicated().ul_config.value().init_ul_bwp.pusch_cfg.value().uci_cfg.value(),

0 commit comments

Comments
 (0)