1 files changed, 57 insertions, 7 deletions

diff --git a/host/lib/usrp/dboard_eeprom.cpp b/host/lib/usrp/dboard_eeprom.cpp
index fa3631948..c47390bf8 100644
--- a/host/lib/usrp/dboard_eeprom.cpp
+++ b/host/lib/usrp/dboard_eeprom.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2011 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
@@ -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
@@ -68,7 +95,14 @@ static boost::uint8_t checksum(const byte_vector_t &bytes){
     return boost::uint8_t(sum);
 }
 
-dboard_eeprom_t::dboard_eeprom_t(const byte_vector_t &bytes){
+dboard_eeprom_t::dboard_eeprom_t(void){
+    id = dboard_id_t::none();
+    serial = "";
+}
+
+void dboard_eeprom_t::load(i2c_iface &iface, boost::uint8_t addr){
+    byte_vector_t bytes = iface.read_eeprom(addr, 0, DB_EEPROM_CLEN);
+
     if (_dboard_eeprom_debug){
         for (size_t i = 0; i < bytes.size(); i++){
             std::cout << boost::format(
@@ -76,28 +110,44 @@ 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){
+void dboard_eeprom_t::store(i2c_iface &iface, boost::uint8_t addr){
     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;
-}
 
-size_t dboard_eeprom_t::num_bytes(void){
-    return DB_EEPROM_CLEN;
+    iface.write_eeprom(addr, 0, bytes);
 }