From fde6c46ef1b2bcc378e73a5ad41019603bc3b683 Mon Sep 17 00:00:00 2001
From: ChiehChun <chiehchun80348@gmail.com>
Date: Fri, 8 Jan 2021 15:11:38 +0100
Subject: [PATCH] Remove assertion for single UE
---
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index a2a2a2e201d..a81fedd726d 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -725,17 +725,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;
@@ -754,7 +751,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);
--
GitLab