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
07552604
Commit
07552604
authored
Oct 12, 2022
by
Vaibhav Shrivastava
Committed by
jperaldi
Nov 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correction of PhyId in Tx Req
parent
41655207
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
17 deletions
+7
-17
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+6
-17
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+1
-0
No files found.
nfapi/oai_integration/nfapi_vnf.c
View file @
07552604
...
...
@@ -1987,28 +1987,17 @@ int oai_nfapi_tx_req(nfapi_tx_request_t *tx_req)
{
nfapi_vnf_p7_config_t
*
p7_config
=
vnf
.
p7_vnfs
[
0
].
config
;
int
retval
=
0
;
int
num_phy
=
0
;
uint16_t
sfn
=
0
;
uint16_t
sf
=
0
;
sfn
=
tx_req
->
sfn_sf
>>
4
;
sf
=
tx_req
->
sfn_sf
&
0xF
;
/* Below if condition checking if tx_req is for MIB (sf == 0) or SIB1 ((sfn % 2 == 0) && (sf == 5)) */
if
((
sf
==
0
)
||
((
sfn
%
2
==
0
)
&&
(
sf
==
5
)))
num_phy
=
vnf
.
pnfs
[
0
].
num_phys
;
else
num_phy
=
1
;
for
(
int
i
=
0
;
i
<
num_phy
;
i
++
)
{
tx_req
->
header
.
phy_id
=
i
+
1
;
// DJP HACK TODO FIXME - need to pass this around!!!!
tx_req
->
header
.
message_id
=
NFAPI_TX_REQUEST
;
//LOG_D(PHY, "[VNF] %s() TX_REQ sfn_sf:%d number_of_pdus:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(tx_req->sfn_sf), tx_req->tx_request_body.number_of_pdus);
LOG_I
(
NFAPI_VNF
,
"MultiCell: fxn:%s num_phy:%d phy_id:%d sfn:%d sf:%d
\n
"
,
__FUNCTION__
,
num_phy
,
tx_req
->
header
.
phy_id
,
sfn
,
sf
);
retval
=
nfapi_vnf_p7_tx_req
(
p7_config
,
tx_req
);
if
(
retval
!=
0
)
{
LOG_E
(
PHY
,
"%s() Problem sending tx_req for phyId:%d :%d
\n
"
,
__FUNCTION__
,
tx_req
->
header
.
phy_id
,
retval
);
}
tx_req
->
header
.
message_id
=
NFAPI_TX_REQUEST
;
//LOG_D(PHY, "[VNF] %s() TX_REQ sfn_sf:%d number_of_pdus:%d\n", __FUNCTION__, NFAPI_SFNSF2DEC(tx_req->sfn_sf), tx_req->tx_request_body.number_of_pdus);
LOG_I
(
NFAPI_VNF
,
"MultiCell: fxn:%s phy_id:%d sfn:%d sf:%d
\n
"
,
__FUNCTION__
,
tx_req
->
header
.
phy_id
,
sfn
,
sf
);
retval
=
nfapi_vnf_p7_tx_req
(
p7_config
,
tx_req
);
if
(
retval
!=
0
)
{
LOG_E
(
PHY
,
"%s() Problem sending tx_req for phyId:%d :%d
\n
"
,
__FUNCTION__
,
tx_req
->
header
.
phy_id
,
retval
);
}
tx_req
->
tx_request_body
.
number_of_pdus
=
0
;
...
...
openair1/SCHED/fapi_l1.c
View file @
07552604
...
...
@@ -961,6 +961,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) {
if
((
NFAPI_MODE
!=
NFAPI_MONOLITHIC
)
&&
do_oai
&&
!
dont_send
)
{
if
(
Sched_INFO
->
TX_req
->
tx_request_body
.
number_of_pdus
>
0
)
{
Sched_INFO
->
TX_req
->
sfn_sf
=
frame
<<
4
|
subframe
;
Sched_INFO
->
TX_req
->
header
.
phy_id
=
Sched_INFO
->
CC_id
+
1
;
oai_nfapi_tx_req
(
Sched_INFO
->
TX_req
);
}
...
...
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