Commit d5484f23 authored by Laurent THOMAS's avatar Laurent THOMAS

fix-infinite-loop-in-multiplex_pucch_resource

parent 0accb601
...@@ -2149,10 +2149,9 @@ void multiplex_pucch_resource(NR_UE_MAC_INST_t *mac, PUCCH_sched_t *pucch, int n ...@@ -2149,10 +2149,9 @@ void multiplex_pucch_resource(NR_UE_MAC_INST_t *mac, PUCCH_sched_t *pucch, int n
int next_start, next_length; int next_start, next_length;
get_pucch_start_symbol_length(pucch_resource, &next_start, &next_length); get_pucch_start_symbol_length(pucch_resource, &next_start, &next_length);
bool overlap = check_overlapping_resources(curr_start, curr_length, next_start, next_length); bool overlap = check_overlapping_resources(curr_start, curr_length, next_start, next_length);
if (overlap) { if (overlap)
o++; o++;
j++; j++;
}
} else { } else {
if (o > 0) { if (o > 0) {
merge_resources(&pucch[j - o], o + 1, pucch_Config); merge_resources(&pucch[j - o], o + 1, pucch_Config);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment