Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split
Conflicts: openair2/ENB_APP/enb_config.c
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 1 addition, 1 deletioncmake_targets/CMakeLists.txt
- openair1/PHY/LTE_TRANSPORT/defs.h 67 additions, 9 deletionsopenair1/PHY/LTE_TRANSPORT/defs.h
- openair1/PHY/LTE_TRANSPORT/dlsch_coding.c 0 additions, 2 deletionsopenair1/PHY/LTE_TRANSPORT/dlsch_coding.c
- openair1/PHY/LTE_TRANSPORT/mdci.h 11 additions, 7 deletionsopenair1/PHY/LTE_TRANSPORT/mdci.h
- openair1/PHY/LTE_TRANSPORT/proto.h 2 additions, 0 deletionsopenair1/PHY/LTE_TRANSPORT/proto.h
- openair1/PHY/LTE_TRANSPORT/uci_tools.c 17 additions, 0 deletionsopenair1/PHY/LTE_TRANSPORT/uci_tools.c
- openair1/PHY/defs.h 4 additions, 6 deletionsopenair1/PHY/defs.h
- openair1/SCHED/phy_procedures_lte_eNb.c 45 additions, 103 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair2/ENB_APP/enb_config.c 25 additions, 3 deletionsopenair2/ENB_APP/enb_config.c
- openair2/LAYER2/MAC/defs.h 9 additions, 5 deletionsopenair2/LAYER2/MAC/defs.h
- openair2/LAYER2/MAC/eNB_scheduler_RA.c 835 additions, 678 deletionsopenair2/LAYER2/MAC/eNB_scheduler_RA.c
- openair2/LAYER2/MAC/eNB_scheduler_bch.c 6 additions, 6 deletionsopenair2/LAYER2/MAC/eNB_scheduler_bch.c
- openair2/LAYER2/MAC/eNB_scheduler_primitives.c 12 additions, 12 deletionsopenair2/LAYER2/MAC/eNB_scheduler_primitives.c
- openair2/LAYER2/MAC/eNB_scheduler_ulsch.c 1 addition, 1 deletionopenair2/LAYER2/MAC/eNB_scheduler_ulsch.c
- openair2/LAYER2/MAC/proto.h 36 additions, 11 deletionsopenair2/LAYER2/MAC/proto.h
- openair2/LAYER2/MAC/rar_tools.c 22 additions, 26 deletionsopenair2/LAYER2/MAC/rar_tools.c
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf 2 additions, 2 deletionstargets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.oaisim.conf
- targets/RT/USER/lte-ru.c 14 additions, 2 deletionstargets/RT/USER/lte-ru.c
Loading
Please register or sign in to comment