From 4c7a66cfa0b84955fcd34b0e356c1141b21a7e17 Mon Sep 17 00:00:00 2001
From: Nick Foster <nick@nerdnetworks.org>
Date: Tue, 31 Aug 2010 17:52:10 -0700
Subject: Added serial number read. Renamed the usrp1-specific utilities.

---
 host/lib/usrp/usrp1/mboard_impl.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'host/lib')

diff --git a/host/lib/usrp/usrp1/mboard_impl.cpp b/host/lib/usrp/usrp1/mboard_impl.cpp
index 8555577f5..a90532cb8 100644
--- a/host/lib/usrp/usrp1/mboard_impl.cpp
+++ b/host/lib/usrp/usrp1/mboard_impl.cpp
@@ -30,6 +30,7 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
+#include <boost/thread/thread.hpp>
 #include <iostream>
 
 using namespace uhd;
@@ -251,6 +252,20 @@ void usrp1_impl::mboard_get(const wax::obj &key_, wax::obj &val)
 {
     named_prop_t key = named_prop_t::extract(key_);
 
+    if(key_.type() == typeid(std::string)) {
+      if(key.as<std::string>() == "serial") {
+        uhd::byte_vector_t buf;
+        buf.insert(buf.begin(), 248);
+        boost::this_thread::sleep(boost::posix_time::milliseconds(100));
+        _iface->write_i2c(I2C_DEV_EEPROM, buf);
+        boost::this_thread::sleep(boost::posix_time::milliseconds(100));
+        buf = _iface->read_i2c(I2C_DEV_EEPROM, 8);
+        val = std::string(buf.begin(), buf.end());
+      }
+
+      return;
+   	}
+
     //handle the get request conditioned on the key
     switch(key.as<mboard_prop_t>()){
     case MBOARD_PROP_NAME:
-- 
cgit v1.2.3


From ce3a95dbefa8528354301529eeb30957412d9b9f Mon Sep 17 00:00:00 2001
From: Nick Foster <nick@nerdnetworks.org>
Date: Tue, 31 Aug 2010 18:01:36 -0700
Subject: Removed USRP1 firmware path debug messages

---
 host/lib/usrp/usrp1/usrp1_impl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp
index a18b697fb..a6806dbc3 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.cpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp
@@ -69,7 +69,7 @@ static device_addrs_t usrp1_find(const device_addr_t &hint)
         );
         return usrp1_addrs;
     }
-    std::cout << "USRP1 firmware image: " << usrp1_fw_image << std::endl;
+    //std::cout << "USRP1 firmware image: " << usrp1_fw_image << std::endl;
 
     boost::uint16_t vid = hint.has_key("uninit") ? FX2_VENDOR_ID : USRP1_VENDOR_ID;
     boost::uint16_t pid = hint.has_key("uninit") ? FX2_PRODUCT_ID : USRP1_PRODUCT_ID;
@@ -111,7 +111,7 @@ static device::sptr usrp1_make(const device_addr_t &device_addr)
     std::string usrp1_fpga_image = find_image_path(
         device_addr.has_key("fpga")? device_addr["fpga"] : "usrp1_fpga.rbf"
     );
-    std::cout << "USRP1 FPGA image: " << usrp1_fpga_image << std::endl;
+    //std::cout << "USRP1 FPGA image: " << usrp1_fpga_image << std::endl;
 
     //try to match the given device address with something on the USB bus
     std::vector<usb_device_handle::sptr> device_list =
-- 
cgit v1.2.3