From f2f08ac52afbf5ff12bbc6a694a893848e99108c Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Wed, 9 Oct 2024 16:11:55 +0200
Subject: [PATCH] Remove ENABLE_AERIAL switch in aerial bindings

As is visible at the top of the patch, for compiling aerial_lib (the
binding FAPI-Aerial), we always add ENABLE_AERIAL. Thus, all the code
within ENABLE_AERIAL will be compiled; we can also simply take it out.
---
 nfapi/oai_integration/aerial/CMakeLists.txt | 2 +-
 nfapi/oai_integration/aerial/fapi_nvIPC.c   | 3 +--
 nfapi/oai_integration/aerial/fapi_nvIPC.h   | 2 --
 nfapi/oai_integration/aerial/fapi_vnf_p5.c  | 3 +--
 nfapi/oai_integration/aerial/fapi_vnf_p5.h  | 3 +--
 nfapi/oai_integration/aerial/fapi_vnf_p7.c  | 5 +----
 nfapi/oai_integration/aerial/fapi_vnf_p7.h  | 2 --
 7 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/nfapi/oai_integration/aerial/CMakeLists.txt b/nfapi/oai_integration/aerial/CMakeLists.txt
index 4c02ab01e9..80d4cd77c6 100644
--- a/nfapi/oai_integration/aerial/CMakeLists.txt
+++ b/nfapi/oai_integration/aerial/CMakeLists.txt
@@ -19,7 +19,7 @@ if (OAI_AERIAL)
     else ()
         message(STATUS "  nvlog library found in ${NVLOG_LIB}")
     endif ()
-    target_compile_definitions(aerial_lib PUBLIC ENABLE_L2_SLT_RSP ENABLE_AERIAL)
+    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 "${NVLOG_LIB}" "${NVIPC_LIB}")
diff --git a/nfapi/oai_integration/aerial/fapi_nvIPC.c b/nfapi/oai_integration/aerial/fapi_nvIPC.c
index a1de610c03..5b17f0ff1f 100644
--- a/nfapi/oai_integration/aerial/fapi_nvIPC.c
+++ b/nfapi/oai_integration/aerial/fapi_nvIPC.c
@@ -29,7 +29,7 @@
 * \note
 * \warning
 */
-#ifdef ENABLE_AERIAL
+
 #define _GNU_SOURCE
 #include <sched.h>
 #include <stdio.h>
@@ -681,4 +681,3 @@ int nvIPC_Init(nvipc_params_t nvipc_params_s)
   aerial_pnf_nr_connection_indication_cb(vnf_config, 1);
   return 0;
 }
-#endif
diff --git a/nfapi/oai_integration/aerial/fapi_nvIPC.h b/nfapi/oai_integration/aerial/fapi_nvIPC.h
index d5171f128e..594edd843a 100644
--- a/nfapi/oai_integration/aerial/fapi_nvIPC.h
+++ b/nfapi/oai_integration/aerial/fapi_nvIPC.h
@@ -29,7 +29,6 @@
 * \note
 * \warning
  */
-#ifdef ENABLE_AERIAL
 #ifndef OPENAIRINTERFACE_FAPI_NVIPC_H
 #define OPENAIRINTERFACE_FAPI_NVIPC_H
 
@@ -57,4 +56,3 @@ void set_config(nfapi_vnf_config_t *conf);
 int nvIPC_Init(nvipc_params_t);
 
 #endif // OPENAIRINTERFACE_FAPI_NVIPC_H
-#endif
diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p5.c b/nfapi/oai_integration/aerial/fapi_vnf_p5.c
index 55e4cb4a80..951a734ddd 100644
--- a/nfapi/oai_integration/aerial/fapi_vnf_p5.c
+++ b/nfapi/oai_integration/aerial/fapi_vnf_p5.c
@@ -29,7 +29,7 @@
 * \note
 * \warning
  */
-#ifdef ENABLE_AERIAL
+
 #include "fapi_vnf_p5.h"
 #include "fapi_vnf_p7.h"
 #include "nfapi/open-nFAPI/vnf/inc/vnf_p7.h"
