Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS

# Conflicts: # openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
2021-04-20 11:37:33 +01:00
parent d4a6fffc95 03f00ee7ba
commit ef8aaa8c9b
5 changed files with 25 additions and 21 deletions
@@ -107,7 +107,8 @@ void handle_nr_uci(NR_UL_IND_t *UL_info)
  UL_info->uci_ind.num_ucis = 0;

  // mark corresponding PUCCH resources as free
-  // NOTE: we just assume it is BWP ID 1, to be revised for multiple BWPs
+  // NOTE: we just assume it is BWP ID 0 and 1, to be revised for multiple BWPs
+  RC.nrmac[mod_id]->pucch_index_used[0][slot] = 0;
  RC.nrmac[mod_id]->pucch_index_used[1][slot] = 0;
 }