diff options
author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-03-26 08:54:57 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-03-27 14:44:26 -0700 |
commit | 988c597026551dfcfbb60aaf32d291bb90d0ce93 (patch) | |
tree | a6495faf47016d5cdd829ea85bf1320941533c88 /host/lib/usrp_clock/octoclock | |
parent | 715f4dd313656f936e40b6415179b7ab6feda128 (diff) | |
download | uhd-988c597026551dfcfbb60aaf32d291bb90d0ce93.tar.gz uhd-988c597026551dfcfbb60aaf32d291bb90d0ce93.tar.bz2 uhd-988c597026551dfcfbb60aaf32d291bb90d0ce93.zip |
Consolidated byte_vector common code into single file
Diffstat (limited to 'host/lib/usrp_clock/octoclock')
-rw-r--r-- | host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp b/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp index 93c317191..49d1a0442 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp +++ b/host/lib/usrp_clock/octoclock/octoclock_eeprom.cpp @@ -1,5 +1,5 @@ // -// Copyright 2014 Ettus Research LLC +// Copyright 2014-2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include <uhd/usrp_clock/octoclock_eeprom.hpp> #include <uhd/transport/udp_simple.hpp> #include <uhd/usrp/mboard_eeprom.hpp> +#include <uhd/types/byte_vector.hpp> #include <uhd/types/mac_addr.hpp> #include <uhd/utils/byteswap.hpp> #include <boost/assign/list_of.hpp> @@ -37,26 +38,6 @@ using namespace uhd::usrp_clock; using namespace uhd::transport; /*********************************************************************** - * Utility functions - **********************************************************************/ - -//! A wrapper around std::copy that takes ranges instead of iterators. -template<typename RangeSrc, typename RangeDst> inline -void byte_copy(const RangeSrc &src, RangeDst &dst){ - std::copy(boost::begin(src), boost::end(src), boost::begin(dst)); -} - -//! create a string from a byte vector, return empty if invalid ascii -static const std::string bytes_to_string(const byte_vector_t &bytes){ - std::string out; - BOOST_FOREACH(boost::uint8_t byte, bytes){ - if (byte < 32 or byte > 127) return out; - out += byte; - } - return out; -} - -/*********************************************************************** * Implementation **********************************************************************/ void octoclock_eeprom_t::_load(){ |