UL Post-processor: enable multi-UE handling

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -544,17 +544,15 @@ void nr_schedule_ulsch(module_id_t module_id,
                        int num_slots_per_tdd,
                        int ul_slots,
                        uint64_t ulsch_in_slot_bitmap) {
-  const int UE_id = 0;
-  NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
-  AssertFatal(UE_info->active[UE_id],"Cannot find UE_id %d is not active\n",UE_id);
-
   nr_simple_ulsch_preprocessor(
       module_id, frame, slot, num_slots_per_tdd, ulsch_in_slot_bitmap);
 
-  NR_CellGroupConfig_t *secondaryCellGroup = UE_info->secondaryCellGroup[UE_id];
+  NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
+  const NR_UE_list_t *UE_list = &UE_info->list;
+  for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
     NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
     if (sched_ctrl->sched_pusch->rbSize <= 0)
-    return;
+      continue;
 
     uint16_t rnti = UE_info->rnti[UE_id];
 
@@ -789,10 +787,27 @@ void nr_schedule_ulsch(module_id_t module_id,
 
     dci_pdu_rel15_t dci_pdu_rel15[MAX_DCI_CORESET];
     memset(dci_pdu_rel15, 0, sizeof(dci_pdu_rel15));
+    NR_CellGroupConfig_t *secondaryCellGroup = UE_info->secondaryCellGroup[UE_id];
     const int n_ubwp = secondaryCellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList->list.count;
-  config_uldci(sched_ctrl->active_ubwp,pusch_pdu,pdcch_pdu_rel15,&dci_pdu_rel15[0],dci_formats,rnti_types,tda,UE_info->UE_sched_ctrl[UE_id].tpc0,n_ubwp,sched_ctrl->active_bwp->bwp_Id);
-  fill_dci_pdu_rel15(scc,secondaryCellGroup,pdcch_pdu_rel15,dci_pdu_rel15,dci_formats,rnti_types,pusch_pdu->bwp_size,sched_ctrl->active_bwp->bwp_Id);
-
+    config_uldci(sched_ctrl->active_ubwp,
+                 pusch_pdu,
+                 pdcch_pdu_rel15,
+                 &dci_pdu_rel15[0],
+                 dci_formats,
+                 rnti_types,
+                 tda,
+                 UE_info->UE_sched_ctrl[UE_id].tpc0,
+                 n_ubwp,
+                 sched_ctrl->active_bwp->bwp_Id);
+    fill_dci_pdu_rel15(scc,
+                       secondaryCellGroup,
+                       pdcch_pdu_rel15,
+                       dci_pdu_rel15,
+                       dci_formats,
+                       rnti_types,
+                       pusch_pdu->bwp_size,
+                       sched_ctrl->active_bwp->bwp_Id);
 
     sched_ctrl->sched_pusch->rbSize = 0;
+  }
 }