Merge branch 'develop_integration_w48' into 'develop'
Develop integration 2018 week 48 See merge request oai/openairinterface5g!462 Integration of the following MRs: - MR 448: Missing RRC inactivity timer - MR 458: Adding MAC main config to RRC connection setup - MR 457: Resolving "parallelization not working correctly in phy simulators" - MR 460: Fixing RU DFT initialization
Showing
- ci-scripts/main.py 18 additions, 1 deletionci-scripts/main.py
- ci-scripts/xml_files/if4p5_usrp210_band40.xml 3 additions, 5 deletionsci-scripts/xml_files/if4p5_usrp210_band40.xml
- ci-scripts/xml_files/if4p5_usrp210_band7.xml 2 additions, 5 deletionsci-scripts/xml_files/if4p5_usrp210_band7.xml
- cmake_targets/CMakeLists.txt 1 addition, 1 deletioncmake_targets/CMakeLists.txt
- common/utils/LOG/log.c 3 additions, 4 deletionscommon/utils/LOG/log.c
- common/utils/T/tracer/gui/x.c 146 additions, 135 deletionscommon/utils/T/tracer/gui/x.c
- nfapi/oai_integration/nfapi_vnf.c 1 addition, 3 deletionsnfapi/oai_integration/nfapi_vnf.c
- openair1/PHY/INIT/init_top.c 0 additions, 5 deletionsopenair1/PHY/INIT/init_top.c
- openair1/PHY/INIT/lte_init_ru.c 1 addition, 0 deletionsopenair1/PHY/INIT/lte_init_ru.c
- openair1/PHY/INIT/lte_init_ue.c 3 additions, 1 deletionopenair1/PHY/INIT/lte_init_ue.c
- openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
- openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c 9 additions, 10 deletionsopenair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
- openair1/PHY/defs_common.h 46 additions, 7 deletionsopenair1/PHY/defs_common.h
- openair1/PHY/defs_eNB.h 1 addition, 2 deletionsopenair1/PHY/defs_eNB.h
- openair1/PHY/phy_vars_ue.h 10 additions, 10 deletionsopenair1/PHY/phy_vars_ue.h
- openair1/SCHED/phy_procedures_lte_eNb.c 3 additions, 1 deletionopenair1/SCHED/phy_procedures_lte_eNb.c
- openair1/SCHED_UE/phy_procedures_lte_ue.c 2763 additions, 3096 deletionsopenair1/SCHED_UE/phy_procedures_lte_ue.c
- openair1/SIMULATION/LTE_PHY/common_sim.h 25 additions, 17 deletionsopenair1/SIMULATION/LTE_PHY/common_sim.h
- openair1/SIMULATION/LTE_PHY/dlsim.c 29 additions, 51 deletionsopenair1/SIMULATION/LTE_PHY/dlsim.c
- openair1/SIMULATION/LTE_PHY/ulsim.c 31 additions, 52 deletionsopenair1/SIMULATION/LTE_PHY/ulsim.c
Loading
Please register or sign in to comment