diff options
Diffstat (limited to 'host/lib/usrp/dboard_id.cpp')
-rw-r--r-- | host/lib/usrp/dboard_id.cpp | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/host/lib/usrp/dboard_id.cpp b/host/lib/usrp/dboard_id.cpp index fa12c2a4c..38a7ae8f7 100644 --- a/host/lib/usrp/dboard_id.cpp +++ b/host/lib/usrp/dboard_id.cpp @@ -6,41 +6,52 @@ // #include <uhd/usrp/dboard_id.hpp> -#include <boost/lexical_cast.hpp> #include <boost/format.hpp> -#include <sstream> +#include <boost/lexical_cast.hpp> #include <iostream> +#include <sstream> using namespace uhd::usrp; -dboard_id_t::dboard_id_t(uint16_t id){ +dboard_id_t::dboard_id_t(uint16_t id) +{ _id = id; } -dboard_id_t dboard_id_t::none(void){ +dboard_id_t dboard_id_t::none(void) +{ return dboard_id_t(); } -dboard_id_t dboard_id_t::from_uint16(uint16_t uint16){ +dboard_id_t dboard_id_t::from_uint16(uint16_t uint16) +{ return dboard_id_t(uint16); } -uint16_t dboard_id_t::to_uint16(void) const{ +uint16_t dboard_id_t::to_uint16(void) const +{ return _id; } -//used with lexical cast to parse a hex string -template <class T> struct to_hex{ +// used with lexical cast to parse a hex string +template <class T> +struct to_hex +{ T value; - operator T() const {return value;} - friend std::istream& operator>>(std::istream& in, to_hex& out){ + operator T() const + { + return value; + } + friend std::istream& operator>>(std::istream& in, to_hex& out) + { in >> std::hex >> out.value; return in; } }; -dboard_id_t dboard_id_t::from_string(const std::string &string){ - if (string.substr(0, 2) == "0x"){ +dboard_id_t dboard_id_t::from_string(const std::string& string) +{ + if (string.substr(0, 2) == "0x") { std::stringstream interpreter(string); to_hex<uint16_t> hh; interpreter >> hh; @@ -49,13 +60,15 @@ dboard_id_t dboard_id_t::from_string(const std::string &string){ return dboard_id_t::from_uint16(boost::lexical_cast<uint16_t>(string)); } -std::string dboard_id_t::to_string(void) const{ +std::string dboard_id_t::to_string(void) const +{ return str(boost::format("0x%04x") % this->to_uint16()); } -//Note: to_pp_string is implemented in the dboard manager -//because it needs access to the dboard registration table +// Note: to_pp_string is implemented in the dboard manager +// because it needs access to the dboard registration table -bool uhd::usrp::operator==(const dboard_id_t &lhs, const dboard_id_t &rhs){ +bool uhd::usrp::operator==(const dboard_id_t& lhs, const dboard_id_t& rhs) +{ return lhs.to_uint16() == rhs.to_uint16(); } |