Merge remote-tracking branch...

Merge remote-tracking branch 'origin/NR_DLSCH_retransmission_fix_pucch_allocation' into integration_2021_wk42_b

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -565,12 +565,12 @@ bool allocate_dl_retransmission(module_id_t module_id,
     return false;
   }
 
-  sched_ctrl->sched_pdsch.pucch_allocation = alloc;
-
   /* just reuse from previous scheduling opportunity, set new start RB */
   sched_ctrl->sched_pdsch = *retInfo;
   sched_ctrl->sched_pdsch.rbStart = rbStart;
 
+  sched_ctrl->sched_pdsch.pucch_allocation = alloc;
+
   /* retransmissions: directly allocate */
   *n_rb_sched -= sched_ctrl->sched_pdsch.rbSize;
   for (int rb = 0; rb < sched_ctrl->sched_pdsch.rbSize; rb++)
@@ -890,7 +890,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
     UE_info->mac_stats[UE_id].dlsch_rounds[harq->round]++;
 
     LOG_D(NR_MAC,
-          "%4d.%2d [DLSCH/PDSCH/PUCCH] UE %d RNTI %04x DCI L %d start %3d RBs %3d startSymbol %2d nb_symbol %2d dmrspos %x MCS %2d TBS %4d HARQ PID %2d round %d RV %d NDI %d dl_data_to_ULACK %d (%d.%d) TPC %d\n",
+          "%4d.%2d [DLSCH/PDSCH/PUCCH] UE %d RNTI %04x DCI L %d start %3d RBs %3d startSymbol %2d nb_symbol %2d dmrspos %x MCS %2d TBS %4d HARQ PID %2d round %d RV %d NDI %d dl_data_to_ULACK %d (%d.%d) PUCCH allocation %d TPC %d\n",
           frame,
           slot,
           UE_id,
@@ -910,6 +910,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
           pucch->timing_indicator,
           pucch->frame,
           pucch->ul_slot,
+          sched_pdsch->pucch_allocation,
           sched_ctrl->tpc1);
 
     NR_BWP_Downlink_t *bwp = sched_ctrl->active_bwp;