adapting scheduling csirs for multi UE (to be verified)

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -422,7 +422,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   // TODO
 
   // Schedule CSI-RS transmission
-  //nr_csirs_scheduling(module_idP, UE_id, frame, slot, slots_per_frame[*scc->ssbSubcarrierSpacing]);
+  nr_csirs_scheduling(module_idP, frame, slot, nr_slots_per_frame[*scc->ssbSubcarrierSpacing]);
 
   // Schedule CSI measurement reporting: check in slot 0 for the whole frame
   if (slot == 0)

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -1803,20 +1803,24 @@ void get_pdsch_to_harq_feedback(int Mod_idP,
 
 
 void nr_csirs_scheduling(int Mod_idP,
-                         int UE_id,
                          frame_t frame,
                          sub_frame_t slot,
                          int n_slots_frame){
 
   int CC_id = 0;
   NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
+  NR_list_t *UE_list = &UE_info->list;
+  gNB_MAC_INST *gNB_mac = RC.nrmac[Mod_idP];
+  uint16_t *vrb_map = gNB_mac->common_channels[CC_id].vrb_map;
+
+  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];
     NR_CellGroupConfig_t *secondaryCellGroup = UE_info->secondaryCellGroup[UE_id];
     NR_CSI_MeasConfig_t *csi_measconfig = secondaryCellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup;
     NR_NZP_CSI_RS_Resource_t *nzpcsi;
     int period, offset;
-  gNB_MAC_INST *gNB_mac = RC.nrmac[Mod_idP];
-  uint8_t *vrb_map = RC.nrmac[Mod_idP]->common_channels[CC_id].vrb_map;
+
     nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
     NR_BWP_Downlink_t *bwp=secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[sched_ctrl->active_bwp->bwp_Id-1];
 
@@ -1946,6 +1950,7 @@ void nr_csirs_scheduling(int Mod_idP,
           vrb_map[rb] = 1;
       }
     }
+  }
 }
 
 

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -183,7 +183,6 @@ void nr_schedule_pucch(int Mod_idP,
                        sub_frame_t slotP);
 
 void nr_csirs_scheduling(int Mod_idP,
-                         int UE_id,
                          frame_t frame,
                          sub_frame_t slot,
                          int n_slots_frame);