• rmagueta's avatar
    Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs · 345f3056
    rmagueta authored
    # Conflicts:
    #	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
    #	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
    #	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
    #	openair2/LAYER2/NR_MAC_gNB/config.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    #	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
    345f3056
rrc_gNB.c 176 KB