@@ -617,4 +617,3 @@ int oai_fapi_send_end_request(int cell, uint32_t frame, uint32_t slot){
   }
   return retval;
 }
-#endif
diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p5.h b/nfapi/oai_integration/aerial/fapi_vnf_p5.h
index b67f959f8f..84fb3ec2f8 100644
--- a/nfapi/oai_integration/aerial/fapi_vnf_p5.h
+++ b/nfapi/oai_integration/aerial/fapi_vnf_p5.h
@@ -29,7 +29,7 @@
 * \note
 * \warning
  */
-#ifdef ENABLE_AERIAL
+
 #ifndef OPENAIRINTERFACE_FAPI_VNF_P5_H
 #define OPENAIRINTERFACE_FAPI_VNF_P5_H
 #define _GNU_SOURCE
@@ -70,4 +70,3 @@ int oai_fapi_ul_dci_req(nfapi_nr_ul_dci_request_t *ul_dci_req);
 int oai_fapi_tx_data_req(nfapi_nr_tx_data_request_t *tx_data_req);
 int oai_fapi_dl_tti_req(nfapi_nr_dl_tti_request_t *dl_config_req);
 #endif //OPENAIRINTERFACE_FAPI_VNF_P5_H
-#endif
diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p7.c b/nfapi/oai_integration/aerial/fapi_vnf_p7.c
index f6179e06d4..a84ac70110 100644
--- a/nfapi/oai_integration/aerial/fapi_vnf_p7.c
+++ b/nfapi/oai_integration/aerial/fapi_vnf_p7.c
@@ -29,7 +29,7 @@
 * \note
 * \warning
  */
-#ifdef ENABLE_AERIAL
+
 #include "fapi_vnf_p7.h"
 #include "nr_nfapi_p7.h"
 
@@ -293,7 +293,6 @@ int trigger_scheduler(nfapi_nr_slot_indication_scf_t *slot_ind)
   // memset(sched_resp, 0, sizeof(*sched_resp));
   gNB_dlsch_ulsch_scheduler(0, slot_ind->sfn, slot_ind->slot, &g_sched_resp);
   if (NFAPI_MODE == NFAPI_MODE_AERIAL) {
-#ifdef ENABLE_AERIAL
     bool send_slt_resp = false;
     if (g_sched_resp.DL_req.dl_tti_request_body.nPDUs> 0) {
       oai_fapi_dl_tti_req(&g_sched_resp.DL_req);
@@ -314,7 +313,6 @@ int trigger_scheduler(nfapi_nr_slot_indication_scf_t *slot_ind)
     if (send_slt_resp) {
       oai_fapi_send_end_request(0,slot_ind->sfn, slot_ind->slot);
     }
-#endif
   }
 
   return 1;
@@ -862,4 +860,3 @@ int fapi_nr_pack_and_send_p7_message(vnf_p7_t *vnf_p7, nfapi_p7_message_header_t
     return aerial_send_P7_msg(FAPI_buffer, len_FAPI, header);
   }
 }
-#endif
diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p7.h b/nfapi/oai_integration/aerial/fapi_vnf_p7.h
index 65a6f1818a..404df347cc 100644
--- a/nfapi/oai_integration/aerial/fapi_vnf_p7.h
+++ b/nfapi/oai_integration/aerial/fapi_vnf_p7.h
@@ -30,7 +30,6 @@
 * \warning
  */
 
-#ifdef ENABLE_AERIAL
 #ifndef OPENAIRINTERFACE_FAPI_VNF_P7_H
 #define OPENAIRINTERFACE_FAPI_VNF_P7_H
 
@@ -230,4 +229,3 @@ uint8_t aerial_unpack_nr_rach_indication(uint8_t **ppReadPackedMsg,
 // int fapi_nr_p7_message_pack(void *pMessageBuf, void *pPackedBuf, uint32_t packedBufLen, nfapi_p7_codec_config_t* config);
 int fapi_nr_pack_and_send_p7_message(vnf_p7_t *vnf_p7, nfapi_p7_message_header_t *header);
 #endif // OPENAIRINTERFACE_FAPI_VNF_P7_H
-#endif