Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control
Conflicts: openair1/SIMULATION/NR_PHY/dlsim.c openair2/LAYER2/NR_MAC_gNB/config.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c openair2/RRC/NR/MESSAGES/asn1_msg.c openair2/RRC/NR/nr_rrc_proto.h openair2/RRC/NR/rrc_gNB_nsa.c openair2/RRC/NR/rrc_gNB_reconfig.c targets/ARCH/AW2SORI/oaiori.c
Showing
- cmake_targets/phy_simulators 0 additions, 1 deletioncmake_targets/phy_simulators
- common/utils/nr/nr_common.c 1 addition, 1 deletioncommon/utils/nr/nr_common.c
- executables/nr-ru.c 7 additions, 6 deletionsexecutables/nr-ru.c
- nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h 1 addition, 1 deletionnfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
- openair1/PHY/INIT/nr_init_ru.c 16 additions, 16 deletionsopenair1/PHY/INIT/nr_init_ru.c
- openair1/PHY/LTE_TRANSPORT/if5_tools.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/if5_tools.c
- openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c 1 addition, 1 deletionopenair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
- openair1/PHY/NR_TRANSPORT/nr_dci.c 8 additions, 5 deletionsopenair1/PHY/NR_TRANSPORT/nr_dci.c
- openair1/PHY/NR_TRANSPORT/nr_dlsch.c 10 additions, 6 deletionsopenair1/PHY/NR_TRANSPORT/nr_dlsch.c
- openair1/PHY/NR_TRANSPORT/nr_prach.c 11 additions, 10 deletionsopenair1/PHY/NR_TRANSPORT/nr_prach.c
- openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c 1 addition, 1 deletionopenair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
- openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c 3 additions, 3 deletionsopenair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
- openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c 4 additions, 0 deletionsopenair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
- openair1/PHY/NR_TRANSPORT/pucch_rx.c 2 additions, 2 deletionsopenair1/PHY/NR_TRANSPORT/pucch_rx.c
- openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h 2 additions, 0 deletionsopenair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
- openair1/SCHED_NR/fapi_nr_l1.c 2 additions, 1 deletionopenair1/SCHED_NR/fapi_nr_l1.c
- openair1/SCHED_NR/phy_procedures_nr_gNB.c 17 additions, 7 deletionsopenair1/SCHED_NR/phy_procedures_nr_gNB.c
- openair1/SCHED_NR_UE/fapi_nr_ue_l1.c 5 additions, 3 deletionsopenair1/SCHED_NR_UE/fapi_nr_ue_l1.c
- openair1/SCHED_NR_UE/phy_procedures_nr_ue.c 4 additions, 5 deletionsopenair1/SCHED_NR_UE/phy_procedures_nr_ue.c
- openair1/SIMULATION/NR_PHY/dlsim.c 4 additions, 8 deletionsopenair1/SIMULATION/NR_PHY/dlsim.c
Loading
Please register or sign in to comment