Merge remote-tracking branch 'origin/develop' into mu_with_tdd1
The monolithic eNodeB is not fully functional in FDD. The TDD mode has not been tested. Do not consider this commit as functional. Conflicts: cmake_targets/CMakeLists.txt cmake_targets/build_oai common/utils/itti/intertask_interface.c openair1/PHY/INIT/lte_init.c openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c openair1/PHY/LTE_TRANSPORT/dci_tools.c openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c openair1/PHY/LTE_TRANSPORT/transport_eNB.h openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h openair1/PHY/defs_eNB.h openair1/PHY/impl_defs_lte.h openair1/SCHED/fapi_l1.c openair1/SCHED/phy_procedures_lte_eNb.c openair1/SCHED/pusch_pc.c openair2/COMMON/platform_types.h openair2/COMMON/rrc_messages_types.h openair2/ENB_APP/enb_config.c openair2/ENB_APP/enb_paramdef.h openair2/LAYER2/MAC/config.c openair2/LAYER2/MAC/eNB_scheduler.c openair2/LAYER2/MAC/eNB_scheduler_RA.c openair2/LAYER2/MAC/eNB_scheduler_dlsch.c openair2/LAYER2/MAC/eNB_scheduler_primitives.c openair2/LAYER2/MAC/eNB_scheduler_ulsch.c openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c openair2/LAYER2/MAC/mac.h openair2/LAYER2/MAC/mac_proto.h openair2/LAYER2/MAC/pre_processor.c openair2/LAYER2/RLC/rlc.c openair2/LAYER2/RLC/rlc_rrc.c openair2/RRC/LITE/rrc_common.c openair2/RRC/LTE/L2_interface.c openair2/RRC/LTE/MESSAGES/asn1_msg.c openair2/RRC/LTE/rrc_eNB.c openair2/UTIL/LOG/log.h targets/COMMON/openairinterface5g_limits.h targets/RT/USER/lte-enb.c targets/RT/USER/lte-ru.c targets/RT/USER/lte-softmodem.c targets/RT/USER/lte-softmodem.h
Showing
- cmake_targets/CMakeLists.txt 516 additions, 298 deletionscmake_targets/CMakeLists.txt
- cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf 2 additions, 2 deletions...utotests/v2/config/enb.band38.tm1.usrpb210.tdd.10MHz.conf
- cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf 2 additions, 2 deletions...utotests/v2/config/enb.band38.tm1.usrpb210.tdd.20MHz.conf
- cmake_targets/autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf 2 additions, 2 deletions...autotests/v2/config/enb.band38.tm1.usrpb210.tdd.5MHz.conf
- cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf 2 additions, 2 deletions...autotests/v2/config/enb.band7.tm1.usrpb210.fdd.10MHz.conf
- cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf 2 additions, 2 deletions...autotests/v2/config/enb.band7.tm1.usrpb210.fdd.20MHz.conf
- cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf 2 additions, 2 deletions.../autotests/v2/config/enb.band7.tm1.usrpb210.fdd.5MHz.conf
- cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf 2 additions, 2 deletions...argets/autotests/v2/config/rcc.band7.tm1.if4p5.10MHz.conf
- cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf 2 additions, 2 deletions...argets/autotests/v2/config/rcc.band7.tm1.if4p5.20MHz.conf
- cmake_targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf 2 additions, 2 deletions...targets/autotests/v2/config/rcc.band7.tm1.if4p5.5MHz.conf
- cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf 2 additions, 2 deletions...sts/v2/config/rru.band7.tm1.if4p5.10MHz.udp.usrpb210.conf
- cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf 2 additions, 2 deletions...sts/v2/config/rru.band7.tm1.if4p5.20MHz.udp.usrpb210.conf
- cmake_targets/autotests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf 2 additions, 2 deletions...ests/v2/config/rru.band7.tm1.if4p5.5MHz.udp.usrpb210.conf
- cmake_targets/autotests/v2/connection.py 2 additions, 2 deletionscmake_targets/autotests/v2/connection.py
- cmake_targets/build_oai 172 additions, 34 deletionscmake_targets/build_oai
- cmake_targets/lte-simulators/CMakeLists.txt 1 addition, 1 deletioncmake_targets/lte-simulators/CMakeLists.txt
- cmake_targets/oaisim_noS1_build_oai/CMakeLists.template 1 addition, 1 deletioncmake_targets/oaisim_noS1_build_oai/CMakeLists.template
- cmake_targets/tools/build_helper 18 additions, 12 deletionscmake_targets/tools/build_helper
- cmake_targets/tools/fix_asn1 1 addition, 0 deletionscmake_targets/tools/fix_asn1
- cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff 47 additions, 0 deletions...x_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff
Loading
Please register or sign in to comment