From 21983a202857f9a8b93d616cfa84d5f4c3a4be56 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Sat, 23 Jun 2018 12:23:57 +0200
Subject: [PATCH] Patch fairRR scheduler to use slice iface of pre-processor
---
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
index 76589eebdb..8a9b4ce4df 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
@@ -542,6 +542,7 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
uint16_t temp_total_rbs_count;
unsigned char temp_total_ue_count;
unsigned char MIMO_mode_indicator[MAX_NUM_CCs][N_RBG_MAX];
+ uint8_t slice_allocation[MAX_NUM_CCs][N_RBG_MAX];
int UE_id, i;
uint16_t j;
uint16_t nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
@@ -660,17 +661,22 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
transmission_mode = get_tmode(Mod_id,CC_id,UE_id);
+ /* slicing support has been introduced into the scheduler. Provide dummy
+ * data so that the preprocessor "simply works" */
+ for (int i = 0; i < MAX_NUM_CCs; ++i)
+ for (int j = 0; i < N_RBG_MAX; ++j)
+ slice_allocation[i][j] = 1;
+
LOG_T(MAC,"calling dlsch_scheduler_pre_processor_allocate .. \n ");
dlsch_scheduler_pre_processor_allocate (Mod_id,
UE_id,
CC_id,
N_RBG[CC_id],
- transmission_mode,
min_rb_unit[CC_id],
- N_RB_DL,
(uint16_t (*)[NUMBER_OF_UE_MAX])nb_rbs_required,
(uint16_t (*)[NUMBER_OF_UE_MAX])nb_rbs_required_remaining,
rballoc_sub,
+ slice_allocation,
MIMO_mode_indicator);
temp_total_rbs_count -= ue_sched_ctl->pre_nb_available_rbs[CC_id];
temp_total_ue_count--;
--
GitLab