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
常顺宇
OpenXG-RAN
Commits
dcdda7ba
Commit
dcdda7ba
authored
7 years ago
by
Xu Bo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set UL schedule period to 5Frame for TDD config1
parent
1bc258a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
3 deletions
+24
-3
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+10
-1
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/pre_processor.c
+14
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
dcdda7ba
...
...
@@ -1832,7 +1832,6 @@ void schedule_ulsch_rnti(module_id_t module_idP,
}
else
{
tpc
=
1
;
//0
}
if
(
tpc
!=
1
)
{
LOG_D
(
MAC
,
"[eNB %d] ULSCH scheduler: frame %d, subframe %d, harq_pid %d, tpc %d, accumulated %d, normalized/target rx power %d/%d
\n
"
,
module_idP
,
frameP
,
subframeP
,
harq_pid
,
tpc
,
...
...
@@ -1917,6 +1916,11 @@ void schedule_ulsch_rnti(module_id_t module_idP,
hi_dci0_pdu
->
dci_pdu
.
dci_pdu_rel8
.
harq_pid
=
harq_pid
;
hi_dci0_req
->
number_of_dci
++
;
hi_dci0_req
->
sfnsf
=
sfnsf_add_subframe
(
sched_frame
,
sched_subframeP
,
0
);
//(frameP, subframeP, 4)
hi_dci0_req
->
tl
.
tag
=
NFAPI_HI_DCI0_REQUEST_BODY_TAG
;
nfapi_hi_dci0_request_t
*
nfapi_hi_dci0_req
=
&
eNB
->
HI_DCI0_req
[
CC_id
][
subframeP
];
nfapi_hi_dci0_req
->
sfn_sf
=
frameP
<<
4
|
subframeP
;
// sfnsf_add_subframe(sched_frame, sched_subframeP, 0); // sunday!
nfapi_hi_dci0_req
->
header
.
message_id
=
NFAPI_HI_DCI0_REQUEST
;
LOG_D
(
MAC
,
"[PUSCH %d] Frame %d, Subframe %d: Adding UL CONFIG.Request for UE %d/%x, ulsch_frame %d, ulsch_subframe %d
\n
"
,
harq_pid
,
frameP
,
subframeP
,
UE_id
,
rnti
,
sched_frame
,
sched_subframeP
);
...
...
@@ -2042,6 +2046,11 @@ void schedule_ulsch_rnti(module_id_t module_idP,
hi_dci0_pdu
->
hi_pdu
.
hi_pdu_rel8
.
hi_value
=
0
;
hi_dci0_req
->
number_of_hi
++
;
hi_dci0_req
->
sfnsf
=
sfnsf_add_subframe
(
sched_frame
,
sched_subframeP
,
0
);
//(frameP, subframeP, 4)
nfapi_hi_dci0_request_t
*
nfapi_hi_dci0_req
=
&
eNB
->
HI_DCI0_req
[
CC_id
][
subframeP
];
nfapi_hi_dci0_req
->
sfn_sf
=
frameP
<<
4
|
subframeP
;
// sfnsf_add_subframe(sched_frame, sched_subframeP, 0); // sunday!
nfapi_hi_dci0_req
->
header
.
message_id
=
NFAPI_HI_DCI0_REQUEST
;
LOG_D
(
MAC
,
"[eNB %d][PUSCH %d/%x] CC_id %d Frame %d subframeP %d Scheduled (PHICH) UE %d (mcs %d, first rb %d, nb_rb %d, TBS %d, round %d)
\n
"
,
module_idP
,
harq_pid
,
rnti
,
CC_id
,
frameP
,
subframeP
,
UE_id
,
UE_template
->
mcs_UL
[
harq_pid
],
ulsch_ue_select
[
CC_id
].
list
[
ulsch_ue_num
].
start_rb
,
ulsch_ue_select
[
CC_id
].
list
[
ulsch_ue_num
].
nb_rb
,
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/pre_processor.c
View file @
dcdda7ba
...
...
@@ -2509,7 +2509,13 @@ void ulsch_scheduler_pre_ue_select(
}
if
(
(
ulsch_ue_select
[
CC_id
].
ue_num
+
ul_inactivity_num
[
CC_id
]
)
<
ulsch_ue_max_num
[
CC_id
]
)
{
UE_sched_ctl
=
&
UE_list
->
UE_sched_ctrl
[
UE_id
];
if
(
((
UE_sched_ctl
->
ul_inactivity_timer
>
20
)
&&
(
UE_sched_ctl
->
ul_scheduled
==
0
))
||
uint8_t
ul_period
=
0
;
if
(
cc
->
tdd_Config
)
{
ul_period
=
50
;
}
else
{
ul_period
=
20
;
}
if
(
((
UE_sched_ctl
->
ul_inactivity_timer
>
ul_period
)
&&
(
UE_sched_ctl
->
ul_scheduled
==
0
))
||
((
UE_sched_ctl
->
ul_inactivity_timer
>
10
)
&&
(
UE_sched_ctl
->
ul_scheduled
==
0
)
&&
(
mac_eNB_get_rrc_status
(
module_idP
,
UE_RNTI
(
module_idP
,
UE_id
))
<
RRC_CONNECTED
)))
{
ul_inactivity_id
[
CC_id
][
ul_inactivity_num
[
CC_id
]]
=
UE_id
;
ul_inactivity_num
[
CC_id
]
++
;
...
...
@@ -2615,7 +2621,13 @@ void ulsch_scheduler_pre_ue_select(
//inactivity UE
if
(
(
ulsch_ue_select
[
CC_id
].
ue_num
+
ul_inactivity_num
[
CC_id
])
<
ulsch_ue_max_num
[
CC_id
]
)
{
UE_sched_ctl
=
&
UE_list
->
UE_sched_ctrl
[
UE_id
];
if
(
((
UE_sched_ctl
->
ul_inactivity_timer
>
20
)
&&
(
UE_sched_ctl
->
ul_scheduled
==
0
))
||
uint8_t
ul_period
=
0
;
if
(
cc
->
tdd_Config
)
{
ul_period
=
50
;
}
else
{
ul_period
=
20
;
}
if
(
((
UE_sched_ctl
->
ul_inactivity_timer
>
ul_period
)
&&
(
UE_sched_ctl
->
ul_scheduled
==
0
))
||
((
UE_sched_ctl
->
ul_inactivity_timer
>
10
)
&&
(
UE_sched_ctl
->
ul_scheduled
==
0
)
&&
(
mac_eNB_get_rrc_status
(
module_idP
,
UE_RNTI
(
module_idP
,
UE_id
))
<
RRC_CONNECTED
)))
{
ul_inactivity_id
[
CC_id
][
ul_inactivity_num
[
CC_id
]]
=
UE_id
;
ul_inactivity_num
[
CC_id
]
++
;
...
...
This diff is collapsed.
Click to expand it.
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