• rmagueta's avatar
    Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs · 204bffbc
    rmagueta authored
    # Conflicts:
    #	executables/nr-uesoftmodem.c
    #	executables/nr-uesoftmodem.h
    #	executables/softmodem-common.h
    #	openair2/LAYER2/NR_MAC_UE/mac_proto.h
    #	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
    #	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    204bffbc
nr_dlsch.c 21.3 KB