• Raymond Knopp's avatar
    Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR · f99754a5
    Raymond Knopp authored
    Conflicts:
    	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
    	openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
    	openair1/SIMULATION/NR_PHY/dlsim.c
    	openair1/SIMULATION/NR_PHY/ulsim.c
    	openair2/GNB_APP/gnb_config.c
    	openair2/LAYER2/NR_MAC_gNB/config.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
    	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
    	openair2/RRC/NR/MESSAGES/asn1_msg.c
    f99754a5
nr_ulsch_decoding.c 20.6 KB