openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c · 9125a986958dfa4293fd1f2cbbe06e19be70ad57 · wangjie / OpenXG-RAN

Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA · d37552db

rmagueta authored Mar 19, 2021

# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp

d37552db

gNB_scheduler_primitives.c 99.3 KB

Replace gNB_scheduler_primitives.c