From 91279388b884340c5594512f1dc18283f48931a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BAben=20Soares=20Silva?= Date: Tue, 2 Jul 2024 17:32:51 +0100 Subject: [PATCH] Creation of empty FAPI P7 library for separation of related functions. Note: Dependency in NFAPI_LIB and NFAPI_USER_LIB to be removed later --- CMakeLists.txt | 4 ++-- nfapi/oai_integration/aerial/CMakeLists.txt | 2 +- nfapi/open-nFAPI/fapi/CMakeLists.txt | 13 +++++++++-- nfapi/open-nFAPI/fapi/inc/nr_fapi_p7.h | 24 +++++++++++++++++++++ nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c | 20 +++++++++++++++++ 5 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 nfapi/open-nFAPI/fapi/inc/nr_fapi_p7.h create mode 100644 nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c diff --git a/CMakeLists.txt b/CMakeLists.txt index edd9c18657..4c13790708 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -717,7 +717,7 @@ set(NFAPI_SRC ) add_library(NFAPI_LIB ${NFAPI_SRC}) target_link_libraries(NFAPI_LIB PUBLIC nfapi_common) -target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5) +target_link_libraries(NFAPI_LIB PUBLIC nr_fapi_p5 nr_fapi_p7) include_directories(${NFAPI_DIR}/nfapi/public_inc) include_directories(${NFAPI_DIR}/nfapi/inc) @@ -742,7 +742,7 @@ set(NFAPI_VNF_SRC ) add_library(NFAPI_VNF_LIB ${NFAPI_VNF_SRC}) target_link_libraries(NFAPI_VNF_LIB PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs) -target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5) +target_link_libraries(NFAPI_VNF_LIB PRIVATE nr_fapi_p5 nr_fapi_p7) if(OAI_AERIAL) target_compile_definitions(NFAPI_VNF_LIB PRIVATE ENABLE_AERIAL) endif() diff --git a/nfapi/oai_integration/aerial/CMakeLists.txt b/nfapi/oai_integration/aerial/CMakeLists.txt index 80d4cd77c6..74b1ad9fbf 100644 --- a/nfapi/oai_integration/aerial/CMakeLists.txt +++ b/nfapi/oai_integration/aerial/CMakeLists.txt @@ -21,7 +21,7 @@ if (OAI_AERIAL) endif () target_compile_definitions(aerial_lib PUBLIC ENABLE_L2_SLT_RSP) target_link_libraries(aerial_lib PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs) - target_link_libraries(aerial_lib PRIVATE nr_fapi_p5) + target_link_libraries(aerial_lib PRIVATE nr_fapi_p5 nr_fapi_p7) target_link_libraries(aerial_lib PRIVATE "${NVLOG_LIB}" "${NVIPC_LIB}") else () message(STATUS "No Support for Aerial") diff --git a/nfapi/open-nFAPI/fapi/CMakeLists.txt b/nfapi/open-nFAPI/fapi/CMakeLists.txt index 1e2208172f..fbbae1e5aa 100644 --- a/nfapi/open-nFAPI/fapi/CMakeLists.txt +++ b/nfapi/open-nFAPI/fapi/CMakeLists.txt @@ -4,6 +4,15 @@ add_library(nr_fapi_p5 ) target_include_directories(nr_fapi_p5 PUBLIC inc) target_link_libraries(nr_fapi_p5 PUBLIC nfapi_common) -if(OAI_AERIAL) + +add_library(nr_fapi_p7 + src/nr_fapi_p7.c +) +target_include_directories(nr_fapi_p7 PUBLIC inc) +# Note: Dependencies with NFAPI_LIB NFAPI_USER_LIB only necessary until last FAPI function is moved into new library, to be removed at a later stage +target_link_libraries(nr_fapi_p7 PUBLIC nfapi_common NFAPI_LIB NFAPI_USER_LIB) + +if (OAI_AERIAL) target_compile_definitions(nr_fapi_p5 PRIVATE ENABLE_AERIAL) -endif() + target_compile_definitions(nr_fapi_p7 PRIVATE ENABLE_AERIAL) +endif () diff --git a/nfapi/open-nFAPI/fapi/inc/nr_fapi_p7.h b/nfapi/open-nFAPI/fapi/inc/nr_fapi_p7.h new file mode 100644 index 0000000000..d21d2c4227 --- /dev/null +++ b/nfapi/open-nFAPI/fapi/inc/nr_fapi_p7.h @@ -0,0 +1,24 @@ +/* + * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The OpenAirInterface Software Alliance licenses this file to You under + * the OAI Public License, Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.openairinterface.org/?page_id=698 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *------------------------------------------------------------------------------- + * For more information about the OpenAirInterface (OAI) Software Alliance: + * contact@openairinterface.org + */ +#ifndef OPENAIRINTERFACE_NR_FAPI_P7_H +#define OPENAIRINTERFACE_NR_FAPI_P7_H + +#endif // OPENAIRINTERFACE_NR_FAPI_P7_H diff --git a/nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c b/nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c new file mode 100644 index 0000000000..0764bcae5e --- /dev/null +++ b/nfapi/open-nFAPI/fapi/src/nr_fapi_p7.c @@ -0,0 +1,20 @@ +/* + * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The OpenAirInterface Software Alliance licenses this file to You under + * the OAI Public License, Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.openairinterface.org/?page_id=698 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *------------------------------------------------------------------------------- + * For more information about the OpenAirInterface (OAI) Software Alliance: + * contact@openairinterface.org + */