From 80e23a179e007a4369a06e3f74f47c25b3296c65 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 22 Dec 2020 15:09:42 +0100 Subject: [PATCH] Enable 12 slots This commit enables more slots so that the "real UE" preprocessor can schedule them. The DL phytest preprocessor continues to only schedule slots 1 & 3. This is because the OAI-UE needs to have PUCCH scheduled at least six slots in advance. Since we do not support this (yet), but assume that two slots are enough, we schedule the UE only in slot 1 & 3 so it has 6 slots until slot 7 to send PUCCH. --- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c | 3 ++- openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c index d81d79e5d5..1ed09491a3 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c @@ -362,7 +362,8 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, } #define BIT(x) (1 << (x)) - const uint64_t dlsch_in_slot_bitmap = BIT(1) | BIT(3); + const uint64_t dlsch_in_slot_bitmap = BIT( 1) | BIT( 2) | BIT( 3) | BIT( 4) | BIT( 5) | BIT( 6) + | BIT(11) | BIT(12) | BIT(13) | BIT(14) | BIT(15) | BIT(16); const uint64_t ulsch_in_slot_bitmap = BIT(8); memset(RC.nrmac[module_idP]->cce_list[bwp_id][0],0,MAX_NUM_CCE*sizeof(int)); // coreset0 diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c index e3532d9473..983db0af07 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c @@ -257,6 +257,8 @@ void nr_preprocessor_phytest(module_id_t module_id, frame_t frame, sub_frame_t slot) { + if (slot != 1 && slot != 3) + return; NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info; const int UE_id = 0; const int CC_id = 0;