rename sdr to radio
This commit is contained in:
francescomani
+48
-48
@@ -55,17 +55,17 @@ if (${RF_BOARD} STREQUAL "OAI_USRP")
|
||||
find_package(Boost REQUIRED)
|
||||
|
||||
elseif (${RF_BOARD} STREQUAL "OAI_IRIS")
|
||||
include_directories("${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/")
|
||||
include_directories("${OPENAIR_DIR}/radio/IRIS/USERSPACE/LIB/")
|
||||
|
||||
set(HW_SOURCE ${HW_SOURCE}
|
||||
${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/iris_lib.cpp)
|
||||
${OPENAIR_DIR}/radio/IRIS/USERSPACE/LIB/iris_lib.cpp)
|
||||
LINK_DIRECTORIES("/usr/local/lib")
|
||||
set(option_HW_lib "-lSoapySDR -rdynamic -ldl")
|
||||
|
||||
elseif (${RF_BOARD} STREQUAL "OAI_AW2SORI")
|
||||
include_directories("${OPENAIR_DIR}/sdr/AW2SORI")
|
||||
include_directories("${OPENAIR_DIR}/radio/AW2SORI")
|
||||
set(HW_SOURCE ${HW_SOURCE}
|
||||
${OPENAIR_DIR}/sdr/AW2SORI/ARCH/AW2SORI/oaiori.c)
|
||||
${OPENAIR_DIR}/radio/AW2SORI/ARCH/AW2SORI/oaiori.c)
|
||||
LINK_DIRECTORIES("/usr/local/lib")
|
||||
set(openair_HW_lib "-shared -fPIC -msse4 -g -ggdb -lori")
|
||||
|
||||
@@ -752,53 +752,53 @@ set (SHLIB_LOADER_SOURCES
|
||||
######################################################################
|
||||
|
||||
set(HWLIB_USRP_SOURCE
|
||||
${OPENAIR_DIR}/sdr/USRP/USERSPACE/LIB/usrp_lib.cpp
|
||||
${OPENAIR_DIR}/radio/USRP/USERSPACE/LIB/usrp_lib.cpp
|
||||
)
|
||||
add_library(oai_usrpdevif MODULE ${HWLIB_USRP_SOURCE} )
|
||||
target_include_directories(oai_usrpdevif PRIVATE
|
||||
"${OPENAIR_DIR}/sdr/USRP/USERSPACE/LIB/"
|
||||
"${OPENAIR_DIR}/radio/USRP/USERSPACE/LIB/"
|
||||
${Boost_INCLUDE_DIR}
|
||||
)
|
||||
target_link_libraries(oai_usrpdevif uhd)
|
||||
|
||||
include_directories("${OPENAIR_DIR}/sdr/BLADERF/USERSPACE/LIB/")
|
||||
include_directories("${OPENAIR_DIR}/radio/BLADERF/USERSPACE/LIB/")
|
||||
set(HWLIB_BLADERF_SOURCE
|
||||
${OPENAIR_DIR}/sdr/BLADERF/USERSPACE/LIB/bladerf_lib.c
|
||||
${OPENAIR_DIR}/radio/BLADERF/USERSPACE/LIB/bladerf_lib.c
|
||||
)
|
||||
add_library(oai_bladerfdevif MODULE ${HWLIB_BLADERF_SOURCE} )
|
||||
target_link_libraries(oai_bladerfdevif bladeRF)
|
||||
|
||||
include_directories("${OPENAIR_DIR}/sdr/LMSSDR/USERSPACE/LIB/")
|
||||
include_directories("${OPENAIR_DIR}/radio/LMSSDR/USERSPACE/LIB/")
|
||||
|
||||
set(HWLIB_LMSSDR_SOURCE
|
||||
${OPENAIR_DIR}/sdr/LMSSDR/USERSPACE/LIB/lms_lib.cpp
|
||||
${OPENAIR_DIR}/radio/LMSSDR/USERSPACE/LIB/lms_lib.cpp
|
||||
)
|
||||
add_library(oai_lmssdrdevif MODULE ${HWLIB_LMSSDR_SOURCE} )
|
||||
target_include_directories(oai_lmssdrdevif PRIVATE /usr/local/include/lime)
|
||||
target_link_libraries(oai_lmssdrdevif LimeSuite )
|
||||
|
||||
|
||||
include_directories("${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/")
|
||||
include_directories("${OPENAIR_DIR}/radio/ETHERNET/USERSPACE/LIB/")
|
||||
set(TPLIB_ETHERNET_SOURCE
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/eth_udp.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/USERSPACE/LIB/eth_raw.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/USERSPACE/LIB/ethernet_lib.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/USERSPACE/LIB/eth_udp.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/USERSPACE/LIB/eth_raw.c
|
||||
)
|
||||
add_library(oai_eth_transpro MODULE ${TPLIB_ETHERNET_SOURCE} )
|
||||
|
||||
include_directories("${OPENAIR_DIR}/sdr/AW2SORI/")
|
||||
include_directories("${OPENAIR_DIR}/radio/AW2SORI/")
|
||||
link_directories("/usr/local/lib")
|
||||
set(HWLIB_AW2SORI_SOURCE
|
||||
${OPENAIR_DIR}/sdr/AW2SORI/oaiori.c
|
||||
${OPENAIR_DIR}/radio/AW2SORI/oaiori.c
|
||||
)
|
||||
add_library(aw2sori_transpro MODULE ${HWLIB_AW2SORI_SOURCE})
|
||||
target_compile_options(aw2sori_transpro PRIVATE -shared -fPIC -msse4 -g -ggdb -DLITE_COMPILATION)
|
||||
target_link_libraries(aw2sori_transpro libori.so)
|
||||
|
||||
include_directories("${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/")
|
||||
include_directories("${OPENAIR_DIR}/radio/IRIS/USERSPACE/LIB/")
|
||||
set(option_HWIRISLIB_lib "-l SoapySDR")
|
||||
set(HWLIB_IRIS_SOURCE
|
||||
${OPENAIR_DIR}/sdr/IRIS/USERSPACE/LIB/iris_lib.cpp
|
||||
${OPENAIR_DIR}/radio/IRIS/USERSPACE/LIB/iris_lib.cpp
|
||||
)
|
||||
add_library(oai_irisdevif MODULE ${HWLIB_IRIS_SOURCE})
|
||||
target_include_directories(oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.7/)
|
||||
@@ -811,11 +811,11 @@ target_link_libraries(oai_irisdevif SoapySDR)
|
||||
include_directories ("/usr/include/dpdk")
|
||||
|
||||
set(HWLIB_BENETEL_4G_SOURCE
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/benetel.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/shared_buffers.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/low.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/low_dpdk.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/4g/dpdk_driver.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/benetel.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/shared_buffers.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/low.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/low_dpdk.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/4g/dpdk_driver.c
|
||||
)
|
||||
add_library(benetel_4g MODULE ${HWLIB_BENETEL_4G_SOURCE} )
|
||||
|
||||
@@ -829,11 +829,11 @@ TARGET_LINK_LIBRARIES(benetel_4g pthread dl rt m numa)
|
||||
######################################################################
|
||||
|
||||
set(HWLIB_BENETEL_5G_SOURCE
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/benetel.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/shared_buffers.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/low.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/low_dpdk.c
|
||||
${OPENAIR_DIR}/sdr/ETHERNET/benetel/5g/dpdk_driver.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/benetel.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/shared_buffers.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/low.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/low_dpdk.c
|
||||
${OPENAIR_DIR}/radio/ETHERNET/benetel/5g/dpdk_driver.c
|
||||
)
|
||||
add_library(benetel_5g MODULE ${HWLIB_BENETEL_5G_SOURCE} )
|
||||
|
||||
@@ -870,7 +870,7 @@ endif ()
|
||||
|
||||
##########################################################
|
||||
|
||||
include_directories ("${OPENAIR_DIR}/sdr/COMMON")
|
||||
include_directories ("${OPENAIR_DIR}/radio/COMMON")
|
||||
|
||||
##############################################################
|
||||
# ???!!! TO BE DOCUMENTED OPTIONS !!!???
|
||||
@@ -1035,7 +1035,7 @@ include_directories("${OPENAIR3_DIR}/ocp-gtpu")
|
||||
include_directories("${OPENAIR3_DIR}/M3AP")
|
||||
include_directories("${OPENAIR3_DIR}/MME_APP")
|
||||
include_directories("${OPENAIR_DIR}/targets/COMMON")
|
||||
include_directories("${OPENAIR_DIR}/sdr/COMMON")
|
||||
include_directories("${OPENAIR_DIR}/radio/COMMON")
|
||||
include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/PHY")
|
||||
include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC")
|
||||
include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/RRC")
|
||||
@@ -2539,15 +2539,15 @@ target_link_libraries(nrscope ${XFORMS_LIBRARIES})
|
||||
|
||||
|
||||
add_library(rfsimulator MODULE
|
||||
${OPENAIR_DIR}/sdr/rfsimulator/simulator.c
|
||||
${OPENAIR_DIR}/sdr/rfsimulator/apply_channelmod.c
|
||||
${OPENAIR_DIR}/sdr/rfsimulator/new_channel_sim.c
|
||||
${OPENAIR_DIR}/radio/rfsimulator/simulator.c
|
||||
${OPENAIR_DIR}/radio/rfsimulator/apply_channelmod.c
|
||||
${OPENAIR_DIR}/radio/rfsimulator/new_channel_sim.c
|
||||
${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
|
||||
)
|
||||
target_link_libraries(rfsimulator SIMU_COMMON ${ATLAS_LIBRARIES})
|
||||
|
||||
add_library(oai_iqplayer MODULE
|
||||
${OPENAIR_DIR}/sdr/iqplayer/iqplayer_lib.c
|
||||
${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
|
||||
)
|
||||
set(CMAKE_MODULE_PATH "${OPENAIR_DIR}/cmake_targets/tools/MODULES" "${CMAKE_MODULE_PATH}")
|
||||
|
||||
@@ -2608,7 +2608,7 @@ add_executable(nfapi_test
|
||||
)
|
||||
|
||||
add_executable(replay_node
|
||||
${OPENAIR_DIR}/sdr/rfsimulator/stored_node.c
|
||||
${OPENAIR_DIR}/radio/rfsimulator/stored_node.c
|
||||
)
|
||||
target_link_libraries (replay_node minimal_lib)
|
||||
|
||||
@@ -2635,8 +2635,8 @@ add_executable(lte-softmodem
|
||||
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
|
||||
${OPENAIR_TARGETS}/COMMON/create_tasks.c
|
||||
${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/record_player.c
|
||||
${OPENAIR_DIR}/radio/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/radio/COMMON/record_player.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
|
||||
${OPENAIR2_DIR}/F1AP/dummy_enb.c
|
||||
@@ -2675,8 +2675,8 @@ add_executable(ocp-enb
|
||||
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
|
||||
${OPENAIR_TARGETS}/COMMON/create_tasks.c
|
||||
${OPENAIR_TARGETS}/COMMON/create_tasks_mbms.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/record_player.c
|
||||
${OPENAIR_DIR}/radio/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/radio/COMMON/record_player.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
|
||||
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
|
||||
@@ -2704,8 +2704,8 @@ target_link_libraries (ocp-enb ${LIBXML2_LIBRARIES} pthread m CONFIG_LIB rt cryp
|
||||
add_executable(oairu
|
||||
${OPENAIR_TARGETS}/RT/USER/lte-ru.c
|
||||
${OPENAIR_TARGETS}/RT/USER/ru_control.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/record_player.c
|
||||
${OPENAIR_DIR}/radio/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/radio/COMMON/record_player.c
|
||||
${OPENAIR_DIR}/executables/softmodem-common.c
|
||||
${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
|
||||
${OPENAIR_DIR}/executables/main_ru.c
|
||||
@@ -2730,8 +2730,8 @@ add_executable(lte-uesoftmodem
|
||||
${OPENAIR_TARGETS}/RT/USER/lte-uesoftmodem.c
|
||||
${OPENAIR_DIR}/executables/softmodem-common.c
|
||||
${OPENAIR_TARGETS}/COMMON/create_tasks_ue.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/record_player.c
|
||||
${OPENAIR_DIR}/radio/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/radio/COMMON/record_player.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
|
||||
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
|
||||
@@ -2776,8 +2776,8 @@ add_executable(nr-softmodem
|
||||
${OPENAIR_DIR}/executables/nr-softmodem.c
|
||||
${OPENAIR_DIR}/executables/softmodem-common.c
|
||||
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/record_player.c
|
||||
${OPENAIR_DIR}/radio/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/radio/COMMON/record_player.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
|
||||
${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
|
||||
@@ -2821,8 +2821,8 @@ add_executable(nr-uesoftmodem
|
||||
${OPENAIR_DIR}/executables/nr-ue.c
|
||||
${OPENAIR_DIR}/executables/softmodem-common.c
|
||||
${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/record_player.c
|
||||
${OPENAIR_DIR}/radio/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/radio/COMMON/record_player.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/nas_config.c
|
||||
${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
|
||||
${OPENAIR2_DIR}/RRC/NAS/rb_config.c
|
||||
@@ -2875,7 +2875,7 @@ target_link_libraries (dlsim_tm4
|
||||
add_executable(rftest
|
||||
${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_test.c
|
||||
${OPENAIR_DIR}/openair1/PHY/TOOLS/calibration_scope.c
|
||||
${OPENAIR_DIR}/sdr/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/radio/COMMON/common_lib.c
|
||||
${OPENAIR_DIR}/executables/softmodem-common.c
|
||||
${SHLIB_LOADER_SOURCES}
|
||||
)
|
||||
|
||||
@@ -10,7 +10,7 @@ As a developer you may need to look at these sections:
|
||||
|
||||
Loader usage examples can be found in oai sources:
|
||||
|
||||
* device and transport initialization code: [function `load_lib` in *sdr/COMMON/__common_lib.c__* ](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/sdr/COMMON/common_lib.c#L91)
|
||||
* turbo encoder and decoder initialization: [function `load_codinglib`in *openair1/PHY/CODING/__coding_load.c__*](https://gitlab.eurecom.fr/oai/openairinterface5g/blob/develop/openair1/PHY/CODING/coding_load.c#L113)
|
||||
* device and transport initialization code: [function `load_lib` in *radio/COMMON/__common_lib.c__* ](./../../../radio/COMMON/common_lib.c#L91)
|
||||
* turbo encoder and decoder initialization: [function `load_codinglib`in *openair1/PHY/CODING/__coding_load.c__*](./../../../develop/openair1/PHY/CODING/coding_load.c#L113)
|
||||
|
||||
[loader home page](../loader.md)
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@ cd cmake_targets/
|
||||
```
|
||||
|
||||
- The `-I` option is to install pre-requisites, you only need it the first time you build the softmodem or when some oai dependencies have changed.
|
||||
- The `-w` option is to select the radio head support you want to include in your build. Radio head support is provided via a shared library, which is called the "oai device" The build script creates a soft link from `liboai_device.so` to the true device which will be used at run-time (here the USRP one,`liboai_usrpdevif.so` . USRP is the only hardware tested today in the Continuous Integration process. The RF simulator[RF simulator](../sdr/rfsimulator/README.md) is implemented as a specific device replacing RF hardware, it can be specifically built using `-w SIMU` option, but is also built during any softmodem build.
|
||||
- The `-w` option is to select the radio head support you want to include in your build. Radio head support is provided via a shared library, which is called the "oai device" The build script creates a soft link from `liboai_device.so` to the true device which will be used at run-time (here the USRP one,`liboai_usrpdevif.so` . USRP is the only hardware tested today in the Continuous Integration process. The RF simulator[RF simulator](../radio/rfsimulator/README.md) is implemented as a specific device replacing RF hardware, it can be specifically built using `-w SIMU` option, but is also built during any softmodem build.
|
||||
- `--eNB` is to build the `lte-softmodem` executable and all required shared libraries
|
||||
- `--gNB` is to build the `nr-softmodem` executable and all required shared libraries
|
||||
- `--UE` is to build the `lte-uesoftmodem` executable and all required shared libraries
|
||||
|
||||
+2
-2
@@ -23,7 +23,7 @@ It is planned to enhance this simulator with the following functionalities:
|
||||
- Support for multiple UE connections,each UE being a `lte-uesoftmodem` or `nr_uesoftmodem` instance.
|
||||
- Support for multiple eNodeB's or gNodeB's for hand-over tests
|
||||
|
||||
This is an easy use-case to setup and test, as no specific hardware is required. The [rfsimulator page](../sdr/rfsimulator/README.md ) contains the detailed documentation.
|
||||
This is an easy use-case to setup and test, as no specific hardware is required. The [rfsimulator page](../radio/rfsimulator/README.md ) contains the detailed documentation.
|
||||
|
||||
# L2 nFAPI Simulator
|
||||
|
||||
@@ -102,7 +102,7 @@ Some other useful paramters of the UE are
|
||||
|
||||
Instead of randomly generated payload, in the phy-test mode we can also inject/receive user-plane traffic over a TUN interface. This is the so-called noS1 mode.
|
||||
|
||||
This setup is described in the [rfsimulator page](../sdr/rfsimulator/README.md#5g-case). In theory this should also work with the real hardware target although this has yet to be tested.
|
||||
This setup is described in the [rfsimulator page](../radio/rfsimulator/README.md#5g-case). In theory this should also work with the real hardware target although this has yet to be tested.
|
||||
|
||||
## do-ra setup with OAI
|
||||
|
||||
|
||||
@@ -45,8 +45,8 @@
|
||||
#include "common/utils/load_module_shlib.h"
|
||||
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
|
||||
|
||||
#include "PHY/phy_vars.h"
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
|
||||
+2
-2
@@ -37,8 +37,8 @@
|
||||
#include "common/ran_context.h"
|
||||
#include "rt_profiling.h"
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
|
||||
#include "PHY/LTE_TRANSPORT/if4_tools.h"
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <unistd.h>
|
||||
|
||||
#include <sys/sysinfo.h>
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#undef MALLOC
|
||||
#include "assertions.h"
|
||||
#include "PHY/types.h"
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
|
||||
@@ -35,8 +35,8 @@
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
#include "common/utils/nr/nr_common.h"
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
#include "openair1/PHY/MODULATION/nr_modulation.h"
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,15 +1,15 @@
|
||||
oai_dfts_sse4: oai_dfts.c
|
||||
gcc -O3 -std=gnu99 -msse4.1 -o oai_dfts_sse4 oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/sdr/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
|
||||
gcc -O3 -std=gnu99 -msse4.1 -o oai_dfts_sse4 oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
|
||||
|
||||
oai_dfts_avx2: oai_dfts.c
|
||||
gcc -O2 -std=gnu99 -mavx2 -g -ggdb -o oai_dfts_avx2 oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/sdr/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
|
||||
gcc -O2 -std=gnu99 -mavx2 -g -ggdb -o oai_dfts_avx2 oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
|
||||
|
||||
oai_dfts_avx2.s: oai_dfts.c
|
||||
gcc -O2 -std=gnu99 -mavx2 -S oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/sdr/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
|
||||
gcc -O2 -std=gnu99 -mavx2 -S oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
|
||||
|
||||
|
||||
oai_dfts_sse4.s: oai_dfts.c
|
||||
gcc -O2 -std=gnu99 -msse4.1 -S oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/sdr/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
|
||||
gcc -O2 -std=gnu99 -msse4.1 -S oai_dfts.c time_meas.c ../../SIMULATION/TOOLS/taus.c $$OPENAIR_HOME/common/utils/backtrace.c -I$$OPENAIR_HOME -I$$OPENAIR1_DIR -I$$OPENAIR_TARGETS -I$$OPENAIR_TARGETS/COMMON -I$$OPENAIR_HOME/radio/COMMON -I$$OPENAIR2_DIR -I$$OPENAIR2_DIR/COMMON -I$$OPENAIR_HOME/common/utils -I$$OPENAIR_HOME/common/utils/T -I$$OPENAIR_HOME/common/utils/msc -I$$OPENAIR_HOME/nfapi/open-nFAPI/nfapi/public_inc -DMR_MAIN -DNB_ANTENNAS_RX=1 -lm -lpthread # -DD256STATS #-DD64STATS
|
||||
|
||||
|
||||
dft_cycles_avx2: oai_dfts_avx2
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <stdint.h>
|
||||
#include <openair1/PHY/impl_defs_top.h>
|
||||
#include <sdr/COMMON/common_lib.h>
|
||||
#include <radio/COMMON/common_lib.h>
|
||||
#include <executables/softmodem-common.h>
|
||||
#include <openair1/PHY/TOOLS/calibration_scope.h>
|
||||
|
||||
|
||||
@@ -128,7 +128,7 @@ static inline void* malloc16_clear( size_t size )
|
||||
#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
|
||||
#include <pthread.h>
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "openairinterface5g_limits.h"
|
||||
|
||||
#define NUM_DCI_MAX_NB_IoT 32
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
|
||||
#include "PHY/NR_UE_TRANSPORT/dci_nr.h"
|
||||
#include <pthread.h>
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "NR_IF_Module.h"
|
||||
|
||||
/// Context data structure for gNB subframe processing
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef __thread_NR_UE__
|
||||
#define __thread_NR_UE__
|
||||
#include <pthread.h>
|
||||
#include <sdr/COMMON/common_lib.h>
|
||||
#include <radio/COMMON/common_lib.h>
|
||||
/// Context data structure for RX/TX portion of subframe processing
|
||||
typedef struct {
|
||||
/// Component Carrier index
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#endif
|
||||
#include "SCHED/defs.h"
|
||||
#include "SCHED/vars.h"
|
||||
#include "sdr/COMMON/defs.h"
|
||||
#include "radio/COMMON/defs.h"
|
||||
#include "LAYER2/MAC/vars.h"
|
||||
|
||||
#ifdef XFORMS
|
||||
|
||||
@@ -63,7 +63,7 @@ softmodem_enb>
|
||||
|
||||
|
||||
|
||||
The [rfsimulator documentation](../../../../sdr/rfsimulator/README.md ) has also some specific information when using the channel simulation via this tool.
|
||||
The [rfsimulator documentation](../../../../radio/rfsimulator/README.md ) has also some specific information when using the channel simulation via this tool.
|
||||
|
||||
[channel simulation main page](channel_simulation.md)
|
||||
[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "SystemInformationBlockType2.h"
|
||||
|
||||
#include "PHY/phy_extern.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "common/config/config_userapi.h"
|
||||
#include "RRC_config_tools.h"
|
||||
#include "RRC_paramsvalues.h"
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
#include "LAYER2/MAC/mac_proto.h"
|
||||
#include "PHY/phy_extern.h"
|
||||
#include "PHY/INIT/phy_init.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "nfapi_vnf.h"
|
||||
#include "nfapi_pnf.h"
|
||||
#include "targets/RT/USER/lte-softmodem.h"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
// #include "LAYER2/MAC/extern.h"
|
||||
// #include "LAYER2/MAC/proto.h"
|
||||
#include "PHY/INIT/phy_init.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "nfapi_vnf.h"
|
||||
#include "nfapi_pnf.h"
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
#include "PHY/defs_common.h" // for PRACH_RESOURCES_t
|
||||
#include "PHY/LTE_TRANSPORT/transport_common.h"
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
|
||||
/** @defgroup _mac MAC
|
||||
* @ingroup _oai2
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
//#include "defs.h"
|
||||
#include "mac_proto.h"
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
//#undef MALLOC
|
||||
#include "assertions.h"
|
||||
#include "PHY/types.h"
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
#include <string.h>
|
||||
|
||||
/* Commmon */
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "COMMON/platform_constants.h"
|
||||
#include "common/ran_context.h"
|
||||
#include "collection/linear_alloc.h"
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
#include "LAYER2/MAC/mac_proto.h"
|
||||
#include "PHY/phy_extern.h"
|
||||
#include "PHY/INIT/phy_init.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "nfapi_vnf.h"
|
||||
#include "nfapi_pnf.h"
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
#include "openair2/RRC/NR_UE/rrc_vars.h"
|
||||
#include "openair2/GNB_APP/L1_nr_paramdef.h"
|
||||
#include "openair2/GNB_APP/gnb_paramdef.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#define MAX_IF_MODULES 100
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
#include "nfapi_interface.h"
|
||||
#include "platform_types.h"
|
||||
#include <common/utils/threadPool/thread-pool.h>
|
||||
#include <sdr/COMMON/common_lib.h>
|
||||
#include <radio/COMMON/common_lib.h>
|
||||
|
||||
|
||||
#define MAX_NUM_DL_PDU 100
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "openair2/PHY_INTERFACE/phy_stub_UE.h"
|
||||
#include "openair2/ENB_APP/L1_paramdef.h"
|
||||
#include "openair2/ENB_APP/enb_paramdef.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "common/config/config_load_configmodule.h"
|
||||
#include "common/config/config_userapi.h"
|
||||
#include <arpa/inet.h>
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
#include "LAYER2/MAC/mac_proto.h"
|
||||
#include "PHY/phy_extern.h"
|
||||
#include "PHY/INIT/phy_init.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "nfapi_vnf.h"
|
||||
#include "nfapi_pnf.h"
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "common/utils/system.h"
|
||||
#include "ori.h"
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
|
||||
typedef struct eutra_bandentry_s {
|
||||
int16_t band;
|
||||
@@ -21,7 +21,7 @@
|
||||
* contact@openairinterface.org
|
||||
*/
|
||||
|
||||
/** sdr/COMMON/record-player.h
|
||||
/** radio/COMMON/record-player.h
|
||||
*
|
||||
* \author: bruno.mongazon-cazavet@nokia-bell-labs.com
|
||||
*/
|
||||
@@ -19,7 +19,7 @@
|
||||
* contact@openairinterface.org
|
||||
*/
|
||||
|
||||
/*! \file sdr/ETHERNET/USERSPACE/LIB/if_defs.h
|
||||
/*! \file radio/ETHERNET/USERSPACE/LIB/if_defs.h
|
||||
* \brief
|
||||
* \author S. Sandeep Kumar, Raymond Knopp
|
||||
* \date 2016
|
||||
+1
-1
@@ -134,7 +134,7 @@ options for replay mode are:
|
||||
[PHY]I lte-softmodem prach_I0 = 0.0 dB
|
||||
[PHY]I ru thread max_I0 18, min_I0 12
|
||||
[HW]W ru thread iqplayer device terminating subframes replay after 5 iteration
|
||||
/usr/local/oai/develop/openairinterface5g/sdr/iqplayer/iqplayer_lib.c:222 trx_iqplayer_read() Exiting OAI softmodem: replay ended, triggering process termination
|
||||
/usr/local/oai/develop/openairinterface5g/radio/iqplayer/iqplayer_lib.c:222 trx_iqplayer_read() Exiting OAI softmodem: replay ended, triggering process termination
|
||||
```
|
||||
|
||||
## iq recorder and iq player implementation overview
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <openair1/SIMULATION/TOOLS/sim.h>
|
||||
#include <common/utils/telnetsrv/telnetsrv.h>
|
||||
#include <common/utils/load_module_shlib.h>
|
||||
#include <sdr/rfsimulator/rfsimulator.h>
|
||||
#include "rfsimulator.h"
|
||||
|
||||
/*
|
||||
Legacy study:
|
||||
@@ -34,7 +34,7 @@
|
||||
#include <common/utils/LOG/log.h>
|
||||
#include <common/config/config_userapi.h>
|
||||
#include <openair1/SIMULATION/TOOLS/sim.h>
|
||||
#include <sdr/rfsimulator/rfsimulator.h>
|
||||
#include "rfsimulator.h"
|
||||
|
||||
// Ziggurat
|
||||
static double wn[128],fn[128];
|
||||
@@ -51,7 +51,7 @@
|
||||
#include "openair1/PHY/defs_UE.h"
|
||||
#define CHANNELMOD_DYNAMICLOAD
|
||||
#include <openair1/SIMULATION/TOOLS/sim.h>
|
||||
#include <sdr/rfsimulator/rfsimulator.h>
|
||||
#include "rfsimulator.h"
|
||||
|
||||
#define PORT 4043 //default TCP port for this simulator
|
||||
#define CirSize 6144000 // 100ms is enough
|
||||
@@ -792,11 +792,11 @@ INPUT = $(OPENAIR1_DIR)/PHY/defs.h \
|
||||
$(OPENAIR2_DIR)/LAYER2/RLC/UM_v9.3.0/rlc_um.h \
|
||||
$(OPENAIR2_DIR)/LAYER2/RLC/UM_v9.3.0/rlc_um_entity.h \
|
||||
$(OPENAIR2_DIR)/NETWORK_DRIVER/MESH/proto_extern.h \
|
||||
$(OPENAIR_DIR)/sdr/COMMON/common_lib.h \
|
||||
$(OPENAIR_DIR)/sdr/USRP/USERSPACE/LIB/usrp_lib.cpp \
|
||||
$(OPENAIR_DIR)/sdr/BLADERF/USERSPACE/LIB/bladerf_lib.c \
|
||||
$(OPENAIR_DIR)/sdr/BLADERF/USERSPACE/LIB/bladerf_lib.h \
|
||||
$(OPENAIR_DIR)/sdr/LMSSDR/USERSPACE/LIB/lms_lib.cpp
|
||||
$(OPENAIR_DIR)/radio/COMMON/common_lib.h \
|
||||
$(OPENAIR_DIR)/radio/USRP/USERSPACE/LIB/usrp_lib.cpp \
|
||||
$(OPENAIR_DIR)/radio/BLADERF/USERSPACE/LIB/bladerf_lib.c \
|
||||
$(OPENAIR_DIR)/radio/BLADERF/USERSPACE/LIB/bladerf_lib.h \
|
||||
$(OPENAIR_DIR)/radio/LMSSDR/USERSPACE/LIB/lms_lib.cpp
|
||||
|
||||
# This tag can be used to specify the character encoding of the source files
|
||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
|
||||
@@ -58,8 +58,8 @@
|
||||
#include "SCHED/sched_common.h"
|
||||
#include "common/utils/LOG/log.h"
|
||||
#include "common/utils/LOG/vcd_signal_dumper.h"
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
|
||||
/* these variables have to be defined before including ENB_APP/enb_paramdef.h */
|
||||
static int DEFBANDS[] = {7};
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <sys/sysinfo.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
//#undef MALLOC
|
||||
#include "assertions.h"
|
||||
#include "PHY/types.h"
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
|
||||
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
|
||||
@@ -53,8 +53,8 @@
|
||||
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
|
||||
|
||||
|
||||
#include "sdr/COMMON/common_lib.h"
|
||||
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include "radio/COMMON/common_lib.h"
|
||||
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
|
||||
#include "PHY/LTE_TRANSPORT/if4_tools.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user