Skip to content

O
OpenXG-RAN
Commit 54a36ff5 authored by Haruki NAOI's avatar Haruki NAOI
Browse files
Options

Merge remote-tracking branch 'remotes/origin/rm804_bugfix2' into sp3_master

parents 11d9a286 0928f049
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
openair1/SCHED/phy_procedures_lte_eNb.c
View file @ 54a36ff5
...@@ -1447,9 +1447,10 @@ void pusch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) ...@@ -1447,9 +1447,10 @@ void pusch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
fill_ulsch_cqi_indication(eNB,frame,subframe, fill_ulsch_cqi_indication(eNB,frame,subframe,
ulsch_harq, ulsch_harq,
ulsch->rnti); ulsch->rnti);
RC.mac[eNB->Mod_id]->UE_list.UE_sched_ctrl[i].cqi_req_flag = 0; RC.mac[eNB->Mod_id]->UE_list.UE_sched_ctrl[i].cqi_req_flag &= (~(1 << subframe));
}else{ }else{
if(RC.mac[eNB->Mod_id]->UE_list.UE_sched_ctrl[i].cqi_req_flag==1){ if(RC.mac[eNB->Mod_id]->UE_list.UE_sched_ctrl[i].cqi_req_flag & (1 << subframe) ){
RC.mac[eNB->Mod_id]->UE_list.UE_sched_ctrl[i].cqi_req_flag &= (~(1 << subframe));
RC.mac[eNB->Mod_id]->UE_list.UE_sched_ctrl[i].cqi_req_timer=30; RC.mac[eNB->Mod_id]->UE_list.UE_sched_ctrl[i].cqi_req_timer=30;
LOG_D(PHY,"Frame %d,Subframe %d, We're supposed to get a cqi here. Set cqi_req_timer to 30.\n",frame,subframe); LOG_D(PHY,"Frame %d,Subframe %d, We're supposed to get a cqi here. Set cqi_req_timer to 30.\n",frame,subframe);
} }
......
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @ 54a36ff5
...@@ -1330,6 +1330,7 @@ schedule_ulsch_rnti(module_id_t module_idP, ...@@ -1330,6 +1330,7 @@ schedule_ulsch_rnti(module_id_t module_idP,
cqi_req = 0; cqi_req = 0;
} else { } else {
cqi_req = 1; cqi_req = 1;
UE_sched_ctrl->cqi_req_flag |= 1 << sched_subframeP;
} }
UE_sched_ctrl->cqi_req_timer = 0; UE_sched_ctrl->cqi_req_timer = 0;
} else } else
...@@ -1863,7 +1864,7 @@ void schedule_ulsch_rnti(module_id_t module_idP, ...@@ -1863,7 +1864,7 @@ void schedule_ulsch_rnti(module_id_t module_idP,
else if (UE_sched_ctrl->cqi_req_timer>30) { else if (UE_sched_ctrl->cqi_req_timer>30) {
cqi_req = 1; cqi_req = 1;
UE_sched_ctrl->cqi_req_timer=0; UE_sched_ctrl->cqi_req_timer=0;
UE_sched_ctrl->cqi_req_flag=1; UE_sched_ctrl->cqi_req_flag |= 1 << sched_subframeP;
} }
else else
cqi_req = 0; cqi_req = 0;
......
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