Skip to content

Commit 1c032a3

Browse files
herlesupreethcodebot
authored andcommitted
sched: use minimum k1 from the list of k1 candidates in cell configuration to compute PUSCH Time Domain resource index
1 parent 990e5e3 commit 1c032a3

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

lib/scheduler/support/pusch/pusch_td_resource_indices.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ compute_pusch_td_resource_indices(span<const pusch_time_domain_resource_allocati
2222
{
2323
// Compute list of PUSCH time domain resource index list relevant for the PUSCH slot.
2424
static_vector<unsigned, pusch_constants::MAX_NOF_PUSCH_TD_RES_ALLOCS> pusch_td_res_index_list;
25-
if (pusch_time_domain_list.empty()) {
26-
return pusch_td_res_index_list;
27-
}
28-
// [Implementation-defined] Default PUSCH time domain resource index to use if no valid PUSCH time domain resource is
29-
// found.
30-
const unsigned default_pusch_td_res_index = 0;
3125

3226
std::optional<unsigned> nof_full_ul_slots = std::nullopt;
3327
std::optional<unsigned> nof_full_dl_slots = std::nullopt;
@@ -59,10 +53,6 @@ compute_pusch_td_resource_indices(span<const pusch_time_domain_resource_allocati
5953
}
6054
}
6155

62-
if (pusch_td_res_index_list.empty()) {
63-
pusch_td_res_index_list.push_back(default_pusch_td_res_index);
64-
}
65-
6656
return pusch_td_res_index_list;
6757
}
6858

@@ -71,7 +61,7 @@ srsran::get_pusch_td_resource_indices(const cell_configuration& cell_cfg,
7161
slot_point pdcch_slot,
7262
const search_space_info* ss_info)
7363
{
74-
unsigned min_k1 = cell_cfg.expert_cfg.ue.min_k1;
64+
unsigned min_k1 = *std::min(cell_cfg.dl_data_to_ul_ack.begin(), cell_cfg.dl_data_to_ul_ack.end());
7565
span<const pusch_time_domain_resource_allocation> pusch_time_domain_list =
7666
cell_cfg.ul_cfg_common.init_ul_bwp.pusch_cfg_common.value().pusch_td_alloc_list;
7767
if (ss_info != nullptr) {

0 commit comments

Comments
 (0)