Raymond Knopp bc9c587b48 Merge remote-tracking branch 'origin/develop' into RU-RAU-split ...

Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/defs.h
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/defs.h
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair1/SCHED/pusch_pc.c
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/MAC/ue_procedures.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim_functions.c

2017-09-26 21:43:03 -07:00

..

ASYNC_IF

Fixed FlexRAN-related warnings

2017-01-16 17:45:58 +02:00

BIGPHYS

remove COPYING files

2016-09-28 10:45:02 +02:00

CLI

remove COPYING files

2016-09-28 10:45:02 +02:00

FIFO

remove COPYING files

2016-09-28 10:45:02 +02:00

LFDS

warning fix: remove pragma in LFDS

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

LISTS

RLC AM fix specific reassembly issue

2017-03-28 18:08:00 +02:00

LOG

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

2017-09-26 21:43:03 -07:00

MATH

remove COPYING files

2016-09-28 10:45:02 +02:00

MEM

Note: this commit is work in progress. Contains initial integration of NFAPI data structures which are tested for TX path. RX path to follow.

2017-07-06 08:18:32 -07:00

OCG

initial testing version of L1L-L1H split (RRU-RAU)

2017-04-17 10:40:23 -07:00

OMG

fix LOG_X macros

2017-01-11 15:48:00 +01:00

OMV

openairinterface5g: Fix multi definition of UE/eNB NB_MAX

2017-01-25 13:58:53 +01:00

OPT

fix LOG_X macros

2017-01-11 15:48:00 +01:00

OSA

Revert "fix nettle"

2017-02-17 12:29:31 +01:00

OSD

update licensing information in remaining files

2016-09-28 11:17:33 +02:00

OTG

bug fixes from Fujitsu (bug 21)

2017-05-12 11:16:14 +02:00

TIMER

add more logs to debug memory leak problem

2016-12-21 17:20:14 +08:00

TRACE

remove COPYING files

2016-09-28 10:45:02 +02: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