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
2e62c05e
Commit
2e62c05e
authored
Mar 28, 2024
by
chenyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redeclare oai_nfapi_tx_data_req
parent
cba4bd88
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+1
-1
nfapi/open-nFAPI/pnf/src/pnf_p7.c
nfapi/open-nFAPI/pnf/src/pnf_p7.c
+5
-4
No files found.
nfapi/oai_integration/nfapi_vnf.c
View file @
2e62c05e
...
...
@@ -1226,7 +1226,7 @@ NR_Sched_Rsp_t g_sched_resp;
void
gNB_dlsch_ulsch_scheduler
(
module_id_t
module_idP
,
frame_t
frame
,
sub_frame_t
slot
,
NR_Sched_Rsp_t
*
sched_info
);
int
oai_nfapi_dl_tti_req
(
nfapi_nr_dl_tti_request_t
*
dl_config_req
);
int
oai_nfapi_ul_tti_req
(
nfapi_nr_ul_tti_request_t
*
ul_tti_req
);
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
);
int
oai_nfapi_ul_dci_req
(
nfapi_nr_ul_dci_request_t
*
ul_dci_req
);
int
trigger_scheduler
(
nfapi_nr_slot_indication_scf_t
*
slot_ind
)
...
...
nfapi/open-nFAPI/pnf/src/pnf_p7.c
View file @
2e62c05e
...
...
@@ -1966,6 +1966,7 @@ void pnf_handle_hi_dci0_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
static
void
cp_nr_tx_data_req
(
nfapi_nr_tx_data_request_t
*
dst
,
const
nfapi_nr_tx_data_request_t
*
src
)
{
// TODO copy only what is necessary
}
void
pnf_handle_tx_data_request
(
void
*
pRecvMsg
,
int
recvMsgLen
,
pnf_p7_t
*
pnf_p7
)
...
...
@@ -1973,7 +1974,7 @@ void pnf_handle_tx_data_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
//NFAPI_TRACE(NFAPI_TRACE_INFO, "TX.req Received\n");
nfapi_nr_tx_data_request_t
req
;
// nfapi_nr_tx_data_request_t* req = allocate_nfapi_tx_data_request(pnf_p7);
LOG_I
(
NFAPI_PNF
,
"[t4-1] Address of req: %p, size: %d
\n
"
,
(
void
*
)
req
,
sizeof
(
nfapi_nr_tx_data_request_t
));
LOG_I
(
NFAPI_PNF
,
"[t4-1] Address of req: %p, size: %d
\n
"
,
&
req
,
sizeof
(
nfapi_nr_tx_data_request_t
));
if
(
req
==
NULL
)
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"failed to allocate nfapi_tx_request structure
\n
"
);
...
...
@@ -1989,9 +1990,9 @@ void pnf_handle_tx_data_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
return
;
}
if
(
is_nr_p7_request_in_window
(
req
->
SFN
,
req
->
Slot
,
"tx_request"
,
pnf_p7
))
if
(
is_nr_p7_request_in_window
(
req
.
SFN
,
req
.
Slot
,
"tx_request"
,
pnf_p7
))
{
uint32_t
sfn_slot_dec
=
NFAPI_SFNSLOT2DEC
(
req
->
SFN
,
req
->
Slot
);
uint32_t
sfn_slot_dec
=
NFAPI_SFNSLOT2DEC
(
req
.
SFN
,
req
.
Slot
);
uint8_t
buffer_index
=
sfn_slot_dec
%
20
;
struct
timespec
t
;
...
...
@@ -2018,7 +2019,7 @@ void pnf_handle_tx_data_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
pnf_p7
->
slot_buffer
[
buffer_index
].
slot
=
req
.
Slot
;
cp_nr_tx_data_req
(
&
pnf_p7
->
slot_buffer
[
buffer_index
].
tx_data_req
,
&
req
);
// pnf_p7->slot_buffer[buffer_index].tx_data_req = req;
LOG_I
(
NFAPI_PNF
,
"[t5] Fill tx_data in buf[%d] , %d/%d
\n
"
,
buffer_index
,
req
->
SFN
,
req
->
Slot
);
LOG_I
(
NFAPI_PNF
,
"[t5] Fill tx_data in buf[%d] , %d/%d
\n
"
,
buffer_index
,
req
.
SFN
,
req
.
Slot
);
pnf_p7
->
stats
.
tx_data_ontime
++
;
}
...
...
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