• knopp's avatar
    Merge remote-tracking branch 'origin/develop-nr' into nr_prach · adf76a5f
    knopp authored
    Conflicts:
    	cmake_targets/CMakeLists.txt
    	cmake_targets/build_oai
    	executables/nr-ru.c
    	executables/nr-softmodem.c
    	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
    	openair1/PHY/INIT/nr_init.c
    	openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
    	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
    	openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
    	openair1/PHY/TOOLS/Makefile
    	openair1/PHY/TOOLS/lte_dfts.c
    	openair1/PHY/TOOLS/nr_phy_scope.c
    	openair1/SCHED_NR/phy_procedures_nr_common.c
    	openair1/SCHED_NR/phy_procedures_nr_gNB.c
    	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
    	openair1/SIMULATION/NR_PHY/dlschsim.c
    	openair1/SIMULATION/NR_PHY/dlsim.c
    	openair1/SIMULATION/NR_PHY/pbchsim.c
    	openair1/SIMULATION/NR_PHY/pucchsim.c
    	openair1/SIMULATION/NR_PHY/ulschsim.c
    	openair1/SIMULATION/NR_PHY/ulsim.c
    	openair2/COMMON/rrc_messages_types.h
    	openair2/GNB_APP/RRC_nr_paramsvalues.h
    	openair2/GNB_APP/gnb_config.c
    	openair2/GNB_APP/gnb_paramdef.h
    	openair2/LAYER2/NR_MAC_gNB/config.c
    	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
    	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
    	openair2/RRC/NR/MESSAGES/asn1_msg.c
    	openair2/RRC/NR/MESSAGES/asn1_msg.h
    adf76a5f
ran_context.h 4.05 KB