maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge targets/COMMON to executables

Browse Source
This commit is contained in:
Anurag Asokan
2022-10-18 14:22:06 +02:00
committed by Robert Schmidt
parent 3bc86d69c0
commit bfbebe2de1
27 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+5 -5
View File
@@ -2633,8 +2633,8 @@ add_executable(lte-softmodem
${OPENAIR_DIR}/executables/softmodem-common.c ${OPENAIR_DIR}/executables/softmodem-common.c
${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
${OPENAIR_TARGETS}/COMMON/create_tasks.c ${OPENAIR_DIR}/executables/create_tasks.c
${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c ${OPENAIR_DIR}/executables/create_tasks_mbms.c
${OPENAIR_DIR}/sdr/COMMON/common_lib.c ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
${OPENAIR_DIR}/sdr/COMMON/record_player.c ${OPENAIR_DIR}/sdr/COMMON/record_player.c
${OPENAIR2_DIR}/RRC/NAS/nas_config.c ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
@@ -2673,8 +2673,8 @@ add_executable(ocp-enb
${OPENAIR_DIR}/executables/transport_split.c ${OPENAIR_DIR}/executables/transport_split.c
${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c ${OPENAIR2_DIR}/ENB_APP/NB_IoT_interface.c
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
${OPENAIR_TARGETS}/COMMON/create_tasks.c ${OPENAIR_DIR}/executables/create_tasks.c
${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c ${OPENAIR_DIR}/executables/create_tasks_mbms.c
${OPENAIR_DIR}/sdr/COMMON/common_lib.c ${OPENAIR_DIR}/sdr/COMMON/common_lib.c
${OPENAIR_DIR}/sdr/COMMON/record_player.c ${OPENAIR_DIR}/sdr/COMMON/record_player.c
${OPENAIR2_DIR}/RRC/NAS/nas_config.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-ue.c
${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c ${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
${OPENAIR_DIR}/executables/softmodem-common.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/common_lib.c
${OPENAIR_DIR}/sdr/COMMON/record_player.c ${OPENAIR_DIR}/sdr/COMMON/record_player.c
${OPENAIR2_DIR}/RRC/NAS/nas_config.c ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
targets/COMMON/openairinterface5g_limits.h → common/openairinterface5g_limits.h
View File
targets/COMMON/create_nr_tasks.h → executables/create_nr_tasks.h
View File
targets/COMMON/create_tasks.c → executables/create_tasks.c
View File
targets/COMMON/create_tasks.h → executables/create_tasks.h
View File
targets/COMMON/create_tasks_mbms.c → executables/create_tasks_mbms.c
View File
targets/COMMON/create_tasks_ue.c → executables/create_tasks_ue.c
View File
openair1/PHY/TOOLS/nr_phy_scope.h
+1 -1
View File
@@ -25,7 +25,7 @@
#define FD_nr_scope_h_ #define FD_nr_scope_h_
#include <simple_executable.h> #include <simple_executable.h>
#include <common/utils/system.h> #include <common/utils/system.h>
#include <openairinterface5g_limits.h> #include <common/openairinterface5g_limits.h>
#include "common/ran_context.h" #include "common/ran_context.h"
#include <openair1/PHY/defs_gNB.h> #include <openair1/PHY/defs_gNB.h>
#include "PHY/defs_gNB.h" #include "PHY/defs_gNB.h"
openair1/PHY/defs_L1_NB_IoT.h
+1 -1
View File
@@ -129,7 +129,7 @@ static inline void* malloc16_clear( size_t size )
#include <pthread.h> #include <pthread.h>
#include "sdr/COMMON/common_lib.h" #include "sdr/COMMON/common_lib.h"
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#define NUM_DCI_MAX_NB_IoT 32 #define NUM_DCI_MAX_NB_IoT 32
openair1/PHY/defs_RU.h
+1 -1
View File
@@ -35,7 +35,7 @@
#include "common_lib.h" #include "common_lib.h"
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include "time_meas.h" #include "time_meas.h"
#include "defs_common.h" #include "defs_common.h"
#include "nfapi_nr_interface_scf.h" #include "nfapi_nr_interface_scf.h"
openair1/PHY/defs_common.h
+1 -1
View File
@@ -66,7 +66,7 @@
#include "TOOLS/tools_defs.h" #include "TOOLS/tools_defs.h"
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include "common/utils/LOG/log.h" #include "common/utils/LOG/log.h"
#include "types.h" #include "types.h"
openair1/PHY/defs_eNB.h
+1 -1
View File
@@ -65,7 +65,7 @@
#include "PHY/LTE_TRANSPORT/transport_common.h" #include "PHY/LTE_TRANSPORT/transport_common.h"
#include "PHY/LTE_TRANSPORT/transport_eNB.h" #include "PHY/LTE_TRANSPORT/transport_eNB.h"
#include "openair2/PHY_INTERFACE/IF_Module.h" #include "openair2/PHY_INTERFACE/IF_Module.h"
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#define PBCH_A 24 #define PBCH_A 24
openair1/PHY/impl_defs_top.h
+1 -1
View File
@@ -305,7 +305,7 @@ typedef struct {
#define NUMBER_OF_HARQ_PID_MAX 8 #define NUMBER_OF_HARQ_PID_MAX 8
#define MAX_FRAME_NUMBER 0x400 #define MAX_FRAME_NUMBER 0x400
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include "assertions.h" #include "assertions.h"
#endif //__PHY_IMPLEMENTATION_DEFS_H__ #endif //__PHY_IMPLEMENTATION_DEFS_H__
openair1/PHY/impl_defs_top_NB_IoT.h
+2 -2
View File
@@ -34,7 +34,7 @@
#define __PHY_IMPLEMENTATION_DEFS_NB_IOT_H__ #define __PHY_IMPLEMENTATION_DEFS_NB_IOT_H__
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
/** @defgroup _ref_implementation_ OpenAirInterface LTE Implementation /** @defgroup _ref_implementation_ OpenAirInterface LTE Implementation
* @{ * @{
@@ -281,7 +281,7 @@ typedef enum {
#define NUMBER_OF_HARQ_PID_MAX 8 #define NUMBER_OF_HARQ_PID_MAX 8
#define MAX_FRAME_NUMBER 0x400 #define MAX_FRAME_NUMBER 0x400
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#define NUMBER_OF_RN_MAX 3 #define NUMBER_OF_RN_MAX 3
typedef enum {no_relay=1,unicast_relay_type1,unicast_relay_type2, multicast_relay} relaying_type_t; typedef enum {no_relay=1,unicast_relay_type1,unicast_relay_type2, multicast_relay} relaying_type_t;
openair1/SIMULATION/ETH_TRANSPORT/defs.h
+1 -1
View File
@@ -32,7 +32,7 @@
# define __BYPASS_SESSION_LAYER_DEFS_H__ # define __BYPASS_SESSION_LAYER_DEFS_H__
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//#include "openair_defs.h" //#include "openair_defs.h"
#include "targets/COMMON/openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include "PHY/defs_common.h" #include "PHY/defs_common.h"
#include "PHY/LTE_TRANSPORT/uci_common.h" #include "PHY/LTE_TRANSPORT/uci_common.h"
openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c
+1 -1
View File
@@ -44,7 +44,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <linux/if.h> #include <linux/if.h>
#include <linux/if_tun.h> #include <linux/if_tun.h>
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include "pdcp.h" #include "pdcp.h"
openair2/E1AP/e1ap.h
+1 -1
View File
@@ -25,7 +25,7 @@
#define __E1AP_H_ #define __E1AP_H_
#include <common/utils/LOG/log.h> #include <common/utils/LOG/log.h>
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include <openair2/RRC/NR/MESSAGES/asn1_msg.h> #include <openair2/RRC/NR/MESSAGES/asn1_msg.h>
#include <E1AP_Cause.h> #include <E1AP_Cause.h>
openair2/F1AP/f1ap_common.h
+1 -1
View File
@@ -32,7 +32,7 @@
#ifndef F1AP_COMMON_H_ #ifndef F1AP_COMMON_H_
#define F1AP_COMMON_H_ #define F1AP_COMMON_H_
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include <openair2/RRC/NR/MESSAGES/asn1_msg.h> #include <openair2/RRC/NR/MESSAGES/asn1_msg.h>
#define F1AP_UE_IDENTIFIER_NUMBER 3 #define F1AP_UE_IDENTIFIER_NUMBER 3
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+1 -1
View File
@@ -49,7 +49,7 @@
#include "nfapi/oai_integration/vendor_ext.h" #include "nfapi/oai_integration/vendor_ext.h"
#include "common/utils/LOG/vcd_signal_dumper.h" #include "common/utils/LOG/vcd_signal_dumper.h"
#include "common/ngran_types.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 "targets/RT/USER/lte-softmodem.h"
#include "SIMULATION/ETH_TRANSPORT/proto.h" #include "SIMULATION/ETH_TRANSPORT/proto.h"
#include "UTIL/OSA/osa_defs.h" #include "UTIL/OSA/osa_defs.h"
openair2/LAYER2/RLC/rlc.c
+1 -1
View File
@@ -34,7 +34,7 @@
#include "common/utils/LOG/log.h" #include "common/utils/LOG/log.h"
#include "UTIL/OCG/OCG_vars.h" #include "UTIL/OCG/OCG_vars.h"
#include "common/utils/LOG/vcd_signal_dumper.h" #include "common/utils/LOG/vcd_signal_dumper.h"
#include "targets/COMMON/openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include "assertions.h" #include "assertions.h"
#include <rlc.h> #include <rlc.h>
openair2/NETWORK_DRIVER/UE_IP/constant.h
+1 -1
View File
@@ -19,7 +19,7 @@
* contact@openairinterface.org * contact@openairinterface.org
*/ */
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#ifndef _UE_IP_CST #ifndef _UE_IP_CST
#define _UE_IP_CST #define _UE_IP_CST
openair2/PHY_INTERFACE/UE_MAC_interface.h
+1 -1
View File
@@ -38,7 +38,7 @@
#include "nfapi_interface.h" #include "nfapi_interface.h"
#include "openair1/PHY/defs_RU.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_DL_PDU 100
#define MAX_NUM_UL_PDU 100 #define MAX_NUM_UL_PDU 100
openair2/RRC/LTE/defs_NB_IoT.h
+1 -1
View File
@@ -42,7 +42,7 @@
#include "rrc_types_NB_IoT.h" #include "rrc_types_NB_IoT.h"
#include "COMMON/platform_constants.h" #include "COMMON/platform_constants.h"
#include "COMMON/platform_types.h" #include "COMMON/platform_types.h"
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include "COMMON/mac_rrc_primitives.h" #include "COMMON/mac_rrc_primitives.h"
openair2/UTIL/OMV/structures.h
+1 -1
View File
@@ -31,7 +31,7 @@
#ifndef STRUCTURES_H #ifndef STRUCTURES_H
#define STRUCTURES_H #define STRUCTURES_H
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#ifndef __PHY_IMPLEMENTATION_DEFS_H__ #ifndef __PHY_IMPLEMENTATION_DEFS_H__
#define Maxneighbor NUMBER_OF_UE_MAX #define Maxneighbor NUMBER_OF_UE_MAX
#ifndef NB_ANTENNAS_RX #ifndef NB_ANTENNAS_RX
openair2/UTIL/OTG/otg_defs.h
+1 -1
View File
@@ -34,7 +34,7 @@
# define __OTG_DEFS_H__ # define __OTG_DEFS_H__
/* \brief To define the NUMBER_OF_eNB_MAX and MAX_MOBILES_PER_ENB */ /* \brief To define the NUMBER_OF_eNB_MAX and MAX_MOBILES_PER_ENB */
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include <openair2/COMMON/platform_constants.h> #include <openair2/COMMON/platform_constants.h>
#include "otg_config.h" #include "otg_config.h"
openair3/NAS/UE/nas_ue_task.h
+1 -1
View File
@@ -22,7 +22,7 @@
#ifndef NAS_UE_TASK_H_ #ifndef NAS_UE_TASK_H_
#define NAS_UE_TASK_H_ #define NAS_UE_TASK_H_
#include "openairinterface5g_limits.h" #include "common/openairinterface5g_limits.h"
#include "user_defs.h" #include "user_defs.h"
// XXX simple array container for multiple users // XXX simple array container for multiple users
targets/COMMON/Makefile.inc
-6
View File
@@ -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)