Merge commit '8471bd14' into mu_with_tdd1
# Conflicts: # common/utils/itti/intertask_interface.c # openair1/SCHED/phy_procedures_lte_eNb.c
Showing
- cmake_targets/CMakeLists.txt 3 additions, 0 deletionscmake_targets/CMakeLists.txt
- cmake_targets/build_oai 6 additions, 0 deletionscmake_targets/build_oai
- common/utils/itti/assertions.h 2 additions, 0 deletionscommon/utils/itti/assertions.h
- common/utils/itti/intertask_interface.c 0 additions, 13 deletionscommon/utils/itti/intertask_interface.c
- common/utils/itti/signals.c 3 additions, 0 deletionscommon/utils/itti/signals.c
- nfapi/oai_integration/nfapi_pnf.c 5 additions, 1 deletionnfapi/oai_integration/nfapi_pnf.c
- nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h 1 addition, 0 deletionsnfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h
- openair1/PHY/INIT/lte_init.c 2 additions, 6 deletionsopenair1/PHY/INIT/lte_init.c
- openair1/PHY/LTE_TRANSPORT/dci_tools.c 61 additions, 69 deletionsopenair1/PHY/LTE_TRANSPORT/dci_tools.c
- openair1/PHY/LTE_TRANSPORT/defs.h 4 additions, 4 deletionsopenair1/PHY/LTE_TRANSPORT/defs.h
- openair1/PHY/LTE_TRANSPORT/dlsch_coding.c 15 additions, 7 deletionsopenair1/PHY/LTE_TRANSPORT/dlsch_coding.c
- openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c 4 additions, 3 deletionsopenair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
- openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c 4 additions, 4 deletionsopenair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
- openair1/PHY/LTE_TRANSPORT/proto.h 1 addition, 8 deletionsopenair1/PHY/LTE_TRANSPORT/proto.h
- openair1/PHY/LTE_TRANSPORT/uci_tools.c 1 addition, 9 deletionsopenair1/PHY/LTE_TRANSPORT/uci_tools.c
- openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c 2 additions, 6 deletionsopenair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
- openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c 13 additions, 11 deletionsopenair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
- openair1/PHY/defs.h 2 additions, 2 deletionsopenair1/PHY/defs.h
- openair1/PHY/impl_defs_lte.h 1 addition, 2 deletionsopenair1/PHY/impl_defs_lte.h
- openair1/SCHED/defs.h 0 additions, 4 deletionsopenair1/SCHED/defs.h
Loading
Please register or sign in to comment