Raymond Knopp a446eb0ebc Merge branch 'episys/master' into episys-merge ...

Conflicts:
	common/utils/LOG/log.h
	common/utils/ocp_itti/intertask_interface.cpp
	nfapi/oai_integration/nfapi_vnf.c
	nfapi/open-nFAPI/nfapi/src/nfapi.c
	openair2/LAYER2/MAC/main_ue.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/PHY_INTERFACE/phy_stub_UE.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c

2021-02-13 22:52:33 +01:00

..

slicing

Do not schedule static slices if 0 RB(G)s

2020-10-13 08:49:29 +02:00

config_NB_IoT.h

Fixing errored/missing circular dependency protection

2020-05-15 15:39:11 +02:00

config_ue.c

Merge branch 'episys/master' into episys-merge

2021-02-13 22:52:33 +01:00

config.c

Merge branch 'episys/master' into episys-merge

2021-02-13 22:52:33 +01:00

defs_NB_IoT.h

*L2 procedures to enable mixed unicast/broadcast operation at ENB implemeted:

2019-09-14 13:23:30 +02:00

eNB_scheduler_bch.c

fembms: new FeMBMS/eMBMS MCH eNB/UE scheduler implemented

2020-07-21 18:16:46 +02:00

eNB_scheduler_dlsch.c

Fix ul_cqi and tpc filtering.

2020-11-27 12:37:09 +09:00

eNB_scheduler_fairRR.c

Merge branch fujitsu_lte_contribution into lte_uplink_improvement

2020-11-30 18:56:26 +09:00

eNB_scheduler_fairRR.h

Simplify preprocessor, retain functionality

2020-04-01 08:49:26 +02:00

eNB_scheduler_mch.c

fixing compile warnings

2020-10-02 14:30:42 +02:00

eNB_scheduler_phytest.c

Fix: SNR feedback to PUSCH TPC and PUCCH TPC of default scheduler.

2020-11-30 10:55:19 +09:00

eNB_scheduler_primitives.c

Cleanup before merge

2021-01-08 14:31:13 -08:00

eNB_scheduler_RA.c

Merge branch 'episys/master' into episys-merge

2021-02-13 22:52:33 +01:00

eNB_scheduler_ulsch.c

Cleanup before merge

2021-01-08 14:31:13 -08:00

eNB_scheduler.c

Merge branch 'episys/master' into episys-merge

2021-02-13 22:52:33 +01:00

l1_helpers.c

fix a lot of file mode

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

mac_extern.h

cleanup branch

2020-05-20 15:44:20 +02:00

mac_proto.h

Merge remote-tracking branch 'origin/develop' into fembms-enb-ue

2020-07-29 10:54:38 +02:00

mac_vars.h

final minor changes before the merge

2019-10-08 18:32:02 +02:00

mac.h

Merge branch fujitsu_lte_contribution into lte_uplink_improvement

2020-11-30 18:56:26 +09:00

main_ue.c

NFAPI_MODE logic to include standalone mode

2021-01-12 06:54:16 -08:00

main.c

itti dynamic queue creation, and 64 bits instance id

2020-12-23 13:56:01 +01:00

pre_processor.c

Bugfix: decrease actual MCS value

2021-01-29 09:31:56 +01:00

proto_NB_IoT.h

reset for remerging

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

ra_procedures.c

Cleanup before merge

2021-01-08 14:31:13 -08:00

rar_tools_ue.c

Fix memcpy with overlapping memory

2020-10-10 10:40:26 -04:00

rar_tools.c

develop&-nr merge

2019-10-30 16:17:41 +01:00

ue_procedures.c

Merge branch 'episys/master' into episys-merge

2021-02-13 22:52:33 +01:00