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

2018-06-10 15:14:09 -07:00

..

ASYNC_IF

Merge branch 'feature-68-enb-agent' into feature-merge-f68

2018-01-24 11:47:28 +01:00

BIGPHYS

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

CLI

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

FIFO

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

LFDS

warning fix: remove pragma in LFDS

2017-02-17 18:07:05 +01:00

LISTS

Fix #582, USER_MODE flag removed

2018-01-11 16:50:50 +01:00

LOG

Merge branch 'enhancement-rfsim' into ru_rau_enhancement

2018-06-10 15:14:09 -07:00

MATH

Fix #582, RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed

2018-01-15 18:47:07 +01:00

MEM

fixes after merge with develop

2018-04-24 02:01:48 -07:00

OCG

debugging of new directory structure, file renaming, and eNB/UE splitting. dlsim/ulsim functional.

2018-04-09 15:32:49 -07:00

OMG

Fix #582, NB_ANTENNAS_TXRX removed

2018-01-16 12:35:56 +01:00

OMV

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

OPT

Fix #582, RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed

2018-01-15 18:47:07 +01:00

OSA

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

OSD

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

OTG

full IF4p5 simulation working

2018-04-29 09:35:23 -07:00

TIMER

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

TRACE

Fix #582, USER_MODE flag removed

2018-01-11 16:50:50 +01:00

Makefile.inc

* update the Openair mobility generator, add steadystatefor RWP, trace-driven mobility, two grid-based mobility models (restricted RWP, and connected domains)

2014-07-22 11:25:09 +00:00