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
ef4aee1e
Commit
ef4aee1e
authored
Jan 27, 2018
by
Xu Bo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue255_256_257_tmp' into ues_test
parents
664d1a4b
0dcc3dce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+1
-1
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+12
-0
No files found.
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
ef4aee1e
...
@@ -533,7 +533,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
...
@@ -533,7 +533,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
pdcch_order_table
[
cc
[
CC_id
].
mib
->
message
.
dl_Bandwidth
];
pdcch_order_table
[
cc
[
CC_id
].
mib
->
message
.
dl_Bandwidth
];
DL_req
[
CC_id
].
dl_config_request_body
.
number_dci
++
;
DL_req
[
CC_id
].
dl_config_request_body
.
number_dci
++
;
DL_req
[
CC_id
].
dl_config_request_body
.
number_pdu
++
;
DL_req
[
CC_id
].
dl_config_request_body
.
number_pdu
++
;
LOG_
I
(
MAC
,
LOG_
D
(
MAC
,
"UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d
\n
"
,
"UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d
\n
"
,
UE_id
,
rnti
,
UE_id
,
rnti
,
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
,
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
,
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
ef4aee1e
...
@@ -123,6 +123,10 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -123,6 +123,10 @@ rx_sdu(const module_id_t enb_mod_idP,
round_UL
[
CC_idP
][
harq_pid
]
<
8
,
"round >= 8
\n
"
);
round_UL
[
CC_idP
][
harq_pid
]
<
8
,
"round >= 8
\n
"
);
if
(
sduP
!=
NULL
)
{
if
(
sduP
!=
NULL
)
{
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_inactivity_timer
=
0
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_inactivity_timer
=
0
;
if
(
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
>
0
)
{
LOG_I
(
MAC
,
"UE %d rnti %x: UL Failure timer %d clear to 0
\n
"
,
UE_id
,
rntiP
,
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
);
}
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
=
0
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
=
0
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_scheduled
&=
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_scheduled
&=
(
~
(
1
<<
harq_pid
));
(
~
(
1
<<
harq_pid
));
...
@@ -285,6 +289,10 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -285,6 +289,10 @@ rx_sdu(const module_id_t enb_mod_idP,
*/
*/
UE_id
=
old_UE_id
;
UE_id
=
old_UE_id
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_inactivity_timer
=
0
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_inactivity_timer
=
0
;
if
(
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
>
0
)
{
LOG_I
(
MAC
,
"UE %d rnti %x: UL Failure timer %d clear to 0
\n
"
,
UE_id
,
old_rnti
,
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
);
}
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
=
0
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
=
0
;
if
(
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_out_of_sync
>
0
)
{
if
(
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_out_of_sync
>
0
)
{
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_out_of_sync
=
0
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_out_of_sync
=
0
;
...
@@ -1176,6 +1184,10 @@ schedule_ulsch_rnti(module_id_t module_idP,
...
@@ -1176,6 +1184,10 @@ schedule_ulsch_rnti(module_id_t module_idP,
// inform RRC of failure and clear timer
// inform RRC of failure and clear timer
mac_eNB_rrc_ul_failure
(
module_idP
,
CC_id
,
frameP
,
mac_eNB_rrc_ul_failure
(
module_idP
,
CC_id
,
frameP
,
subframeP
,
rnti
);
subframeP
,
rnti
);
if
(
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
>
0
)
{
LOG_I
(
MAC
,
"UE %d rnti %x: UL Failure timer %d clear to 0
\n
"
,
UE_id
,
rnti
,
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
);
}
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
=
0
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_failure_timer
=
0
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_out_of_sync
=
1
;
UE_list
->
UE_sched_ctrl
[
UE_id
].
ul_out_of_sync
=
1
;
}
}
...
...
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