diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-28 22:10:10 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-28 22:10:10 +0100 |
| commit | db3fac73beb30ceaaf6a275d9668a38af3b839f5 (patch) | |
| tree | d0713571a7a4d14d38c4d6c59337e6fbfca1f4a1 /host/lib/usrp/e300 | |
| parent | 156c21206e8bccf4b5680a62c28a7dc7544aa9be (diff) | |
| parent | 75d519706b9b0956307a6a4bdc53c36376f19f03 (diff) | |
| download | uhd-db3fac73beb30ceaaf6a275d9668a38af3b839f5.tar.gz uhd-db3fac73beb30ceaaf6a275d9668a38af3b839f5.tar.bz2 uhd-db3fac73beb30ceaaf6a275d9668a38af3b839f5.zip | |
Merge paths-fix branch into maint.
Diffstat (limited to 'host/lib/usrp/e300')
| -rw-r--r-- | host/lib/usrp/e300/e300_impl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_network.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp index 0c112fdb1..ac6294d5a 100644 --- a/host/lib/usrp/e300/e300_impl.cpp +++ b/host/lib/usrp/e300/e300_impl.cpp @@ -28,7 +28,7 @@ #include <uhd/utils/msg.hpp> #include <uhd/utils/log.hpp> #include <uhd/utils/static.hpp> -#include <uhd/utils/images.hpp> +#include <uhd/utils/paths.hpp> #include <uhd/usrp/dboard_eeprom.hpp> #include <uhd/transport/if_addrs.hpp> #include <uhd/transport/udp_zero_copy.hpp> @@ -397,7 +397,7 @@ e300_impl::e300_impl(const uhd::device_addr_t &device_addr) "%s" ) % fpga::COMPAT_MAJOR % _get_version(FPGA_MAJOR) % _get_version(FPGA_MINOR) - % print_images_error())); + % print_utility_error("uhd_images_downloader.py"))); } //////////////////////////////////////////////////////////////////// diff --git a/host/lib/usrp/e300/e300_network.cpp b/host/lib/usrp/e300/e300_network.cpp index 2c37f2ff1..bb904773b 100644 --- a/host/lib/usrp/e300/e300_network.cpp +++ b/host/lib/usrp/e300/e300_network.cpp @@ -33,7 +33,7 @@ #include <uhd/utils/msg.hpp> #include <uhd/utils/byteswap.hpp> -#include <uhd/utils/images.hpp> +#include <uhd/utils/paths.hpp> #include <boost/asio.hpp> #include <boost/thread.hpp> |