openair2/LAYER2/NR_MAC_gNB/config.c · 03e5b461a3df5dd4bf13de866f5967bee234dd8b · ZhouShuya / OpenXG-RAN

Merge remote-tracking branch 'origin/NR_MAC_SSB_RO_GlobalEdge' into integration_2020_wk42 · 03e5b461

hardy authored Oct 19, 2020

Solved Conflicts in:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

03e5b461

config.c 21.1 KB

Replace config.c