uhd: added 9 byte serial to dboard eeprom class

4 files changed, 59 insertions, 20 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.
diff --git a/host/lib/usrp/dboard_eeprom.cpp b/host/lib/usrp/dboard_eeprom.cpp
index fa3631948..60d13548a 100644
--- a/host/lib/usrp/dboard_eeprom.cpp
+++ b/host/lib/usrp/dboard_eeprom.cpp
@@ -18,6 +18,7 @@
 #include <uhd/usrp/dboard_eeprom.hpp>
 #include <uhd/utils/assert.hpp>
 #include <boost/format.hpp>
+#include <algorithm>
 #include <iostream>
 
 using namespace uhd;
@@ -25,6 +26,30 @@ using namespace uhd::usrp;
 
 static const bool _dboard_eeprom_debug = false;
 
+/***********************************************************************
+ * Utility functions
+ **********************************************************************/
+
+//! 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;
+}
+
+//! create a byte vector from a string, null terminate unless max length
+static const byte_vector_t string_to_bytes(const std::string &string, size_t max_length){
+    byte_vector_t bytes;
+    for (size_t i = 0; i < std::min(string.size(), max_length); i++){
+        bytes.push_back(string[i]);
+    }
+    if (bytes.size() < max_length - 1) bytes.push_back('\0');
+    return bytes;
+}
+
 ////////////////////////////////////////////////////////////////////////
 // format of daughterboard EEPROM
 // 00: 0xDB code for ``I'm a daughterboard''
@@ -49,6 +74,8 @@ static const bool _dboard_eeprom_debug = false;
 #define DB_EEPROM_OFFSET_0_MSB  0x06
 #define DB_EEPROM_OFFSET_1_LSB  0x07 // offset correction for ADC or DAC 1
 #define DB_EEPROM_OFFSET_1_MSB  0x08
+#define DB_EEPROM_SERIAL        0x09
+#define DB_EEPROM_SERIAL_LEN    0x09 //9 ASCII characters
 #define DB_EEPROM_CHKSUM        0x1f
 
 #define DB_EEPROM_CLEN          0x20 // length of common portion of eeprom
@@ -76,24 +103,43 @@ dboard_eeprom_t::dboard_eeprom_t(const byte_vector_t &bytes){
             ) << std::endl;
         }
     }
+
     try{
         UHD_ASSERT_THROW(bytes.size() >= DB_EEPROM_CLEN);
         UHD_ASSERT_THROW(bytes[DB_EEPROM_MAGIC] == DB_EEPROM_MAGIC_VALUE);
         UHD_ASSERT_THROW(bytes[DB_EEPROM_CHKSUM] == checksum(bytes));
+
+        //parse the ids
         id = dboard_id_t::from_uint16(0
             | (boost::uint16_t(bytes[DB_EEPROM_ID_LSB]) << 0)
             | (boost::uint16_t(bytes[DB_EEPROM_ID_MSB]) << 8)
         );
+
+        //parse the serial
+        serial = bytes_to_string(
+            byte_vector_t(&bytes.at(DB_EEPROM_SERIAL),
+            &bytes.at(DB_EEPROM_SERIAL+DB_EEPROM_SERIAL_LEN))
+        );
+
     }catch(const uhd::assert_error &){
         id = dboard_id_t::none();
+        serial = "";
     }
 }
 
 byte_vector_t dboard_eeprom_t::get_eeprom_bytes(void){
     byte_vector_t bytes(DB_EEPROM_CLEN, 0); //defaults to all zeros
     bytes[DB_EEPROM_MAGIC] = DB_EEPROM_MAGIC_VALUE;
+
+    //load the id bytes
     bytes[DB_EEPROM_ID_LSB] = boost::uint8_t(id.to_uint16() >> 0);
     bytes[DB_EEPROM_ID_MSB] = boost::uint8_t(id.to_uint16() >> 8);
+
+    //load the serial bytes
+    byte_vector_t ser_bytes = string_to_bytes(serial, DB_EEPROM_SERIAL_LEN);
+    std::copy(ser_bytes.begin(), ser_bytes.end(), &bytes.at(DB_EEPROM_SERIAL));
+
+    //load the checksum
     bytes[DB_EEPROM_CHKSUM] = checksum(bytes);
     return bytes;
 }
diff --git a/host/lib/usrp/mboard_eeprom.cpp b/host/lib/usrp/mboard_eeprom.cpp
index f7f4b2c68..c90f4a2db 100644
--- a/host/lib/usrp/mboard_eeprom.cpp
+++ b/host/lib/usrp/mboard_eeprom.cpp
@@ -17,12 +17,12 @@
 
 #include <uhd/usrp/mboard_eeprom.hpp>
 #include <uhd/types/mac_addr.hpp>
-#include <uhd/utils/algorithm.hpp>
 #include <uhd/utils/byteswap.hpp>
 #include <boost/asio/ip/address_v4.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>
+#include <algorithm>
 #include <cstddef>
 
 using namespace uhd;
@@ -38,6 +38,12 @@ static const size_t NAME_MAX_LEN = 32 - SERIAL_LEN;
  * 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;
@@ -84,7 +90,7 @@ static void load_n100(mboard_eeprom_t &mb_eeprom, i2c_iface &iface){
     )).to_string();
 
     boost::asio::ip::address_v4::bytes_type ip_addr_bytes;
-    std::copy(iface.read_eeprom(N100_EEPROM_ADDR, USRP_N100_OFFSETS["ip-addr"], 4), ip_addr_bytes);
+    byte_copy(iface.read_eeprom(N100_EEPROM_ADDR, USRP_N100_OFFSETS["ip-addr"], 4), ip_addr_bytes);
     mb_eeprom["ip-addr"] = boost::asio::ip::address_v4(ip_addr_bytes).to_string();
 
     //extract the serial
@@ -126,7 +132,7 @@ static void store_n100(const mboard_eeprom_t &mb_eeprom, i2c_iface &iface){
 
     if (mb_eeprom.has_key("ip-addr")){
         byte_vector_t ip_addr_bytes(4);
-        std::copy(boost::asio::ip::address_v4::from_string(mb_eeprom["ip-addr"]).to_bytes(), ip_addr_bytes);
+        byte_copy(boost::asio::ip::address_v4::from_string(mb_eeprom["ip-addr"]).to_bytes(), ip_addr_bytes);
         iface.write_eeprom(N100_EEPROM_ADDR, USRP_N100_OFFSETS["ip-addr"], ip_addr_bytes);
     }