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
b878b154
Commit
b878b154
authored
Jun 08, 2019
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add frame and subframe before sending DL_req,TX_req,HI_DCI0_req,UL_req
parent
5ee6fe72
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+4
-0
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+1
-0
No files found.
openair1/SCHED/fapi_l1.c
View file @
b878b154
...
@@ -925,12 +925,15 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
...
@@ -925,12 +925,15 @@ void schedule_response(Sched_Rsp_t *Sched_INFO) {
if
((
NFAPI_MODE
!=
NFAPI_MONOLITHIC
)
&&
do_oai
&&
!
dont_send
)
{
if
((
NFAPI_MODE
!=
NFAPI_MONOLITHIC
)
&&
do_oai
&&
!
dont_send
)
{
if
(
Sched_INFO
->
TX_req
->
tx_request_body
.
number_of_pdus
>
0
){
if
(
Sched_INFO
->
TX_req
->
tx_request_body
.
number_of_pdus
>
0
){
Sched_INFO
->
TX_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
oai_nfapi_tx_req
(
Sched_INFO
->
TX_req
);
oai_nfapi_tx_req
(
Sched_INFO
->
TX_req
);
}
}
Sched_INFO
->
DL_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
oai_nfapi_dl_config_req
(
Sched_INFO
->
DL_req
);
// DJP - .dl_config_request_body.dl_config_pdu_list[0]); // DJP - FIXME TODO - yuk - only copes with 1 pdu
oai_nfapi_dl_config_req
(
Sched_INFO
->
DL_req
);
// DJP - .dl_config_request_body.dl_config_pdu_list[0]); // DJP - FIXME TODO - yuk - only copes with 1 pdu
}
}
if
((
NFAPI_MODE
!=
NFAPI_MONOLITHIC
)
&&
number_hi_dci0_pdu
!=
0
)
{
if
((
NFAPI_MODE
!=
NFAPI_MONOLITHIC
)
&&
number_hi_dci0_pdu
!=
0
)
{
HI_DCI0_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
oai_nfapi_hi_dci0_req
(
HI_DCI0_req
);
oai_nfapi_hi_dci0_req
(
HI_DCI0_req
);
eNB
->
pdcch_vars
[
NFAPI_SFNSF2SF
(
HI_DCI0_req
->
sfn_sf
)
&
1
].
num_dci
=
0
;
eNB
->
pdcch_vars
[
NFAPI_SFNSF2SF
(
HI_DCI0_req
->
sfn_sf
)
&
1
].
num_dci
=
0
;
eNB
->
pdcch_vars
[
NFAPI_SFNSF2SF
(
HI_DCI0_req
->
sfn_sf
)
&
1
].
num_pdcch_symbols
=
0
;
eNB
->
pdcch_vars
[
NFAPI_SFNSF2SF
(
HI_DCI0_req
->
sfn_sf
)
&
1
].
num_pdcch_symbols
=
0
;
...
@@ -961,6 +964,7 @@ if (NFAPI_MODE!=NFAPI_MODE_VNF)
...
@@ -961,6 +964,7 @@ if (NFAPI_MODE!=NFAPI_MODE_VNF)
if
(
NFAPI_MODE
!=
NFAPI_MONOLITHIC
)
{
if
(
NFAPI_MODE
!=
NFAPI_MONOLITHIC
)
{
if
(
number_ul_pdu
>
0
)
{
if
(
number_ul_pdu
>
0
)
{
//LOG_D(PHY, "UL_CONFIG to send to PNF\n");
//LOG_D(PHY, "UL_CONFIG to send to PNF\n");
UL_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
oai_nfapi_ul_config_req
(
UL_req
);
oai_nfapi_ul_config_req
(
UL_req
);
UL_req
->
ul_config_request_body
.
number_of_pdus
=
0
;
UL_req
->
ul_config_request_body
.
number_of_pdus
=
0
;
number_ul_pdu
=
0
;
number_ul_pdu
=
0
;
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
b878b154
...
@@ -462,6 +462,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
...
@@ -462,6 +462,7 @@ check_ul_failure(module_id_t module_idP, int CC_id, int UE_id,
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
++
;
DL_req
[
CC_id
].
dl_config_request_body
.
tl
.
tag
=
NFAPI_DL_CONFIG_REQUEST_BODY_TAG
;
DL_req
[
CC_id
].
dl_config_request_body
.
tl
.
tag
=
NFAPI_DL_CONFIG_REQUEST_BODY_TAG
;
DL_req
[
CC_id
].
sfn_sf
=
frameP
<<
4
|
subframeP
;
LOG_D
(
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
,
...
...
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