Commit e8faf0c6 authored by wujing's avatar wujing

fix dl scheduler in fairRR mode

parent fbbf80d8
...@@ -1173,6 +1173,6 @@ void update_ue_timers(module_id_t module_idP,frame_t frameP, sub_frame_t subfram ...@@ -1173,6 +1173,6 @@ void update_ue_timers(module_id_t module_idP,frame_t frameP, sub_frame_t subfram
} // end RB_FOREACH } // end RB_FOREACH
select_ul_ue_candidate( module_idP, frameP, subframeP); // select_ul_ue_candidate( module_idP, frameP, subframeP);
select_dl_ue_candidate( module_idP, frameP, subframeP); // select_dl_ue_candidate( module_idP, frameP, subframeP);
} }
...@@ -1439,7 +1439,7 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id, ...@@ -1439,7 +1439,7 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
} }
} }
} }
select_dl_ue_candidate( Mod_id, frameP, subframeP);
dlsch_scheduler_pre_ue_select_fairRR(Mod_id,frameP,subframeP, mbsfn_flag,nb_rbs_required,dlsch_ue_select); dlsch_scheduler_pre_ue_select_fairRR(Mod_id,frameP,subframeP, mbsfn_flag,nb_rbs_required,dlsch_ue_select);
for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) { for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
average_rbs_per_user[CC_id] = 0; average_rbs_per_user[CC_id] = 0;
...@@ -4238,6 +4238,7 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP, ...@@ -4238,6 +4238,7 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
COMMON_channels_t *cc; COMMON_channels_t *cc;
LOG_D(MAC,"In ulsch_preprocessor: ulsch ue select\n"); LOG_D(MAC,"In ulsch_preprocessor: ulsch ue select\n");
//ue select //ue select
select_ul_ue_candidate( module_idP, frameP, subframeP);
ulsch_scheduler_pre_ue_select_fairRR(module_idP,frameP,subframeP,sched_subframeP,ulsch_ue_select); ulsch_scheduler_pre_ue_select_fairRR(module_idP,frameP,subframeP,sched_subframeP,ulsch_ue_select);
// MCS and RB assgin // MCS and RB assgin
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment