diff options
author | Josh Blum <josh@joshknows.com> | 2011-02-22 10:19:09 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-02-22 10:19:09 -0800 |
commit | 814a5c40c6fbaedba3dafabbe30d00a05af6a274 (patch) | |
tree | 79bd05d506e6e0366c729b56cc3b37d734a0aebe /host/include | |
parent | a8bb5ec900d8f2d3d2f274a921d19b564c668323 (diff) | |
download | uhd-814a5c40c6fbaedba3dafabbe30d00a05af6a274.tar.gz uhd-814a5c40c6fbaedba3dafabbe30d00a05af6a274.tar.bz2 uhd-814a5c40c6fbaedba3dafabbe30d00a05af6a274.zip |
uhd: added 9 byte serial to dboard eeprom class
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/usrp/dboard_eeprom.hpp | 7 | ||||
-rw-r--r-- | host/include/uhd/utils/algorithm.hpp | 14 |
2 files changed, 4 insertions, 17 deletions
diff --git a/host/include/uhd/usrp/dboard_eeprom.hpp b/host/include/uhd/usrp/dboard_eeprom.hpp index 108027b46..bbad0eee4 100644 --- a/host/include/uhd/usrp/dboard_eeprom.hpp +++ b/host/include/uhd/usrp/dboard_eeprom.hpp @@ -26,11 +26,12 @@ namespace uhd{ namespace usrp{ struct UHD_API dboard_eeprom_t{ - /*! - * The dboard id that was read from eeprom or will be set to eeprom. - */ + //! The ID for the daughterboard type dboard_id_t id; + //! The unique serial number + std::string serial; + /*! * Create a dboard eeprom struct from the bytes read out of eeprom. * The constructor will parse out the dboard id from a vector of bytes. diff --git a/host/include/uhd/utils/algorithm.hpp b/host/include/uhd/utils/algorithm.hpp index 5e2230371..d3a07db96 100644 --- a/host/include/uhd/utils/algorithm.hpp +++ b/host/include/uhd/utils/algorithm.hpp @@ -30,20 +30,6 @@ namespace std{ /*! - * A wrapper around std::copy that takes ranges instead of iterators. - * - * Copy the elements of the source range into the destination range. - * The destination range should be at least as large as the source range. - * - * \param src the range of elements to copy from - * \param dst the range of elements to be filled - */ - template<typename RangeSrc, typename RangeDst> inline - void copy(const RangeSrc &src, RangeDst &dst){ - std::copy(boost::begin(src), boost::end(src), boost::begin(dst)); - } - - /*! * A wrapper around std::sort that takes a range instead of an iterator. * * The elements are sorted into ascending order using the less-than operator. |