Merge remote-tracking branch 'origin/signal-delay' into ru_rau_enhancement_L1_renaming

Browse Source

Conflicts:
	openair1/PHY/defs_eNB.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/prach_procedures.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c

...

This commit is contained in:

Raymond Knopp

2019-04-20 08:28:43 +02:00

parent ca111641d4 d1e27f4e8c

commit ed08f3ab1b

88 changed files with 14646 additions and 12948 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

openair1/SCHED/fapi_l1.c

+315 -383

File diff suppressed because it is too large Load Diff