Create find_CCE (same as dl_pf)

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2405,6 +2405,36 @@ void find_aggregation_candidates(uint8_t *aggregation_level,
   }
 }
 
+bool find_free_CCE(module_id_t module_id,
+                   sub_frame_t slot,
+                   NR_UE_info_t *UE_info,
+                   int UE_id){
+  NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+  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);
+    return false;
+  }
+  UE_info->num_pdcch_cand[UE_id][cid]++;
+  return true;
+}
+
 
 /*void fill_nfapi_coresets_and_searchspaces(NR_CellGroupConfig_t *cg,
 					  nfapi_nr_coreset_t *coreset,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -555,6 +555,8 @@ void pf_ul(module_id_t module_id,
     /* RETRANSMISSION: Check retransmission */
 
     /* RETRANSMISSION: Find free CCE */
+    bool freeCCE = find_free_CCE(module_id, slot, UE_info, UE_id);
+    if (!freeCCE) continue;
 
     /* RETRANSMISSION: Allocate retransmission*/
 
@@ -574,29 +576,10 @@ void pf_ul(module_id_t module_id,
     /* Find max coeff */
 
     /* Find 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 */);
-    const 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(): CCE list not empty, couldn't schedule PUSCH\n", __func__);
-      return;
-    }
-    UE_info->num_pdcch_cand[UE_id][cid]++;
+    bool freeCCE = find_free_CCE(module_id, slot, UE_info, UE_id);
+    if (!freeCCE) return;
+
+    max_num_ue--;
 
     /* Save PUSCH filed */
     sched_ctrl->sched_pusch.time_domain_allocation = tda;

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -422,4 +422,6 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
 void find_SSB_and_RO_available(module_id_t module_idP);
 
 void handle_nr_uci(NR_UL_IND_t *UL_info, NR_UE_sched_ctrl_t *sched_ctrl, NR_mac_stats_t *stats, int target_snrx10);
+
+bool find_free_CCE(module_id_t module_id, sub_frame_t slot, NR_UE_info_t *UE_info, int UE_id);
 #endif /*__LAYER2_NR_MAC_PROTO_H__*/