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/usrp1 | |
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/usrp1')
-rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 709092e42..dbd5408e8 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -23,7 +23,7 @@ #include <uhd/utils/cast.hpp> #include <uhd/exception.hpp> #include <uhd/utils/static.hpp> -#include <uhd/utils/images.hpp> +#include <uhd/utils/paths.hpp> #include <boost/format.hpp> #include <boost/assign/list_of.hpp> #include <boost/filesystem.hpp> @@ -85,7 +85,7 @@ static device_addrs_t usrp1_find(const device_addr_t &hint) usrp1_fw_image = find_image_path(hint.get("fw", "usrp1_fw.ihx")); } catch(...){ - UHD_MSG(warning) << boost::format("Could not locate USRP1 firmware. %s") % print_images_error(); + UHD_MSG(warning) << boost::format("Could not locate USRP1 firmware. %s") % print_utility_error("uhd_images_downloader.py"); } UHD_LOG << "USRP1 firmware image: " << usrp1_fw_image << std::endl; |