Raymond Knopp b2cc1252c6 Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge ...

Conflicts:
	cmake_targets/build_oai
	common/utils/itti/intertask_interface.c
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/defs.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	targets/ARCH/COMMON/common_lib.c
	targets/COMMON/create_tasks.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h

2018-03-12 12:10:48 +01:00

..

config_NB_IoT.h

more NB-IoT integration

2018-03-08 17:35:35 +01:00

config_ue.c

fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.

2018-01-21 22:15:45 +01:00

config.c

Merge remote-tracking branch 'origin/develop' into dlsim-ulsim-fix

2018-02-18 01:39:36 -08:00

defs_NB_IoT.h

integration fix: fix file format (dos2unix)

2018-03-09 16:43:08 +01:00

defs.h

Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge

2018-03-12 12:10:48 +01:00

eNB_scheduler_bch.c

Merge remote-tracking branch 'origin/fix-rrc-rel10-compilation-2018-w06' into develop_integration_2018_w06

2018-02-07 15:12:08 +01:00

eNB_scheduler_dlsch.c

cleanup MAC PDU generation (plus some general cleanup)

2018-03-08 10:04:18 +01:00

eNB_scheduler_mch.c

fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.

2018-01-21 22:15:45 +01:00

eNB_scheduler_phytest.c

Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge

2018-03-12 12:10:48 +01:00

eNB_scheduler_primitives.c

rename flexran_slice_member() -> ue_slice_membership()

2018-02-12 13:50:48 +01:00

eNB_scheduler_RA.c

Merge remote-tracking branch 'origin/fix-rrc-rel10-compilation-2018-w06' into develop_integration_2018_w06

2018-02-07 15:12:08 +01:00

eNB_scheduler_ulsch.c

additional Mac stats and Improvements

2018-02-20 15:09:24 +01:00

eNB_scheduler.c

Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge

2018-03-12 12:10:48 +01:00

extern.h

Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04

2018-01-22 17:47:01 +01:00

l1_helpers.c

changing of notation for Random-Access procedure to match documentation. Function remains the same. Indentation (-kr) run on all files in LAYER2/MAC

2017-11-04 09:55:11 -07:00

lte_transport_init.c

changing of notation for Random-Access procedure to match documentation. Function remains the same. Indentation (-kr) run on all files in LAYER2/MAC

2017-11-04 09:55:11 -07:00

main_ue.c

fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.

2018-01-21 22:15:45 +01:00

main.c

Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes

2018-01-25 00:00:24 -08:00

pre_processor.c

remove compilation warnings

2018-02-22 15:03:45 +01:00

proto_NB_IoT.h

integration fix: fix license version to 1.1

2018-03-09 16:40:09 +01:00

proto.h

Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge

2018-03-12 12:10:48 +01:00

ra_procedures.c

fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.

2018-01-21 22:15:45 +01:00

rar_tools_ue.c

fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.

2018-01-21 22:15:45 +01:00

rar_tools.c

fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.

2018-01-21 22:15:45 +01:00

ue_procedures.c

Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes

2018-01-25 00:00:24 -08:00

vars.h

Fix #582, USER_MODE flag removed

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