Raymond Knopp
45dc7ed608
Merge branch 'enhancement-rfsim' into ru_rau_enhancement
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