• luispereira87's avatar
    Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts · fb5c91ca
    luispereira87 authored
    # Conflicts:
    #	cmake_targets/CMakeLists.txt
    #	cmake_targets/build_oai
    #	executables/nr-gnb.c
    #	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
    #	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
    #	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
    #	openair2/F1AP/f1ap_du_rrc_message_transfer.c
    #	openair2/F1AP/f1ap_du_rrc_message_transfer.h
    #	openair2/F1AP/f1ap_du_task.c
    #	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
    #	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
    #	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
    #	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
    #	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
    #	openair2/RRC/NR/L2_nr_interface.c
    #	openair2/RRC/NR/rrc_gNB.c
    #	openair3/NAS/NR_UE/nr_nas_msg_sim.c
    #	openair3/ocp-gtpu/gtp_itf.cpp
    fb5c91ca
pucch_uci_ue_nr.c 72.6 KB