Wang Tsu-Han 6b2e064216 Merge branch 'develop' into ru_rau_enhancement_L1_renaming ...

Conflicts:
	ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c

2019-05-23 18:29:01 +02:00

..

config_NB_IoT.h

reset for remerging

2018-07-30 11:24:08 +02:00

config_ue.c

merge nfapi_cleanup

2019-04-05 18:43:40 +02:00

config.c

merge from develop

2019-04-16 09:13:25 +02:00

defs_NB_IoT.h

full IF4p5 simulation working

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

defs.h

bugfix: fix cqi_req usage in UL scheduler

2019-03-30 15:18:18 +01:00

eNB_scheduler_bch.c

increased size of maximum SI allocation (to mcs 9 with 3 PRBs) Fixes issues with SI message using eMTC information elementswq

2019-04-13 01:12:33 +02:00

eNB_scheduler_dlsch.c

merge from develop

2019-04-16 09:13:25 +02:00

eNB_scheduler_fairRR.c

Merge remote-tracking branch 'origin/fixes-mac-scheduler-2019-w13' into develop_integration_2019_w15

2019-04-15 10:50:38 +02:00

eNB_scheduler_fairRR.h

select scheduler by config file

2018-05-17 18:27:09 +09:00

eNB_scheduler_mch.c

Merge branch 'develop' into feature-127-protocol-split

2019-02-21 20:18:35 +01:00

eNB_scheduler_phytest.c

Merge branch 'develop' into feature-127-protocol-split

2019-02-21 20:18:35 +01:00

eNB_scheduler_primitives.c

Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming

2019-04-28 10:30:56 +02:00

eNB_scheduler_RA.c

Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming

2019-04-28 10:30:56 +02:00

eNB_scheduler_ulsch.c

Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming

2019-04-28 10:30:56 +02:00

eNB_scheduler.c

merge from develop

2019-04-16 09:13:25 +02:00

l1_helpers.c

fix a lot of file mode

2019-01-07 16:22:28 +01:00

mac_extern.h

CI: fix in L2-simulator VM build start script

2019-01-22 21:37:40 +01:00

mac_proto.h

Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming

2019-04-28 10:30:56 +02:00

mac_vars.h

CI: fix in L2-simulator VM build start script

2019-01-22 21:37:40 +01:00

mac.h

merge from develop

2019-04-16 09:13:25 +02:00

main_ue.c

merge nfapi_cleanup

2019-04-05 18:43:40 +02:00

main.c

fix a lot of file mode

2019-01-07 16:22:28 +01:00

pre_processor.c

merge from develop

2019-04-16 09:13:25 +02:00

proto_NB_IoT.h

reset for remerging

2018-07-30 11:24:08 +02:00

ra_procedures.c

merge nfapi_cleanup

2019-04-05 18:43:40 +02:00

rar_tools_ue.c

fix 344

2018-08-23 13:06:17 +02:00

rar_tools.c

some format for eNB_scheduler_RA.c and rar_tools.c + some fix in RAR PDU

2019-02-25 08:16:23 +01:00

ue_procedures.c

Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER

2019-04-29 18:46:55 +02:00