Skip to content

O
OpenXG-RAN
Commit 496f9eee authored by masayuki.harada's avatar masayuki.harada Committed by Haruki NAOI
Browse files
Options

Change UL DCI aggregation level by DL cqi. 

(cherry picked from commit 175c59ae3aedf612777cd1c8c88b6d6f254b9334)
parent c17f1ff3
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 2 deletions
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @ 496f9eee
...@@ -3681,8 +3681,14 @@ void ulsch_scheduler_pre_ue_select_fairRR( ...@@ -3681,8 +3681,14 @@ void ulsch_scheduler_pre_ue_select_fairRR(
if (mac_eNB_get_rrc_status(module_idP, rnti) == RRC_HO_EXECUTION) { if (mac_eNB_get_rrc_status(module_idP, rnti) == RRC_HO_EXECUTION) {
aggregation = 4; aggregation = 4;
if(get_aggregation(get_bw_index(module_idP, CC_id),UE_list->UE_sched_ctrl[UE_id].dl_cqi[CC_id],format0)>4)
aggregation = get_aggregation(get_bw_index(module_idP, CC_id),UE_list->UE_sched_ctrl[UE_id].dl_cqi[CC_id],format0);
}else{ }else{
aggregation = 2; //aggregation = 2;
aggregation = get_aggregation(get_bw_index(module_idP, CC_id),
UE_list->UE_sched_ctrl[UE_id].dl_cqi[CC_id],
format0);
} }
// Selection of Retx UEs // Selection of Retx UEs
...@@ -3790,6 +3796,9 @@ void ulsch_scheduler_pre_ue_select_fairRR( ...@@ -3790,6 +3796,9 @@ void ulsch_scheduler_pre_ue_select_fairRR(
hi_dci0_pdu = &HI_DCI0_req->hi_dci0_pdu_list[HI_DCI0_req->number_of_dci+HI_DCI0_req->number_of_hi]; hi_dci0_pdu = &HI_DCI0_req->hi_dci0_pdu_list[HI_DCI0_req->number_of_dci+HI_DCI0_req->number_of_hi];
format_flag = 2; format_flag = 2;
aggregation = get_aggregation(get_bw_index(module_idP, CC_id),
UE_list->UE_sched_ctrl[UE_id].dl_cqi[CC_id],
format0);
if (CCE_allocation_infeasible(module_idP,CC_id,format_flag,subframeP,aggregation,rnti) == 1) { if (CCE_allocation_infeasible(module_idP,CC_id,format_flag,subframeP,aggregation,rnti) == 1) {
cc_id_flag[CC_id] = 1; cc_id_flag[CC_id] = 1;
continue; continue;
...@@ -3884,6 +3893,9 @@ void ulsch_scheduler_pre_ue_select_fairRR( ...@@ -3884,6 +3893,9 @@ void ulsch_scheduler_pre_ue_select_fairRR(
hi_dci0_pdu = &HI_DCI0_req->hi_dci0_pdu_list[HI_DCI0_req->number_of_dci+HI_DCI0_req->number_of_hi]; hi_dci0_pdu = &HI_DCI0_req->hi_dci0_pdu_list[HI_DCI0_req->number_of_dci+HI_DCI0_req->number_of_hi];
format_flag = 2; format_flag = 2;
aggregation = get_aggregation(get_bw_index(module_idP, CC_id),
UE_list->UE_sched_ctrl[UE_id].dl_cqi[CC_id],
format0);
if (CCE_allocation_infeasible(module_idP,CC_id,format_flag,subframeP,aggregation,rnti) == 1) { if (CCE_allocation_infeasible(module_idP,CC_id,format_flag,subframeP,aggregation,rnti) == 1) {
cc_id_flag[CC_id] = 1; cc_id_flag[CC_id] = 1;
continue; continue;
...@@ -4479,8 +4491,13 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP, ...@@ -4479,8 +4491,13 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP,
rnti = UE_RNTI(CC_id,UE_id); rnti = UE_RNTI(CC_id,UE_id);
if (mac_eNB_get_rrc_status(module_idP, rnti) == RRC_HO_EXECUTION) { if (mac_eNB_get_rrc_status(module_idP, rnti) == RRC_HO_EXECUTION) {
aggregation = 4; aggregation = 4;
if(get_aggregation(get_bw_index(module_idP, CC_id),UE_list->UE_sched_ctrl[UE_id].dl_cqi[CC_id],format0)>4)
aggregation = get_aggregation(get_bw_index(module_idP, CC_id),UE_list->UE_sched_ctrl[UE_id].dl_cqi[CC_id],format0);
}else{ }else{
aggregation = 2; //aggregation = 2;
aggregation = get_aggregation(get_bw_index(module_idP, CC_id),
UE_list->UE_sched_ctrl[UE_id].dl_cqi[CC_id],
format0);
} }
LOG_D(MAC,"[eNB %d] frame %d subframe %d,Checking PUSCH %d for UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n", LOG_D(MAC,"[eNB %d] frame %d subframe %d,Checking PUSCH %d for UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n",
module_idP,frameP,subframeP,harq_pid,UE_id,rnti,CC_id, aggregation,N_RB_UL); module_idP,frameP,subframeP,harq_pid,UE_id,rnti,CC_id, aggregation,N_RB_UL);
......
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