maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Request CQI in all NFAPI modes (i.e., also for L2 sim)

Browse Source
This commit is contained in:
Robert Schmidt
2020-03-08 18:33:34 +01:00
parent 6866be7175
commit 6ec6c8b261
1 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+7 -12
View File
@@ -1496,27 +1496,23 @@ schedule_ulsch_rnti(module_id_t module_idP,
if (status >= RRC_CONNECTED && UE_sched_ctrl_ptr->cqi_req_timer > 30) { if (status >= RRC_CONNECTED && UE_sched_ctrl_ptr->cqi_req_timer > 30) {
if (UE_sched_ctrl_ptr->cqi_received == 0) { if (UE_sched_ctrl_ptr->cqi_received == 0) {
if (NFAPI_MODE != NFAPI_MONOLITHIC) {
cqi_req = 0;
} else {
cqi_req = 1; cqi_req = 1;
LOG_D(MAC,"Setting CQI_REQ (timer %d)\n",UE_sched_ctrl_ptr->cqi_req_timer); LOG_D(MAC,
"Setting CQI_REQ (timer %d)\n",
UE_sched_ctrl_ptr->cqi_req_timer);
/* TDD: to be safe, do not ask CQI in special Subframes:36.213/7.2.3 CQI definition */ /* TDD: to be safe, do not ask CQI in special
* Subframes:36.213/7.2.3 CQI definition */
if (cc[CC_id].tdd_Config) { if (cc[CC_id].tdd_Config) {
switch (cc[CC_id].tdd_Config->subframeAssignment) { switch (cc[CC_id].tdd_Config->subframeAssignment) {
case 1: case 1:
if(subframeP == 1 || subframeP == 6) { if (subframeP == 1 || subframeP == 6)
cqi_req = 0; cqi_req = 0;
}
break; break;
case 3: case 3:
if(subframeP == 1) { if (subframeP == 1)
cqi_req = 0; cqi_req = 0;
}
break; break;
default: default:
@@ -1528,7 +1524,6 @@ schedule_ulsch_rnti(module_id_t module_idP,
if (cqi_req == 1) { if (cqi_req == 1) {
UE_sched_ctrl_ptr->cqi_req_flag |= 1 << sched_subframeP; UE_sched_ctrl_ptr->cqi_req_flag |= 1 << sched_subframeP;
} }
}
} else { } else {
LOG_D(MAC,"Clearing CQI request timer\n"); LOG_D(MAC,"Clearing CQI request timer\n");
UE_sched_ctrl_ptr->cqi_req_flag = 0; UE_sched_ctrl_ptr->cqi_req_flag = 0;