• rmagueta's avatar
    Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS · cf605f4c
    rmagueta authored
    # Conflicts:
    #	cmake_targets/CMakeLists.txt
    #	cmake_targets/build_oai
    #	openair1/PHY/INIT/nr_init_ru.c
    #	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
    #	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
    #	openair1/SCHED_NR/phy_procedures_nr_gNB.c
    #	openair1/SIMULATION/NR_PHY/ulsim.c
    #	openair2/COMMON/platform_constants.h
    #	openair2/ENB_APP/enb_config.c
    #	openair2/F1AP/f1ap_cu_interface_management.c
    #	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
    #	openair2/F1AP/f1ap_cu_ue_context_management.c
    #	openair2/F1AP/f1ap_du_interface_management.c
    #	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_bch.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
    #	openair2/RRC/LTE/rrc_eNB.c
    #	openair2/RRC/NR/rrc_gNB.c
    #	openair2/RRC/NR_UE/rrc_UE.c
    cf605f4c
softmodem-common.h 18.4 KB