merge develop + resolve conflicts
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 91 additions, 30 deletionscmake_targets/CMakeLists.txt
- cmake_targets/autotests/test_case_list.xml 75 additions, 63 deletionscmake_targets/autotests/test_case_list.xml
- cmake_targets/build_oai 156 additions, 41 deletionscmake_targets/build_oai
- cmake_targets/tools/build_helper 1 addition, 1 deletioncmake_targets/tools/build_helper
- openair1/PHY/defs.h 7 additions, 0 deletionsopenair1/PHY/defs.h
- openair2/ENB_APP/enb_config.c 85 additions, 0 deletionsopenair2/ENB_APP/enb_config.c
- openair2/ENB_APP/enb_config.h 18 additions, 0 deletionsopenair2/ENB_APP/enb_config.h
- openair2/UTIL/LOG/vcd_signal_dumper.c 3 additions, 0 deletionsopenair2/UTIL/LOG/vcd_signal_dumper.c
- openair2/UTIL/LOG/vcd_signal_dumper.h 3 additions, 0 deletionsopenair2/UTIL/LOG/vcd_signal_dumper.h
- targets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c 9 additions, 3 deletionstargets/ARCH/BLADERF/USERSPACE/LIB/bladerf_lib.c
- targets/ARCH/COMMON/common_lib.c 128 additions, 23 deletionstargets/ARCH/COMMON/common_lib.c
- targets/ARCH/COMMON/common_lib.h 104 additions, 84 deletionstargets/ARCH/COMMON/common_lib.h
- targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c 319 additions, 0 deletionstargets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
- targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c 383 additions, 0 deletionstargets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
- targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c 270 additions, 341 deletionstargets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
- targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h 123 additions, 43 deletionstargets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
- targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c 9 additions, 1 deletiontargets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
- targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 28 additions, 19 deletionstargets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf 189 additions, 0 deletions...ECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
- targets/RT/USER/.#lte-softmodem.c 1 addition, 0 deletionstargets/RT/USER/.#lte-softmodem.c
Loading
Please register or sign in to comment