Remove f1ap_lib_extern.h: use headers directly

openair2/F1AP/lib/f1ap_interface_management.c

@@ -30,7 +30,7 @@
 #include "f1ap_lib_common.h"
 #include "f1ap_lib_includes.h"
 #include "f1ap_messages_types.h"
-#include "f1ap_lib_extern.h"
+#include "lib/f1ap_interface_management.h"
 
 F1AP_UE_associatedLogicalF1_ConnectionItem_t encode_f1ap_ue_to_reset(const f1ap_ue_to_reset_t *to_reset)
 {

openair2/F1AP/lib/f1ap_lib_extern.h

@@ -1,27 +0,0 @@
-/*
- * 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 F1AP_LIB_EXTERN_H_
-#define F1AP_LIB_EXTERN_H_
-
-#include "f1ap_rrc_message_transfer.h"
-
-#endif /* F1AP_LIB_EXTERN_H_ */

openair2/F1AP/tests/f1ap_lib_test.c

@@ -38,7 +38,7 @@
 #include "f1ap_messages_types.h"
 #include "F1AP_F1AP-PDU.h"
 
-#include "f1ap_lib_extern.h"
+#include "lib/f1ap_rrc_message_transfer.h"
 #include "lib/f1ap_interface_management.h"
 
 void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)

openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c

@@ -31,6 +31,7 @@
 #include "NR_CG-ConfigInfo.h"
 #include "openair3/ocp-gtpu/gtp_itf.h"
 #include "openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
+#include "lib/f1ap_rrc_message_transfer.h"
 #include "lib/f1ap_interface_management.h"
 
 #include "executables/softmodem-common.h"

openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_direct.c

@@ -23,7 +23,7 @@
 #include "intertask_interface.h"
 
 #include "mac_rrc_ul.h"
-#include "f1ap_lib_extern.h"
+#include "lib/f1ap_rrc_message_transfer.h"
 #include "lib/f1ap_interface_management.h"
 
 static void f1_reset_du_initiated_direct(const f1ap_reset_t *reset)

openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c

@@ -29,7 +29,7 @@
 
 #include "mac_rrc_ul.h"
 
-#include "f1ap_lib_extern.h"
+#include "lib/f1ap_rrc_message_transfer.h"
 #include "lib/f1ap_interface_management.h"
 
 static f1ap_net_config_t read_DU_IP_config(const eth_params_t* f1_params, const char *f1u_ip_addr)

openair2/RRC/NR/mac_rrc_dl_f1ap.c

@@ -30,8 +30,8 @@
 #include "intertask_interface.h"
 #include "mac_rrc_dl.h"
 #include "nr_rrc_defs.h"
-#include "openair2/F1AP/lib/f1ap_rrc_message_transfer.h"
-#include "openair2/F1AP/lib/f1ap_interface_management.h"
+#include "lib/f1ap_rrc_message_transfer.h"
+#include "lib/f1ap_interface_management.h"
 
 static void f1_reset_cu_initiated_f1ap(sctp_assoc_t assoc_id, const f1ap_reset_t *reset)
 {

openair2/RRC/NR/rrc_gNB.c

@@ -78,8 +78,8 @@
 #include "oai_asn1.h"
 #include "openair2/F1AP/f1ap_common.h"
 #include "openair2/F1AP/f1ap_ids.h"
-#include "openair2/F1AP/lib/f1ap_lib_extern.h"
-#include "lib/f1ap_interface_management.h"
+#include "openair2/F1AP/lib/f1ap_rrc_message_transfer.h"
+#include "openair2/F1AP/lib/f1ap_interface_management.h"
 #include "rrc_gNB_NGAP.h"
 #include "rrc_gNB_du.h"
 #include "rrc_gNB_mobility.h"