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

Merge branch 'enhancement-rfsim' into ru_rau_enhancement

Browse Source 
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_config.c
	targets/SIMU/USER/oaisim_functions.c
This commit is contained in:
Raymond Knopp
2018-06-10 15:14:09 -07:00
parent 6ecf336ae7 c2ad982b76
commit 45dc7ed608
507 changed files with 38418 additions and 42864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
+10 -11
View File
@@ -26,19 +26,15 @@
*/
//#include <string.h>
#include "defs.h"
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "SCHED/extern.h"
#include "PHY/defs_UE.h"
#include "PHY/phy_extern_ue.h"
#include <math.h>
#ifdef OPENAIR2
#include "LAYER2/MAC/defs.h"
#include "LAYER2/MAC/extern.h"
#include "RRC/LITE/extern.h"
#include "PHY_INTERFACE/extern.h"
#endif
//#define DEBUG_PHY
#include "LAYER2/MAC/mac.h"
#include "RRC/LTE/rrc_extern.h"
#include "PHY_INTERFACE/phy_interface.h"
int* sync_corr_ue0 = NULL;
int* sync_corr_ue1 = NULL;
@@ -480,6 +476,7 @@ int lte_sync_time(int **rxdata, ///rx data in time domain
}
int ru_sync_time_init(RU_t *ru) // LTE_UE_COMMON *common_vars
{
@@ -629,6 +626,7 @@ int lte_sync_time_eNB(int32_t **rxdata, ///rx data in time domain
}
int ru_sync_time(RU_t *ru,
int64_t *lev,
int64_t *avg)
@@ -688,3 +686,4 @@ int ru_sync_time(RU_t *ru,
}