• Raymond Knopp's avatar
    Merge remote-tracking branch 'origin/develop-nr' into nr_prach · 56d7f6fc
    Raymond Knopp authored
    Conflicts:
    	cmake_targets/CMakeLists.txt
    	cmake_targets/build_oai
    	executables/nr-ue.c
    	openair1/PHY/INIT/nr_init.c
    	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
    	openair1/PHY/NR_TRANSPORT/nr_dlsch.h
    	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
    	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
    	openair1/PHY/defs_gNB.h
    	openair1/SCHED_NR/phy_procedures_nr_gNB.c
    	openair1/SCHED_NR_UE/defs.h
    	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
    	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
    	openair1/SIMULATION/NR_PHY/dlsim.c
    	openair1/SIMULATION/NR_PHY/pucchsim.c
    	openair1/SIMULATION/NR_PHY/ulschsim.c
    	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
    56d7f6fc
defs_nr_common.h 10.5 KB