• Roberto Louro Magueta's avatar
    Merge remote-tracking branch 'origin/develop' into develop-CSI · 87e79e5e
    Roberto Louro Magueta authored
    # Conflicts:
    #	openair2/LAYER2/NR_MAC_gNB/config.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    #	openair2/RRC/NR/MESSAGES/asn1_msg.c
    #	openair2/RRC/NR/rrc_gNB_reconfig.c
    #	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
    #	targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
    #	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
    #	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
    #	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
    #	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
    #	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
    #	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
    87e79e5e
lte-enb.c 52.9 KB