Merge remote-tracking branch 'origin/develop_integration_2018_w07' into develop
Summary of changes: - a lot of work on flexran - several compilation bugfixes - some bugfixes for some bad conflict resolutions - various bugs fixed
Showing
- cmake_targets/CMakeLists.txt 97 additions, 106 deletionscmake_targets/CMakeLists.txt
- cmake_targets/build_oai 4 additions, 19 deletionscmake_targets/build_oai
- common/ran_context.h 3 additions, 0 deletionscommon/ran_context.h
- common/utils/itti/intertask_interface.c 13 additions, 0 deletionscommon/utils/itti/intertask_interface.c
- common/utils/itti/itti_types.h 12 additions, 1 deletioncommon/utils/itti/itti_types.h
- common/utils/msc/msc.c 1 addition, 0 deletionscommon/utils/msc/msc.c
- openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c 4 additions, 4 deletionsopenair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
- openair1/PHY/CODING/3gpplte_turbo_decoder_sse.c 12 additions, 0 deletionsopenair1/PHY/CODING/3gpplte_turbo_decoder_sse.c
- openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c 4 additions, 4 deletionsopenair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
- openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c 4 additions, 4 deletionsopenair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
- openair1/PHY/CODING/defs.h 10 additions, 0 deletionsopenair1/PHY/CODING/defs.h
- openair1/PHY/INIT/defs.h 8 additions, 0 deletionsopenair1/PHY/INIT/defs.h
- openair1/PHY/INIT/init_top.c 12 additions, 0 deletionsopenair1/PHY/INIT/init_top.c
- openair1/PHY/INIT/lte_init.c 75 additions, 1 deletionopenair1/PHY/INIT/lte_init.c
- openair1/PHY/INIT/lte_init_ru.c 48 additions, 0 deletionsopenair1/PHY/INIT/lte_init_ru.c
- openair1/PHY/LTE_REFSIG/lte_ul_ref.c 7 additions, 3 deletionsopenair1/PHY/LTE_REFSIG/lte_ul_ref.c
- openair1/PHY/LTE_TRANSPORT/dci_tools.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/dci_tools.c
- openair1/PHY/LTE_TRANSPORT/dlsch_coding.c 6 additions, 31 deletionsopenair1/PHY/LTE_TRANSPORT/dlsch_coding.c
- openair1/PHY/LTE_TRANSPORT/proto.h 6 additions, 0 deletionsopenair1/PHY/LTE_TRANSPORT/proto.h
- openair1/PHY/LTE_TRANSPORT/ulsch_coding.c 0 additions, 22 deletionsopenair1/PHY/LTE_TRANSPORT/ulsch_coding.c
Loading
Please register or sign in to comment