Create function for find CCE and retransmission

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -405,31 +405,11 @@ void nr_store_dlsch_buffer(module_id_t module_id,
   }
 }
 
-void pf_dl(module_id_t module_id,
-           frame_t frame,
+bool find_free_CCE(module_id_t module_id,
                    sub_frame_t slot,
-           int num_slots_per_tdd,
                    NR_UE_info_t *UE_info,
-           int n_rb_sched,
-           uint8_t *rballoc_mask,
-           int max_num_ue) {
-
-  const int UE_id = 0;
-
-  /* Loop UE_info->list to check retransmission */
-  for (int UE_id = UE_info->list.head; UE_id >= 0; UE_id = UE_info->list.next[UE_id]) {
+                   int UE_id){
   NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
-    const int current_harq_pid = sched_ctrl->current_harq_pid;
-    NR_UE_harq_t *harq = &sched_ctrl->harq_processes[current_harq_pid];
-    const rnti_t rnti = UE_info->rnti[UE_id];
-
-    /* Calculate Throughput */
-
-
-    /* retransmission */
-    if (harq->round != 0) {
-
-      /* Find a free CCE */
   const int target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
   sched_ctrl->search_space = get_searchspace(sched_ctrl->active_bwp, target_ss);
   uint8_t nr_of_candidates;
@@ -449,29 +429,28 @@ void pf_dl(module_id_t module_id,
                                            nr_of_candidates);
   if (sched_ctrl->cce_index < 0) {
     LOG_E(MAC, "%s(): could not find CCE for UE %d\n", __func__, UE_id);
-          return;
+    return false;
   }
   UE_info->num_pdcch_cand[UE_id][cid]++;
+  return true;
+}
 
-      /* Find PUCCH occasion */
-      nr_acknack_scheduling(module_id,
-                            UE_id,
-                            frame,
-                            slot,
-                            num_slots_per_tdd,
-                            &sched_ctrl->pucch_sched_idx,
-                            &sched_ctrl->pucch_occ_idx);
-
-      AssertFatal(sched_ctrl->pucch_sched_idx >= 0, "no uplink slot for PUCCH found!\n");
-
-      /* Allocate retransmission */
+bool allocate_retransmission(module_id_t module_id,
+                             uint8_t *rballoc_mask,
+                             int *n_rb_sched,
+                             NR_UE_info_t *UE_info,
+                             int UE_id){
+  NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+  const uint16_t rnti = UE_info->rnti[UE_id];
+  const int current_harq_pid = sched_ctrl->current_harq_pid;
   NR_UE_ret_info_t *retInfo = &sched_ctrl->retInfo[current_harq_pid];
+  const uint16_t bwpSize = NRRIV2BW(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
+  int rbStart = NRRIV2PRBOFFSET(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
+
   sched_ctrl->time_domain_allocation = retInfo->time_domain_allocation;
 
   /* ensure that there is a free place for RB allocation */
   int rbSize = 0;
-      const uint16_t bwpSize = NRRIV2BW(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
-      int rbStart = NRRIV2PRBOFFSET(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
   while (rbSize < retInfo->rbSize) {
     rbStart += rbSize; /* last iteration rbSize was not enough, skip it */
     rbSize = 0;
@@ -481,7 +460,7 @@ void pf_dl(module_id_t module_id,
             "cannot allocate retransmission for UE %d/RNTI %04x: no resources\n",
             UE_id,
             rnti);
-              return;
+      return false;
     }
     while (rbStart + rbSize < bwpSize
            && rballoc_mask[rbStart + rbSize]
@@ -495,6 +474,53 @@ void pf_dl(module_id_t module_id,
   sched_ctrl->mcsTableIdx = retInfo->mcsTableIdx;
   sched_ctrl->mcs = retInfo->mcs;
   sched_ctrl->numDmrsCdmGrpsNoData = retInfo->numDmrsCdmGrpsNoData;
+
+  /* retransmissions: directly allocate */
+  *n_rb_sched -= sched_ctrl->rbSize;
+  for (int rb = 0; rb < sched_ctrl->rbSize; rb++)
+    rballoc_mask[rb+sched_ctrl->rbStart] = 0;
+  return true;
+}
+
+void pf_dl(module_id_t module_id,
+           frame_t frame,
+           sub_frame_t slot,
+           int num_slots_per_tdd,
+           NR_UE_info_t *UE_info,
+           int n_rb_sched,
+           uint8_t *rballoc_mask,
+           int max_num_ue) {
+
+  const int UE_id = 0;
+
+  /* Loop UE_info->list to check retransmission */
+  for (int UE_id = UE_info->list.head; UE_id >= 0; UE_id = UE_info->list.next[UE_id]) {
+    NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+    const int current_harq_pid = sched_ctrl->current_harq_pid;
+    NR_UE_harq_t *harq = &sched_ctrl->harq_processes[current_harq_pid];
+    const rnti_t rnti = UE_info->rnti[UE_id];
+
+    /* Calculate Throughput */
+
+
+    /* retransmission */
+    if (harq->round != 0) {
+      /* Find a free CCE */
+      bool freeCCEE = find_free_CCE(module_id, slot, UE_info, UE_id);
+      if (!freeCCEE)
+        continue;
+      /* Find PUCCH occasion */
+      nr_acknack_scheduling(module_id,
+                            UE_id,
+                            frame,
+                            slot,
+                            num_slots_per_tdd,
+                            &sched_ctrl->pucch_sched_idx,
+                            &sched_ctrl->pucch_occ_idx);
+
+      AssertFatal(sched_ctrl->pucch_sched_idx >= 0, "no uplink slot for PUCCH found!\n");
+      /* Allocate retransmission */
+      bool r = allocate_retransmission(module_id, rballoc_mask, &n_rb_sched, UE_info, UE_id);
     } else {
       /* Check DL buffer */
 
@@ -518,29 +544,9 @@ void pf_dl(module_id_t module_id,
     /* Find max coeff from UE_sched*/
 
     /* Find a free CCE */
-    const int target_ss = NR_SearchSpace__searchSpaceType_PR_ue_Specific;
-    sched_ctrl->search_space = get_searchspace(sched_ctrl->active_bwp, target_ss);
-    uint8_t nr_of_candidates;
-    find_aggregation_candidates(&sched_ctrl->aggregation_level,
-                                &nr_of_candidates,
-                                sched_ctrl->search_space);
-    sched_ctrl->coreset = get_coreset(sched_ctrl->active_bwp, sched_ctrl->search_space, 1 /* dedicated */);
-    int cid = sched_ctrl->coreset->controlResourceSetId;
-    const uint16_t Y = UE_info->Y[UE_id][cid][slot];
-    const int m = UE_info->num_pdcch_cand[UE_id][cid];
-    sched_ctrl->cce_index = allocate_nr_CCEs(RC.nrmac[module_id],
-                                             sched_ctrl->active_bwp,
-                                             sched_ctrl->coreset,
-                                             sched_ctrl->aggregation_level,
-                                             Y,
-                                             m,
-                                             nr_of_candidates);
-    if (sched_ctrl->cce_index < 0) {
-        LOG_E(MAC, "%s(): could not find CCE for UE %d\n", __func__, UE_id);
+    bool freeCCEE = find_free_CCE(module_id, slot, UE_info, UE_id);
+    if (!freeCCEE)
       return;
-    }
-    UE_info->num_pdcch_cand[UE_id][cid]++;
-
     /* Find PUCCH occasion */
     nr_acknack_scheduling(module_id,
                           UE_id,