aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp_clock/octoclock/octoclock_impl.cpp
diff options
context:
space:
mode:
authorBen Hilburn <ben.hilburn@ettus.com>2014-11-03 17:05:26 -0800
committerMartin Braun <martin.braun@ettus.com>2014-11-21 00:16:47 +0100
commitbeabf3d302a98a0a1e28ae8cc4d338f0bd13db6e (patch)
treee2b7ab145ec2daa83c4589e96b0f67bc5a3fd38d /host/lib/usrp_clock/octoclock/octoclock_impl.cpp
parent3407376f8af0fc39f29c1c8ce9020d02a2bf05d9 (diff)
downloaduhd-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_clock/octoclock/octoclock_impl.cpp')
-rw-r--r--host/lib/usrp_clock/octoclock/octoclock_impl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp
index 8c207dd9f..d55fab10e 100644
--- a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp
+++ b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp
@@ -33,7 +33,7 @@
#include <uhd/usrp/gps_ctrl.hpp>
#include <uhd/usrp_clock/octoclock_eeprom.hpp>
#include <uhd/utils/byteswap.hpp>
-#include <uhd/utils/images.hpp>
+#include <uhd/utils/paths.hpp>
#include <uhd/utils/msg.hpp>
#include <uhd/utils/paths.hpp>
#include <uhd/utils/static.hpp>
@@ -420,7 +420,7 @@ std::string octoclock_impl::_get_images_help_message(const std::string &addr){
catch(const std::exception &e){
return str(boost::format("Could not find %s in your images path.\n%s")
% image_name
- % uhd::print_images_error());
+ % uhd::print_utility_error("uhd_images_downloader.py"));
}
//Get escape character
@@ -433,5 +433,5 @@ std::string octoclock_impl::_get_images_help_message(const std::string &addr){
//Get burner command
const std::string burner_path = (fs::path(uhd::get_pkg_path()) / "bin" / "octoclock_firmware_burner").string();
const std::string burner_cmd = str(boost::format("%s %s--addr=\"%s\"") % burner_path % ml % addr);
- return str(boost::format("%s\n%s") % uhd::print_images_error() % burner_cmd);
+ return str(boost::format("%s\n%s") % uhd::print_utility_error("uhd_images_downloader.py") % burner_cmd);
}