From bfbebe2de1170bb0ad46e1d5751126901dc65e15 Mon Sep 17 00:00:00 2001 From: Anurag Asokan Date: Mon, 17 Oct 2022 15:58:17 +0200 Subject: [PATCH] Merge targets/COMMON to executables --- CMakeLists.txt | 10 +++++----- {targets/COMMON => common}/openairinterface5g_limits.h | 0 {targets/COMMON => executables}/create_nr_tasks.h | 0 {targets/COMMON => executables}/create_tasks.c | 0 {targets/COMMON => executables}/create_tasks.h | 0 {targets/COMMON => executables}/create_tasks_mbms.c | 0 {targets/COMMON => executables}/create_tasks_ue.c | 0 openair1/PHY/TOOLS/nr_phy_scope.h | 2 +- openair1/PHY/defs_L1_NB_IoT.h | 2 +- openair1/PHY/defs_RU.h | 2 +- openair1/PHY/defs_common.h | 2 +- openair1/PHY/defs_eNB.h | 2 +- openair1/PHY/impl_defs_top.h | 2 +- openair1/PHY/impl_defs_top_NB_IoT.h | 4 ++-- openair1/SIMULATION/ETH_TRANSPORT/defs.h | 2 +- openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c | 2 +- openair2/E1AP/e1ap.h | 2 +- openair2/F1AP/f1ap_common.h | 2 +- openair2/LAYER2/PDCP_v10.1.0/pdcp.c | 2 +- openair2/LAYER2/RLC/rlc.c | 2 +- openair2/NETWORK_DRIVER/UE_IP/constant.h | 2 +- openair2/PHY_INTERFACE/UE_MAC_interface.h | 2 +- openair2/RRC/LTE/defs_NB_IoT.h | 2 +- openair2/UTIL/OMV/structures.h | 2 +- openair2/UTIL/OTG/otg_defs.h | 2 +- openair3/NAS/UE/nas_ue_task.h | 2 +- targets/COMMON/Makefile.inc | 6 ------ 27 files changed, 25 insertions(+), 31 deletions(-) rename {targets/COMMON => common}/openairinterface5g_limits.h (100%) rename {targets/COMMON => executables}/create_nr_tasks.h (100%) rename {targets/COMMON => executables}/create_tasks.c (100%) rename {targets/COMMON => executables}/create_tasks.h (100%) rename {targets/COMMON => executables}/create_tasks_mbms.c (100%) rename {targets/COMMON => executables}/create_tasks_ue.c (100%) delete mode 100644 targets/COMMON/Makefile.inc diff --git a/CMakeLists.txt b/CMakeLists.txt index 95667e42e9..41e923f5b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2633,8 +2633,8 @@ add_executable(lte-softmodem ${OPENAIR_DIR}/executables/softmodem-common.c ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c - ${OPENAIR_TARGETS}/COMMON/create_tasks.c - ${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c + ${OPENAIR_DIR}/executables/create_tasks.c + ${OPENAIR_DIR}/executables/create_tasks_mbms.c ${OPENAIR_DIR}/sdr/COMMON/common_lib.c ${OPENAIR_DIR}/sdr/COMMON/record_player.c ${OPENAIR2_DIR}/RRC/NAS/nas_config.c @@ -2673,8 +2673,8 @@ add_executable(ocp-enb ${OPENAIR_DIR}/executables/transport_split.c ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c - ${OPENAIR_TARGETS}/COMMON/create_tasks.c - ${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c + ${OPENAIR_DIR}/executables/create_tasks.c + ${OPENAIR_DIR}/executables/create_tasks_mbms.c ${OPENAIR_DIR}/sdr/COMMON/common_lib.c ${OPENAIR_DIR}/sdr/COMMON/record_player.c ${OPENAIR2_DIR}/RRC/NAS/nas_config.c @@ -2729,7 +2729,7 @@ add_executable(lte-uesoftmodem ${OPENAIR_TARGETS}/RT/USER/lte-ue.c ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c ${OPENAIR_DIR}/executables/softmodem-common.c - ${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c + ${OPENAIR_DIR}/executables/create_tasks_ue.c ${OPENAIR_DIR}/sdr/COMMON/common_lib.c ${OPENAIR_DIR}/sdr/COMMON/record_player.c ${OPENAIR2_DIR}/RRC/NAS/nas_config.c diff --git a/targets/COMMON/openairinterface5g_limits.h b/common/openairinterface5g_limits.h similarity index 100% rename from targets/COMMON/openairinterface5g_limits.h rename to common/openairinterface5g_limits.h diff --git a/targets/COMMON/create_nr_tasks.h b/executables/create_nr_tasks.h similarity index 100% rename from targets/COMMON/create_nr_tasks.h rename to executables/create_nr_tasks.h diff --git a/targets/COMMON/create_tasks.c b/executables/create_tasks.c similarity index 100% rename from targets/COMMON/create_tasks.c rename to executables/create_tasks.c diff --git a/targets/COMMON/create_tasks.h b/executables/create_tasks.h similarity index 100% rename from targets/COMMON/create_tasks.h rename to executables/create_tasks.h diff --git a/targets/COMMON/create_tasks_mbms.c b/executables/create_tasks_mbms.c similarity index 100% rename from targets/COMMON/create_tasks_mbms.c rename to executables/create_tasks_mbms.c diff --git a/targets/COMMON/create_tasks_ue.c b/executables/create_tasks_ue.c similarity index 100% rename from targets/COMMON/create_tasks_ue.c rename to executables/create_tasks_ue.c diff --git a/openair1/PHY/TOOLS/nr_phy_scope.h b/openair1/PHY/TOOLS/nr_phy_scope.h index e34ddf2c20..435c81c429 100644 --- a/openair1/PHY/TOOLS/nr_phy_scope.h +++ b/openair1/PHY/TOOLS/nr_phy_scope.h @@ -25,7 +25,7 @@ #define FD_nr_scope_h_ #include #include -#include +#include #include "common/ran_context.h" #include #include "PHY/defs_gNB.h" diff --git a/openair1/PHY/defs_L1_NB_IoT.h b/openair1/PHY/defs_L1_NB_IoT.h index cdf696d2a6..56618be942 100644 --- a/openair1/PHY/defs_L1_NB_IoT.h +++ b/openair1/PHY/defs_L1_NB_IoT.h @@ -129,7 +129,7 @@ static inline void* malloc16_clear( size_t size ) #include #include "sdr/COMMON/common_lib.h" -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #define NUM_DCI_MAX_NB_IoT 32 diff --git a/openair1/PHY/defs_RU.h b/openair1/PHY/defs_RU.h index 627ad7d27f..0ee7562346 100644 --- a/openair1/PHY/defs_RU.h +++ b/openair1/PHY/defs_RU.h @@ -35,7 +35,7 @@ #include "common_lib.h" -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "time_meas.h" #include "defs_common.h" #include "nfapi_nr_interface_scf.h" diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h index 13306d07d6..6336c7e5ef 100644 --- a/openair1/PHY/defs_common.h +++ b/openair1/PHY/defs_common.h @@ -66,7 +66,7 @@ #include "TOOLS/tools_defs.h" -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "common/utils/LOG/log.h" #include "types.h" diff --git a/openair1/PHY/defs_eNB.h b/openair1/PHY/defs_eNB.h index b7d9cd4473..a168652d1a 100644 --- a/openair1/PHY/defs_eNB.h +++ b/openair1/PHY/defs_eNB.h @@ -65,7 +65,7 @@ #include "PHY/LTE_TRANSPORT/transport_common.h" #include "PHY/LTE_TRANSPORT/transport_eNB.h" #include "openair2/PHY_INTERFACE/IF_Module.h" -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #define PBCH_A 24 diff --git a/openair1/PHY/impl_defs_top.h b/openair1/PHY/impl_defs_top.h index c28a5b4f7e..35a965567f 100644 --- a/openair1/PHY/impl_defs_top.h +++ b/openair1/PHY/impl_defs_top.h @@ -305,7 +305,7 @@ typedef struct { #define NUMBER_OF_HARQ_PID_MAX 8 #define MAX_FRAME_NUMBER 0x400 -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "assertions.h" #endif //__PHY_IMPLEMENTATION_DEFS_H__ diff --git a/openair1/PHY/impl_defs_top_NB_IoT.h b/openair1/PHY/impl_defs_top_NB_IoT.h index bfabb59c12..5966d04fc4 100644 --- a/openair1/PHY/impl_defs_top_NB_IoT.h +++ b/openair1/PHY/impl_defs_top_NB_IoT.h @@ -34,7 +34,7 @@ #define __PHY_IMPLEMENTATION_DEFS_NB_IOT_H__ -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" /** @defgroup _ref_implementation_ OpenAirInterface LTE Implementation * @{ @@ -281,7 +281,7 @@ typedef enum { #define NUMBER_OF_HARQ_PID_MAX 8 #define MAX_FRAME_NUMBER 0x400 -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #define NUMBER_OF_RN_MAX 3 typedef enum {no_relay=1,unicast_relay_type1,unicast_relay_type2, multicast_relay} relaying_type_t; diff --git a/openair1/SIMULATION/ETH_TRANSPORT/defs.h b/openair1/SIMULATION/ETH_TRANSPORT/defs.h index a7b2351b90..5c4e5ad365 100644 --- a/openair1/SIMULATION/ETH_TRANSPORT/defs.h +++ b/openair1/SIMULATION/ETH_TRANSPORT/defs.h @@ -32,7 +32,7 @@ # define __BYPASS_SESSION_LAYER_DEFS_H__ //----------------------------------------------------------------------------- //#include "openair_defs.h" -#include "targets/COMMON/openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "PHY/defs_common.h" #include "PHY/LTE_TRANSPORT/uci_common.h" diff --git a/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c b/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c index 5337447678..988052ca82 100644 --- a/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c +++ b/openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c @@ -44,7 +44,7 @@ #include #include #include -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "pdcp.h" diff --git a/openair2/E1AP/e1ap.h b/openair2/E1AP/e1ap.h index c7b2c24e8b..ef22152648 100644 --- a/openair2/E1AP/e1ap.h +++ b/openair2/E1AP/e1ap.h @@ -25,7 +25,7 @@ #define __E1AP_H_ #include -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include #include diff --git a/openair2/F1AP/f1ap_common.h b/openair2/F1AP/f1ap_common.h index e89e8a70cc..b322c4b3aa 100644 --- a/openair2/F1AP/f1ap_common.h +++ b/openair2/F1AP/f1ap_common.h @@ -32,7 +32,7 @@ #ifndef F1AP_COMMON_H_ #define F1AP_COMMON_H_ -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include #define F1AP_UE_IDENTIFIER_NUMBER 3 diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c index 14a16f572b..2699a07c04 100644 --- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c +++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c @@ -49,7 +49,7 @@ #include "nfapi/oai_integration/vendor_ext.h" #include "common/utils/LOG/vcd_signal_dumper.h" #include "common/ngran_types.h" -#include "targets/COMMON/openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "targets/RT/USER/lte-softmodem.h" #include "SIMULATION/ETH_TRANSPORT/proto.h" #include "UTIL/OSA/osa_defs.h" diff --git a/openair2/LAYER2/RLC/rlc.c b/openair2/LAYER2/RLC/rlc.c index 1e2266adb1..b18b67198f 100644 --- a/openair2/LAYER2/RLC/rlc.c +++ b/openair2/LAYER2/RLC/rlc.c @@ -34,7 +34,7 @@ #include "common/utils/LOG/log.h" #include "UTIL/OCG/OCG_vars.h" #include "common/utils/LOG/vcd_signal_dumper.h" -#include "targets/COMMON/openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "assertions.h" #include diff --git a/openair2/NETWORK_DRIVER/UE_IP/constant.h b/openair2/NETWORK_DRIVER/UE_IP/constant.h index ccd992dd4e..9df54d74d5 100644 --- a/openair2/NETWORK_DRIVER/UE_IP/constant.h +++ b/openair2/NETWORK_DRIVER/UE_IP/constant.h @@ -19,7 +19,7 @@ * contact@openairinterface.org */ -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #ifndef _UE_IP_CST #define _UE_IP_CST diff --git a/openair2/PHY_INTERFACE/UE_MAC_interface.h b/openair2/PHY_INTERFACE/UE_MAC_interface.h index 207c3293b4..e7a833adfa 100644 --- a/openair2/PHY_INTERFACE/UE_MAC_interface.h +++ b/openair2/PHY_INTERFACE/UE_MAC_interface.h @@ -38,7 +38,7 @@ #include "nfapi_interface.h" #include "openair1/PHY/defs_RU.h" -#include "targets/COMMON/openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #define MAX_NUM_DL_PDU 100 #define MAX_NUM_UL_PDU 100 diff --git a/openair2/RRC/LTE/defs_NB_IoT.h b/openair2/RRC/LTE/defs_NB_IoT.h index 17ef77ff17..8f19d62cea 100644 --- a/openair2/RRC/LTE/defs_NB_IoT.h +++ b/openair2/RRC/LTE/defs_NB_IoT.h @@ -42,7 +42,7 @@ #include "rrc_types_NB_IoT.h" #include "COMMON/platform_constants.h" #include "COMMON/platform_types.h" -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "COMMON/mac_rrc_primitives.h" diff --git a/openair2/UTIL/OMV/structures.h b/openair2/UTIL/OMV/structures.h index 5c48641f86..5d3377b3de 100644 --- a/openair2/UTIL/OMV/structures.h +++ b/openair2/UTIL/OMV/structures.h @@ -31,7 +31,7 @@ #ifndef STRUCTURES_H #define STRUCTURES_H -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #ifndef __PHY_IMPLEMENTATION_DEFS_H__ #define Maxneighbor NUMBER_OF_UE_MAX #ifndef NB_ANTENNAS_RX diff --git a/openair2/UTIL/OTG/otg_defs.h b/openair2/UTIL/OTG/otg_defs.h index af0260587f..e1107f824d 100644 --- a/openair2/UTIL/OTG/otg_defs.h +++ b/openair2/UTIL/OTG/otg_defs.h @@ -34,7 +34,7 @@ # define __OTG_DEFS_H__ /* \brief To define the NUMBER_OF_eNB_MAX and MAX_MOBILES_PER_ENB */ -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include #include "otg_config.h" diff --git a/openair3/NAS/UE/nas_ue_task.h b/openair3/NAS/UE/nas_ue_task.h index 5615f366b7..a114757771 100644 --- a/openair3/NAS/UE/nas_ue_task.h +++ b/openair3/NAS/UE/nas_ue_task.h @@ -22,7 +22,7 @@ #ifndef NAS_UE_TASK_H_ #define NAS_UE_TASK_H_ -#include "openairinterface5g_limits.h" +#include "common/openairinterface5g_limits.h" #include "user_defs.h" // XXX simple array container for multiple users diff --git a/targets/COMMON/Makefile.inc b/targets/COMMON/Makefile.inc deleted file mode 100644 index 9902574fce..0000000000 --- a/targets/COMMON/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -TARGETS_COMMON_DIR = $(OPENAIR_TARGETS)/COMMON - -TARGETS_COMMON_OBJS = $(TARGETS_COMMON_DIR)/create_tasks.o - -TARGETS_COMMON_incl = \ - -I$(TARGETS_COMMON_DIR)