-
- Downloads
Merge remote-tracking branch 'origin/NR_MAC_SSB_RO_GlobalEdge' into integration_2020_wk42
Solved Conflicts in: openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
No related branches found
No related tags found
Showing
- executables/main-fs6.c 1 addition, 1 deletionexecutables/main-fs6.c
- executables/main-ocp.c 2 additions, 2 deletionsexecutables/main-ocp.c
- executables/nr-gnb.c 2 additions, 6 deletionsexecutables/nr-gnb.c
- executables/nr-ru.c 28 additions, 5 deletionsexecutables/nr-ru.c
- nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h 3 additions, 1 deletionnfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h
- openair1/PHY/INIT/lte_init_ru.c 5 additions, 5 deletionsopenair1/PHY/INIT/lte_init_ru.c
- openair1/PHY/INIT/nr_init.c 2 additions, 1 deletionopenair1/PHY/INIT/nr_init.c
- openair1/PHY/INIT/nr_init_ru.c 13 additions, 9 deletionsopenair1/PHY/INIT/nr_init_ru.c
- openair1/PHY/LTE_TRANSPORT/if4_tools.c 2 additions, 2 deletionsopenair1/PHY/LTE_TRANSPORT/if4_tools.c
- openair1/PHY/LTE_TRANSPORT/prach.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/prach.c
- openair1/PHY/NR_TRANSPORT/nr_prach.c 90 additions, 65 deletionsopenair1/PHY/NR_TRANSPORT/nr_prach.c
- openair1/PHY/NR_TRANSPORT/nr_transport_proto.h 4 additions, 2 deletionsopenair1/PHY/NR_TRANSPORT/nr_transport_proto.h
- openair1/PHY/NR_UE_TRANSPORT/nr_prach.c 31 additions, 30 deletionsopenair1/PHY/NR_UE_TRANSPORT/nr_prach.c
- openair1/PHY/defs_RU.h 4 additions, 2 deletionsopenair1/PHY/defs_RU.h
- openair1/SCHED/prach_procedures.c 1 addition, 1 deletionopenair1/SCHED/prach_procedures.c
- openair1/SCHED_NR/nr_prach_procedures.c 94 additions, 67 deletionsopenair1/SCHED_NR/nr_prach_procedures.c
- openair1/SCHED_NR/sched_nr.h 1 addition, 1 deletionopenair1/SCHED_NR/sched_nr.h
- openair1/SIMULATION/NR_PHY/prachsim.c 57 additions, 56 deletionsopenair1/SIMULATION/NR_PHY/prachsim.c
- openair2/GNB_APP/gnb_config.c 1 addition, 1 deletionopenair2/GNB_APP/gnb_config.c
- openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c 282 additions, 34 deletionsopenair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
Loading
Please register or sign in to comment