Create find_CCE in primitive

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -365,31 +365,6 @@ void nr_store_dlsch_buffer(module_id_t module_id,
   }
 }
 
-bool find_free_CCE(module_id_t module_id,
-                   sub_frame_t slot,
-                   int UE_id){
-  NR_UE_sched_ctrl_t *sched_ctrl = &RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id];
-  uint8_t nr_of_candidates;
-  find_aggregation_candidates(&sched_ctrl->aggregation_level,
-                              &nr_of_candidates,
-                              sched_ctrl->search_space);
-  const int cid = sched_ctrl->coreset->controlResourceSetId;
-  const uint16_t Y = RC.nrmac[module_id]->UE_info.Y[UE_id][cid][slot];
-  const int m = RC.nrmac[module_id]->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)
-    return false;
-
-  RC.nrmac[module_id]->UE_info.num_pdcch_cand[UE_id][cid]++;
-  return true;
-}
-
 bool allocate_retransmission(module_id_t module_id,
                              uint8_t *rballoc_mask,
                              int *n_rb_sched,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -1808,6 +1808,31 @@ void find_aggregation_candidates(uint8_t *aggregation_level,
   }
 }
 
+bool find_free_CCE(module_id_t module_id,
+                   sub_frame_t slot,
+                   int UE_id){
+  NR_UE_sched_ctrl_t *sched_ctrl = &RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id];
+  uint8_t nr_of_candidates;
+  find_aggregation_candidates(&sched_ctrl->aggregation_level,
+                              &nr_of_candidates,
+                              sched_ctrl->search_space);
+  const int cid = sched_ctrl->coreset->controlResourceSetId;
+  const uint16_t Y = RC.nrmac[module_id]->UE_info.Y[UE_id][cid][slot];
+  const int m = RC.nrmac[module_id]->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)
+    return false;
+
+  RC.nrmac[module_id]->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

@@ -531,6 +531,11 @@ void pf_ul(module_id_t module_id,
     /* RETRANSMISSION: Check retransmission */
 
     /* RETRANSMISSION: Find free CCE */
+    bool freeCCE = find_free_CCE(module_id, slot, UE_id);
+    if (!freeCCE) {
+      LOG_E(MAC, "%4d.%2d could not find CCE for UE %d/RNTI %04x\n", frame, slot, UE_id, UE_info->rnti[UE_id]);
+      continue;
+    }
 
     /* RETRANSMISSION: Allocate retransmission*/
 
@@ -549,33 +554,12 @@ void pf_ul(module_id_t module_id,
   if (n_rb_sched > 0){ //temp
     /* 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]++;
+    max_num_ue--;
 
     /* Save PUSCH field */
     sched_ctrl->sched_pusch.time_domain_allocation = tda;
+    sched_ctrl->search_space = get_searchspace(sched_ctrl->active_bwp, NR_SearchSpace__searchSpaceType_PR_ue_Specific);
+    sched_ctrl->coreset = get_coreset(sched_ctrl->active_bwp, sched_ctrl->search_space, 1 /* dedicated */);
     const long f = sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats;
     const int dci_format = f ? NR_UL_DCI_FORMAT_0_1 : NR_UL_DCI_FORMAT_0_0;
     const uint8_t num_dmrs_cdm_grps_no_data = 1;

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -395,4 +395,5 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
 
 void find_SSB_and_RO_available(module_id_t module_idP);
 
+bool find_free_CCE(module_id_t module_id, sub_frame_t slot, int UE_id);
 #endif /*__LAYER2_NR_MAC_PROTO_H__*/