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
d6a9bf18
Commit
d6a9bf18
authored
Mar 28, 2024
by
chenyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error: incompatible types remove condition tx_slot_buffer->tx_data_req
parent
c609ade6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
12 deletions
+8
-12
nfapi/open-nFAPI/pnf/src/pnf_p7.c
nfapi/open-nFAPI/pnf/src/pnf_p7.c
+8
-12
No files found.
nfapi/open-nFAPI/pnf/src/pnf_p7.c
View file @
d6a9bf18
...
...
@@ -991,18 +991,18 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
// pnf_phy_ul_tti_req()
(
pnf_p7
->
_public
.
ul_tti_req_fn
)(
NULL
,
&
(
pnf_p7
->
_public
),
tx_slot_buffer
->
ul_tti_req
);
}
if
(
tx_slot_buffer
->
tx_data_req
!=
0
){
LOG_I
(
NFAPI_PNF
,
"Get address: %p
\n
"
,
&
(
pnf_p7
->
slot_buffer
[
buffer_index_tx
].
tx_data_req
));
LOG_I
(
NFAPI_PNF
,
"[%d]tx_slot_buffer.tx_data_req.SFN: %d ; *current* sfn_tx: %d
\n
"
,
buffer_index_tx
,
tx_slot_buffer
->
tx_data_req
.
SFN
,
sfn_tx
);
LOG_I
(
NFAPI_PNF
,
"[%d]tx_slot_buffer.tx_data_req.Slot: %d ; *current* slot_tx: %d
\n
"
,
buffer_index_tx
,
tx_slot_buffer
->
tx_data_req
.
Slot
,
slot_tx
);
}
if
(
tx_slot_buffer
->
tx_data_req
!=
0
&&
tx_slot_buffer
->
tx_data_req
.
SFN
==
sfn_tx
&&
tx_slot_buffer
->
tx_data_req
.
Slot
==
slot_tx
)
LOG_I
(
NFAPI_PNF
,
"Get address: %p
\n
"
,
&
(
pnf_p7
->
slot_buffer
[
buffer_index_tx
].
tx_data_req
));
LOG_I
(
NFAPI_PNF
,
"[%d]tx_slot_buffer.tx_data_req.SFN: %d ; *current* sfn_tx: %d
\n
"
,
buffer_index_tx
,
tx_slot_buffer
->
tx_data_req
.
SFN
,
sfn_tx
);
LOG_I
(
NFAPI_PNF
,
"[%d]tx_slot_buffer.tx_data_req.Slot: %d ; *current* slot_tx: %d
\n
"
,
buffer_index_tx
,
tx_slot_buffer
->
tx_data_req
.
Slot
,
slot_tx
);
if
(
tx_slot_buffer
->
tx_data_req
.
SFN
==
sfn_tx
&&
tx_slot_buffer
->
tx_data_req
.
Slot
==
slot_tx
)
{
DevAssert
(
pnf_p7
->
_public
.
tx_data_req_fn
!=
NULL
);
LOG_I
(
PHY
,
"Process tx_data SFN/slot %d.%d buffer index: %d
\n
"
,
sfn_tx
,
slot_tx
,
buffer_index_tx
);
// pnf_phy_tx_data_req()
(
pnf_p7
->
_public
.
tx_data_req_fn
)(
&
(
pnf_p7
->
_public
),
tx_slot_buffer
->
tx_data_req
);
(
pnf_p7
->
_public
.
tx_data_req_fn
)(
&
(
pnf_p7
->
_public
),
&
tx_slot_buffer
->
tx_data_req
);
}
...
...
@@ -1023,11 +1023,7 @@ int pnf_p7_slot_ind(pnf_p7_t* pnf_p7, uint16_t phy_id, uint16_t sfn, uint16_t sl
LOG_D
(
PHY
,
"SFN/slot %d.%d Buffer index : %d freed
\n
"
,
sfn_tx
,
slot_tx
,
buffer_index_tx
);
}
if
(
tx_slot_buffer
->
tx_data_req
!=
0
)
{
//deallocate_nfapi_tx_data_request(tx_slot_buffer->tx_data_req, pnf_p7);
tx_slot_buffer
->
tx_data_req
=
0
;
}
//deallocate_nfapi_tx_data_request(tx_slot_buffer->tx_data_req, pnf_p7);
if
(
tx_slot_buffer
->
ul_dci_req
!=
0
)
{
...
...
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