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
5bbbd1dd
Commit
5bbbd1dd
authored
Jun 11, 2024
by
Rúben Soares Silva
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move general FAPI P5 message pack/unpack procedures into FAPI P5 library
parent
96569e20
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
325 additions
and
56 deletions
+325
-56
nfapi/oai_integration/aerial/fapi_vnf_p5.c
nfapi/oai_integration/aerial/fapi_vnf_p5.c
+0
-55
nfapi/oai_integration/aerial/fapi_vnf_p5.h
nfapi/oai_integration/aerial/fapi_vnf_p5.h
+0
-1
nfapi/open-nFAPI/fapi/inc/nr_fapi.h
nfapi/open-nFAPI/fapi/inc/nr_fapi.h
+19
-0
nfapi/open-nFAPI/fapi/src/nr_fapi_p5.c
nfapi/open-nFAPI/fapi/src/nr_fapi_p5.c
+306
-0
No files found.
nfapi/oai_integration/aerial/fapi_vnf_p5.c
View file @
5bbbd1dd
...
...
@@ -627,61 +627,6 @@ int aerial_nfapi_nr_vnf_p7_start(nfapi_vnf_p7_config_t *config)
return
0
;
}
int
fapi_nr_p5_message_pack
(
void
*
pMessageBuf
,
uint32_t
messageBufLen
,
void
*
pPackedBuf
,
uint32_t
packedBufLen
,
nfapi_p4_p5_codec_config_t
*
config
){
nfapi_p4_p5_message_header_t
*
pMessageHeader
=
pMessageBuf
;
uint8_t
*
pWritePackedMessage
=
pPackedBuf
;
uint32_t
packedMsgLen
;
//uint16_t packedMsgLen16;
if
(
pMessageBuf
==
NULL
||
pPackedBuf
==
NULL
)
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"P5 Pack supplied pointers are null
\n
"
);
return
-
1
;
}
uint8_t
*
pPackMessageEnd
=
pPackedBuf
+
packedBufLen
;
uint8_t
*
pPackedLengthField
=
&
pWritePackedMessage
[
4
];
uint8_t
*
pPacketBodyField
=
&
pWritePackedMessage
[
8
];
uint8_t
*
pPacketBodyFieldStart
=
&
pWritePackedMessage
[
8
];
pack_nr_p5_message_body
(
pMessageHeader
,
&
pPacketBodyField
,
pPackMessageEnd
,
config
);
// PHY API message header
push8
(
1
,
&
pWritePackedMessage
,
pPackMessageEnd
);
// Number of messages
push8
(
0
,
&
pWritePackedMessage
,
pPackMessageEnd
);
// Opaque handle
// PHY API Message structure
push16
(
pMessageHeader
->
message_id
,
&
pWritePackedMessage
,
pPackMessageEnd
);
// Message type ID
if
(
1
==
1
)
{
// check for a valid message length
packedMsgLen
=
get_packed_msg_len
((
uintptr_t
)
pPacketBodyFieldStart
,
(
uintptr_t
)
pPacketBodyField
);
packedMsgLen
-=
1
;
if
(
pMessageHeader
->
message_id
==
NFAPI_NR_PHY_MSG_TYPE_START_REQUEST
){
//START.request doesn't have a body, length is 0
packedMsgLen
=
0
;
}
else
if
(
packedMsgLen
>
0xFFFF
||
packedMsgLen
>
packedBufLen
)
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"Packed message 0x%02x length error %d, buffer supplied %d
\n
"
,
pMessageHeader
->
message_id
,
packedMsgLen
,
packedBufLen
);
return
-
1
;
}
else
{
}
// Update the message length in the header
if
(
!
push32
(
packedMsgLen
,
&
pPackedLengthField
,
pPackMessageEnd
))
return
-
1
;
// return the packed length
return
(
packedMsgLen
);
}
else
{
// Failed to pack the meassage
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"P5 Failed to pack message
\n
"
);
return
-
1
;
}
}
int
oai_fapi_ul_tti_req
(
nfapi_nr_ul_tti_request_t
*
ul_tti_req
)
{
nfapi_vnf_p7_config_t
*
p7_config
=
aerial_vnf
.
p7_vnfs
[
0
].
config
;
...
...
nfapi/oai_integration/aerial/fapi_vnf_p5.h
View file @
5bbbd1dd
...
...
@@ -65,7 +65,6 @@ uint8_t aerial_unpack_nr_param_response(uint8_t **ppReadPackedMsg, uint8_t *end,
uint8_t
aerial_unpack_nr_config_response
(
uint8_t
**
ppReadPackedMsg
,
uint8_t
*
end
,
void
*
msg
,
nfapi_p4_p5_codec_config_t
*
config
);
int
aerial_pnf_nr_connection_indication_cb
(
nfapi_vnf_config_t
*
config
,
int
p5_idx
);
int
aerial_nfapi_nr_vnf_p7_start
(
nfapi_vnf_p7_config_t
*
config
);
int
fapi_nr_p5_message_pack
(
void
*
pMessageBuf
,
uint32_t
messageBufLen
,
void
*
pPackedBuf
,
uint32_t
packedBufLen
,
nfapi_p4_p5_codec_config_t
*
config
);
int
oai_fapi_ul_tti_req
(
nfapi_nr_ul_tti_request_t
*
ul_tti_req
);
int
oai_fapi_ul_dci_req
(
nfapi_nr_ul_dci_request_t
*
ul_dci_req
);
...
...
nfapi/open-nFAPI/fapi/inc/nr_fapi.h
View file @
5bbbd1dd
...
...
@@ -49,4 +49,23 @@ typedef struct {
uint32_t
message_length
;
}
fapi_message_header_t
;
int
fapi_nr_p5_message_header_unpack
(
uint8_t
**
pMessageBuf
,
uint32_t
messageBufLen
,
void
*
pUnpackedBuf
,
uint32_t
unpackedBufLen
,
nfapi_p4_p5_codec_config_t
*
config
);
int
fapi_nr_p5_message_pack
(
void
*
pMessageBuf
,
uint32_t
messageBufLen
,
void
*
pPackedBuf
,
uint32_t
packedBufLen
,
nfapi_p4_p5_codec_config_t
*
config
);
int
fapi_nr_p5_message_unpack
(
void
*
pMessageBuf
,
uint32_t
messageBufLen
,
void
*
pUnpackedBuf
,
uint32_t
unpackedBufLen
,
nfapi_p4_p5_codec_config_t
*
config
);
int
check_nr_fapi_unpack_length
(
nfapi_nr_phy_msg_type_e
msgId
,
uint32_t
unpackedBufLen
);
#endif // OPENAIRINTERFACE_NR_FAPI_H
nfapi/open-nFAPI/fapi/src/nr_fapi_p5.c
View file @
5bbbd1dd
This diff is collapsed.
Click to expand it.
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