diff options
author | Josh Blum <josh@joshknows.com> | 2010-05-02 04:28:50 +0000 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-05-02 04:28:50 +0000 |
commit | 6ec2883fcd3e0b2765c63f2e96e155d52248bf89 (patch) | |
tree | 123181b29494d3c26ad96f9df65a718def9a65d8 /host/utils | |
parent | 3a8577aeb3c76dce0d0dcf0c9c7ce8d9aaf0a1d8 (diff) | |
parent | be97b68ba230e16b513e5a0310aded49f4b2dcb4 (diff) | |
download | uhd-6ec2883fcd3e0b2765c63f2e96e155d52248bf89.tar.gz uhd-6ec2883fcd3e0b2765c63f2e96e155d52248bf89.tar.bz2 uhd-6ec2883fcd3e0b2765c63f2e96e155d52248bf89.zip |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/utils')
-rw-r--r-- | host/utils/uhd_burn_db_eeprom.cpp | 8 | ||||
-rw-r--r-- | host/utils/uhd_find_devices.cpp | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/host/utils/uhd_burn_db_eeprom.cpp b/host/utils/uhd_burn_db_eeprom.cpp index c07b43f16..dfd9decba 100644 --- a/host/utils/uhd_burn_db_eeprom.cpp +++ b/host/utils/uhd_burn_db_eeprom.cpp @@ -24,11 +24,9 @@ #include <uhd/usrp/mboard_props.hpp> #include <uhd/usrp/dboard_props.hpp> #include <boost/program_options.hpp> -#include <boost/lexical_cast.hpp> #include <boost/format.hpp> #include <boost/assign.hpp> #include <iostream> -#include <sstream> using namespace uhd; using namespace uhd::usrp; @@ -89,14 +87,14 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ if (vm.count("id") == 0){ std::cout << boost::format("Getting dbid on %s dboard...") % prefix << std::endl; dboard_id_t id = dboard[DBOARD_PROP_DBOARD_ID].as<dboard_id_t>(); - std::cout << boost::format(" Current dbid: %s") % dboard_id::to_string(id) << std::endl; + std::cout << boost::format(" Current dbid: %s") % id.to_pp_string() << std::endl; } //write a new dboard id to eeprom else{ - dboard_id_t id = boost::lexical_cast<to_hex<dboard_id_t> >(vm["id"].as<std::string>()); + dboard_id_t id = dboard_id_t::from_string(vm["id"].as<std::string>()); std::cout << boost::format("Setting dbid on %s dboard...") % prefix << std::endl; - std::cout << boost::format(" New dbid: %s") % dboard_id::to_string(id) << std::endl; + std::cout << boost::format(" New dbid: %s") % id.to_pp_string() << std::endl; dboard[DBOARD_PROP_DBOARD_ID] = id; } diff --git a/host/utils/uhd_find_devices.cpp b/host/utils/uhd_find_devices.cpp index 69e550fd4..b778eeb68 100644 --- a/host/utils/uhd_find_devices.cpp +++ b/host/utils/uhd_find_devices.cpp @@ -52,7 +52,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::cout << "--------------------------------------------------" << std::endl; std::cout << "-- UHD Device " << i << std::endl; std::cout << "--------------------------------------------------" << std::endl; - std::cout << device_addrs[i].to_string() << std::endl << std::endl; + std::cout << device_addrs[i].to_pp_string() << std::endl << std::endl; //uhd::device::make(device_addrs[i]); //test make } |