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
lizhongxiao
OpenXG-RAN
Commits
36cd05bc
Commit
36cd05bc
authored
Apr 16, 2019
by
Louis Adrien Dufrene
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix: dci0_ongoing timer ok, now impossible to set ul_SR when dci0 is ongoing.
parent
d7cddc28
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1
-1
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+0
-3
No files found.
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
36cd05bc
...
@@ -4954,7 +4954,7 @@ SR_indication(module_id_t mod_idP,
...
@@ -4954,7 +4954,7 @@ SR_indication(module_id_t mod_idP,
UE_scheduling_ctrl
=
&
(
UE_list
->
UE_sched_ctrl
[
UE_id
]);
UE_scheduling_ctrl
=
&
(
UE_list
->
UE_sched_ctrl
[
UE_id
]);
if
((
UE_scheduling_ctrl
->
cdrx_configured
==
TRUE
)
&&
if
((
UE_scheduling_ctrl
->
cdrx_configured
==
TRUE
)
&&
(
UE_scheduling_ctrl
->
dci0_ongoing_timer
>
4
)
&&
(
UE_scheduling_ctrl
->
dci0_ongoing_timer
>
0
)
&&
(
UE_scheduling_ctrl
->
dci0_ongoing_timer
<
8
))
{
(
UE_scheduling_ctrl
->
dci0_ongoing_timer
<
8
))
{
LOG_D
(
MAC
,
"[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d on CC_id %d. \
LOG_D
(
MAC
,
"[eNB %d][SR %x] Frame %d subframeP %d Signaling SR for UE %d on CC_id %d. \
The SR is not set do to ongoing DCI0 with CDRX activated
\n
"
,
The SR is not set do to ongoing DCI0 with CDRX activated
\n
"
,
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
36cd05bc
...
@@ -241,9 +241,6 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -241,9 +241,6 @@ rx_sdu(const module_id_t enb_mod_idP,
* Note: in case of asynchronous UL HARQ process restart here relevant RTT timer.
* Note: in case of asynchronous UL HARQ process restart here relevant RTT timer.
* Start corresponding CDRX ULRetransmission timer.
* Start corresponding CDRX ULRetransmission timer.
*/
*/
unsigned
long
active_time_condition
=
10
;
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_DRX_ACTIVE_TIME_CONDITION
,
(
unsigned
long
)
active_time_condition
);
}
}
first_rb
=
UE_template_ptr
->
first_rb_ul
[
harq_pid
];
first_rb
=
UE_template_ptr
->
first_rb_ul
[
harq_pid
];
...
...
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