aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/e300
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2015-08-10 10:25:15 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2015-08-10 11:01:43 -0700
commit377850c9699331a24650a8bc41142627f3ab4330 (patch)
tree3d8cd936f3413c059a84e8f3d0ea4d9adc564179 /host/lib/usrp/e300
parent8c0731276af9c82f9419ec16334ec919d0414fc0 (diff)
downloaduhd-377850c9699331a24650a8bc41142627f3ab4330.tar.gz
uhd-377850c9699331a24650a8bc41142627f3ab4330.tar.bz2
uhd-377850c9699331a24650a8bc41142627f3ab4330.zip
e300: added -DE300_FORCE_NETWORK flag to CMake configuration
* Fixes building E300 support in native mode on any Linux system with libudev headers * Added E300_NATIVE check to e300_common.cpp * Improved network mode documentation
Diffstat (limited to 'host/lib/usrp/e300')
-rw-r--r--host/lib/usrp/e300/CMakeLists.txt4
-rw-r--r--host/lib/usrp/e300/e300_common.cpp16
2 files changed, 18 insertions, 2 deletions
diff --git a/host/lib/usrp/e300/CMakeLists.txt b/host/lib/usrp/e300/CMakeLists.txt
index 26e34294a..ae817c620 100644
--- a/host/lib/usrp/e300/CMakeLists.txt
+++ b/host/lib/usrp/e300/CMakeLists.txt
@@ -42,14 +42,14 @@ IF(ENABLE_E300)
${CMAKE_CURRENT_SOURCE_DIR}/e300_remote_codec_ctrl.cpp
)
LIBUHD_APPEND_SOURCES(${E300_SOURCES})
- IF(UDEV_FOUND)
+ IF(UDEV_FOUND AND NOT E300_FORCE_NETWORK)
INCLUDE_DIRECTORIES(${UDEV_INCLUDE_DIR})
LIBUHD_APPEND_LIBS(${UDEV_LIBS})
SET_SOURCE_FILES_PROPERTIES(
${E300_SOURCES}
PROPERTIES COMPILE_DEFINITIONS "E300_NATIVE=1"
)
- ENDIF(UDEV_FOUND)
+ ENDIF(UDEV_FOUND AND NOT E300_FORCE_NETWORK)
IF(ENABLE_GPSD)
SET_SOURCE_FILES_PROPERTIES(
diff --git a/host/lib/usrp/e300/e300_common.cpp b/host/lib/usrp/e300/e300_common.cpp
index 29117e21f..216713bc6 100644
--- a/host/lib/usrp/e300/e300_common.cpp
+++ b/host/lib/usrp/e300/e300_common.cpp
@@ -29,6 +29,7 @@
#include <fstream>
#include <string>
+#ifdef E300_NATIVE
namespace uhd { namespace usrp { namespace e300 {
namespace common {
@@ -90,3 +91,18 @@ UHD_STATIC_BLOCK(register_e300_image_loader) {
}
}}}
+
+#else
+namespace uhd { namespace usrp { namespace e300 {
+
+namespace common {
+
+void load_fpga_image(const std::string&)
+{
+ throw uhd::assertion_error("load_fpga_image() !E300_NATIVE");
+}
+
+}
+
+}}}
+#endif