Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
canghaiwuhen
OpenXG-RAN
Commits
6ec6c8b2
Commit
6ec6c8b2
authored
Mar 05, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Request CQI in all NFAPI modes (i.e., also for L2 sim)
parent
6866be71
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
30 deletions
+25
-30
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+25
-30
No files found.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
6ec6c8b2
...
@@ -1496,38 +1496,33 @@ schedule_ulsch_rnti(module_id_t module_idP,
...
@@ -1496,38 +1496,33 @@ 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
=
1
;
cqi_req
=
0
;
LOG_D
(
MAC
,
}
else
{
"Setting CQI_REQ (timer %d)
\n
"
,
cqi_req
=
1
;
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
/* TDD: to be safe, do not ask CQI in special Subframes:36.213/7.2.3 CQI definition */
* 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
:
if
(
subframeP
==
1
)
case
3
:
cqi_req
=
0
;
if
(
subframeP
==
1
)
{
break
;
cqi_req
=
0
;
}
default:
LOG_E
(
MAC
,
" TDD config not supported
\n
"
);
break
;
break
;
default:
LOG_E
(
MAC
,
" TDD config not supported
\n
"
);
break
;
}
}
}
}
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
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment