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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG-RAN
Commits
6ba76d08
Commit
6ba76d08
authored
Mar 28, 2024
by
chenyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change tx_data_req to an instance of the structure rather than a pointer.
parent
25a3b7f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+6
-6
nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h
nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h
+2
-1
No files found.
nfapi/oai_integration/nfapi_vnf.c
View file @
6ba76d08
...
@@ -1951,19 +1951,19 @@ int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req)
...
@@ -1951,19 +1951,19 @@ int oai_nfapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req)
return
retval
;
return
retval
;
}
}
int
oai_nfapi_tx_data_req
(
nfapi_nr_tx_data_request_t
*
tx_data_req
)
int
oai_nfapi_tx_data_req
(
nfapi_nr_tx_data_request_t
tx_data_req
)
{
{
LOG_D
(
NR_PHY
,
"Entering oai_nfapi_nr_tx_data_req sfn:%d,slot:%d
\n
"
,
tx_data_req
->
SFN
,
tx_data_req
->
Slot
);
LOG_D
(
NR_PHY
,
"Entering oai_nfapi_nr_tx_data_req sfn:%d,slot:%d
\n
"
,
tx_data_req
.
SFN
,
tx_data_req
.
Slot
);
nfapi_vnf_p7_config_t
*
p7_config
=
vnf
.
p7_vnfs
[
0
].
config
;
nfapi_vnf_p7_config_t
*
p7_config
=
vnf
.
p7_vnfs
[
0
].
config
;
tx_data_req
->
header
.
phy_id
=
1
;
// HACK TODO FIXME - need to pass this around!!!!
tx_data_req
.
header
.
phy_id
=
1
;
// HACK TODO FIXME - need to pass this around!!!!
tx_data_req
->
header
.
message_id
=
NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST
;
tx_data_req
.
header
.
message_id
=
NFAPI_NR_PHY_MSG_TYPE_TX_DATA_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_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);
int
retval
=
nfapi_vnf_p7_tx_data_req
(
p7_config
,
tx_data_req
);
int
retval
=
nfapi_vnf_p7_tx_data_req
(
p7_config
,
&
tx_data_req
);
if
(
retval
!=
0
)
{
if
(
retval
!=
0
)
{
LOG_E
(
PHY
,
"%s() Problem sending retval:%d
\n
"
,
__FUNCTION__
,
retval
);
LOG_E
(
PHY
,
"%s() Problem sending retval:%d
\n
"
,
__FUNCTION__
,
retval
);
}
else
{
}
else
{
tx_data_req
->
Number_of_PDUs
=
0
;
tx_data_req
.
Number_of_PDUs
=
0
;
}
}
return
retval
;
return
retval
;
...
...
nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h
View file @
6ba76d08
...
@@ -577,7 +577,8 @@ typedef struct
...
@@ -577,7 +577,8 @@ typedef struct
nfapi_nr_dl_tti_request_t
*
dl_tti_req
;
//nfapi_dl_config_request_t* dl_config_req;
nfapi_nr_dl_tti_request_t
*
dl_tti_req
;
//nfapi_dl_config_request_t* dl_config_req;
nfapi_nr_ul_tti_request_t
*
ul_tti_req
;
//nfapi_ul_config_request_t* ul_config_req;
nfapi_nr_ul_tti_request_t
*
ul_tti_req
;
//nfapi_ul_config_request_t* ul_config_req;
nfapi_nr_ul_dci_request_t
*
ul_dci_req
;
//nfapi_hi_dci0_request_t* hi_dci0_req;
nfapi_nr_ul_dci_request_t
*
ul_dci_req
;
//nfapi_hi_dci0_request_t* hi_dci0_req;
nfapi_nr_tx_data_request_t
*
tx_data_req
;
//nfapi_tx_request_t* tx_req;
// nfapi_nr_tx_data_request_t* tx_data_req;//nfapi_tx_request_t* tx_req;
nfapi_nr_tx_data_request_t
tx_data_req
;
//nfapi_tx_request_t* tx_req;
//TODO: check these two later
//TODO: check these two later
//nfapi_lbt_dl_config_request_t* lbt_dl_config_req;
//nfapi_lbt_dl_config_request_t* lbt_dl_config_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