Remove assert of single UE & Initail UE_id from the first UE

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -599,19 +599,15 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
                                   sub_frame_t slot) {
   NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
 
-  AssertFatal(UE_info->num_UEs <= 1,
-              "%s() cannot handle more than one UE, but found %d\n",
-              __func__,
-              UE_info->num_UEs);
   if (UE_info->num_UEs == 0)
     return;
 
-  const int UE_id = 0;
   const int CC_id = 0;
 
-  NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
 
-  /* Calculate num of RBG and RBG size from UE_id=0 */
+  /* Get bwpSize from the first UE */
+  int UE_id = UE_info->list.head;
+  NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
   const uint16_t bwpSize = NRRIV2BW(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
 
   uint16_t *vrb_map = RC.nrmac[module_id]->common_channels[CC_id].vrb_map;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -728,17 +728,14 @@ bool nr_simple_ulsch_preprocessor(module_id_t module_id,
   const int mu = scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.subcarrierSpacing;
   NR_UE_info_t *UE_info = &nr_mac->UE_info;
 
-  AssertFatal(UE_info->num_UEs <= 1,
-              "%s() cannot handle more than one UE, but found %d\n",
-              __func__,
-              UE_info->num_UEs);
   if (UE_info->num_UEs == 0)
     return false;
 
   const int CC_id = 0;
 
   /* NOT support different K2 in here, Get the K2 for first UE */
-  NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[0];
+  int UE_id = UE_info->list.head;
+  NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
   const int tda = 1;
   const struct NR_PUSCH_TimeDomainResourceAllocationList *tdaList =
     sched_ctrl->active_ubwp->bwp_Common->pusch_ConfigCommon->choice.setup->pusch_TimeDomainAllocationList;
@@ -757,7 +754,7 @@ bool nr_simple_ulsch_preprocessor(module_id_t module_id,
   sched_ctrl->sched_pusch.frame = sched_frame;
 
   /* Confirm all the UE have same K2 as the first UE */
-  for (int UE_id = UE_info->list.next[UE_id]; UE_id > 0; UE_id = UE_info->list.next[UE_id]){
+  for (UE_id = UE_info->list.next[UE_id]; 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];
     AssertFatal(K2 == get_K2(sched_ctrl->active_ubwp, tda, mu),
                 "Different K2, %d(UE%d) != %ld(UE%d)\n", K2, 0, get_K2(sched_ctrl->active_ubwp, tda, mu), UE_id);