RC: forward declarations and link physims better
The simulators have been changed: due to linker errors that would arise otherwise, a lot of functions are defined in them to avoid such errors. Some functions are also defined in header files; in this commit, we define most functoins in nr_dummy_functions.c, which is compiled in, not by including the C file, but by adding it to the target in CMakeLists.txt - nr_dlsim+nr_ulsim need NR_IF_Module_init(), so it cannot be in nr_dummy_functions, but the others need it - Link correcr NR_IF_Module_init() into these simulators, and reduce overall link list - Correctly link remaining simulators
This commit is contained in:
@@ -77,6 +77,7 @@ unsigned short config_frames[4] = {2,9,11,13};
|
||||
|
||||
#include "create_tasks.h"
|
||||
|
||||
#include "pdcp.h"
|
||||
|
||||
#include "PHY/INIT/phy_init.h"
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#include "assertions.h"
|
||||
|
||||
#include "PHY/types.h"
|
||||
#include "pdcp.h"
|
||||
|
||||
#include "PHY/defs_UE.h"
|
||||
#include "common/ran_context.h"
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "nfapi/oai_integration/vendor_ext.h"
|
||||
#include "openair2/F1AP/f1ap_common.h"
|
||||
#include "openair2/GNB_APP/gnb_config.h"
|
||||
#include "pdcp.h"
|
||||
|
||||
RAN_CONTEXT_t RC;
|
||||
THREAD_STRUCT thread_struct;
|
||||
@@ -36,7 +37,6 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
|
||||
int asn1_xer_print;
|
||||
int oai_exit = 0;
|
||||
instance_t CUuniqInstance = 0;
|
||||
RRC_release_list_t rrc_release_info;
|
||||
|
||||
void exit_function(const char *file, const char *function, const int line, const char *s)
|
||||
{
|
||||
|
||||
@@ -59,6 +59,7 @@ unsigned short config_frames[4] = {2,9,11,13};
|
||||
#include "common/utils/LOG/log.h"
|
||||
#include "common/utils/LOG/vcd_signal_dumper.h"
|
||||
#include "UTIL/OPT/opt.h"
|
||||
#include "pdcp.h"
|
||||
|
||||
#include "intertask_interface.h"
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "executables/softmodem-common.h"
|
||||
#include "PHY/NR_REFSIG/refsig_defs_ue.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "pdcp.h"
|
||||
|
||||
/*
|
||||
* NR SLOT PROCESSING SEQUENCE
|
||||
|
||||
@@ -59,6 +59,7 @@ unsigned short config_frames[4] = {2,9,11,13};
|
||||
|
||||
#include "UTIL/OPT/opt.h"
|
||||
#include "enb_config.h"
|
||||
#include "pdcp.h"
|
||||
|
||||
#include "intertask_interface.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user