Merge branch 'develop-realtime-lts' into develop_integration_w07
Conflicts: targets/RT/USER/lte-enb.c targets/RT/USER/lte-softmodem.c targets/RT/USER/lte-ue.c
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 0 additions, 12 deletionscmake_targets/CMakeLists.txt
- common/utils/itti/assertions.h 1 addition, 1 deletioncommon/utils/itti/assertions.h
- openair1/PHY/LTE_TRANSPORT/dlsch_coding.c 4 additions, 0 deletionsopenair1/PHY/LTE_TRANSPORT/dlsch_coding.c
- openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c 1 addition, 0 deletionsopenair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
- openair1/PHY/defs.h 4 additions, 0 deletionsopenair1/PHY/defs.h
- openair1/SCHED/phy_procedures_lte_eNb.c 1 addition, 0 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair2/COMMON/platform_types.h 1 addition, 1 deletionopenair2/COMMON/platform_types.h
- openair2/UTIL/LOG/log.h 275 additions, 174 deletionsopenair2/UTIL/LOG/log.h
- openair2/UTIL/LOG/log_if.h 4 additions, 55 deletionsopenair2/UTIL/LOG/log_if.h
- openair2/UTIL/OSA/osa_stream_eea.c 2 additions, 1 deletionopenair2/UTIL/OSA/osa_stream_eea.c
- openair3/NAS/UE/UEprocess.c 1 addition, 0 deletionsopenair3/NAS/UE/UEprocess.c
- openair3/SECU/nas_stream_eea2.c 2 additions, 1 deletionopenair3/SECU/nas_stream_eea2.c
- openair3/TEST/test_aes128_ctr_decrypt.c 2 additions, 1 deletionopenair3/TEST/test_aes128_ctr_decrypt.c
- targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 542 additions, 673 deletionstargets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf 3 additions, 3 deletions...PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
- targets/RT/USER/lte-softmodem.c 1181 additions, 1246 deletionstargets/RT/USER/lte-softmodem.c
- targets/RT/USER/lte-softmodem.h 95 additions, 0 deletionstargets/RT/USER/lte-softmodem.h
- targets/RT/USER/lte-ue.c 716 additions, 1669 deletionstargets/RT/USER/lte-ue.c
Loading
Please register or sign in to comment