diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-11-03 17:05:26 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-11-21 00:16:47 +0100 |
| commit | beabf3d302a98a0a1e28ae8cc4d338f0bd13db6e (patch) | |
| tree | e2b7ab145ec2daa83c4589e96b0f67bc5a3fd38d /host/lib/usrp/e300 | |
| parent | 3407376f8af0fc39f29c1c8ce9020d02a2bf05d9 (diff) | |
| download | uhd-beabf3d302a98a0a1e28ae8cc4d338f0bd13db6e.tar.gz uhd-beabf3d302a98a0a1e28ae8cc4d338f0bd13db6e.tar.bz2 uhd-beabf3d302a98a0a1e28ae8cc4d338f0bd13db6e.zip | |
uhd: replaced the `images_error` with a generic utility error
- Deleted images.*, moved functionality to paths.*
- Applies for all devices that check FPGA or FW compat numbers
- Adds generic utility search tool
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 e42ac390e..8807a56e4 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 883ff0c4f..59e1eec86 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> |