Merge branch 'usrp1' into next

4 files changed, 89 insertions, 3 deletions

diff --git a/host/lib/usrp/usrp1/mboard_impl.cpp b/host/lib/usrp/usrp1/mboard_impl.cpp
index 1409855cb..8555577f5 100644
--- a/host/lib/usrp/usrp1/mboard_impl.cpp
+++ b/host/lib/usrp/usrp1/mboard_impl.cpp
@@ -19,6 +19,7 @@
 #include "usrp_commands.h"
 #include "fpga_regs_standard.h"
 #include "fpga_regs_common.h"
+#include "usrp_i2c_addr.h"
 #include <uhd/usrp/misc_utils.hpp>
 #include <uhd/usrp/mboard_props.hpp>
 #include <uhd/usrp/dboard_props.hpp>
@@ -321,11 +322,18 @@ void usrp1_impl::mboard_set(const wax::obj &key, const wax::obj &val)
 {
     if(key.type() == typeid(std::string)) {
       if(key.as<std::string>() == "load_eeprom") {
-        std::string usrp1_fpga_image = val.as<std::string>();
-        std::cout << "USRP1 EEPROM image: " << usrp1_fpga_image << std::endl;
+        std::string usrp1_eeprom_image = val.as<std::string>();
+        std::cout << "USRP1 EEPROM image: " << usrp1_eeprom_image << std::endl;
         _ctrl_transport->usrp_load_eeprom(val.as<std::string>());
       }
 
+      if(key.as<std::string>() == "serial") {
+        std::string sernum = val.as<std::string>();
+        uhd::byte_vector_t buf(sernum.begin(), sernum.end());
+        buf.insert(buf.begin(), 248);
+        _iface->write_i2c(I2C_DEV_EEPROM, buf);
+      }
+
       return;
    	}
 
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index 9d788b06c..48f91aaa7 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -42,10 +42,14 @@ TARGET_LINK_LIBRARIES(usrp_burn_db_eeprom uhd)
 ADD_EXECUTABLE(usrp_init_eeprom usrp_init_eeprom.cpp)
 TARGET_LINK_LIBRARIES(usrp_init_eeprom uhd)
 
+ADD_EXECUTABLE(usrp_serial_burner usrp_serial_burner.cpp)
+TARGET_LINK_LIBRARIES(usrp_serial_burner uhd)
+
 INSTALL(TARGETS
     usrp2_addr_burner
     usrp_burn_db_eeprom
     usrp_init_eeprom
+    usrp_serial_burner
     RUNTIME DESTINATION ${PKG_DATA_DIR}/utils
 )
 
diff --git a/host/utils/usrp_init_eeprom.cpp b/host/utils/usrp_init_eeprom.cpp
index 28c7c5745..b05e400b1 100644
--- a/host/utils/usrp_init_eeprom.cpp
+++ b/host/utils/usrp_init_eeprom.cpp
@@ -28,7 +28,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     po::options_description desc("Allowed options");
     desc.add_options()
         ("help", "help message")
-        ("image", po::value<std::string>(), "IHX image file")
+        ("image", po::value<std::string>(), "BIN image file")
     ;
 
     po::variables_map vm;
diff --git a/host/utils/usrp_serial_burner.cpp b/host/utils/usrp_serial_burner.cpp
new file mode 100644
index 000000000..cdb6eff65
--- /dev/null
+++ b/host/utils/usrp_serial_burner.cpp
@@ -0,0 +1,74 @@
+//
+// Copyright 2010 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils/safe_main.hpp>
+#include <uhd/device.hpp>
+#include <uhd/usrp/device_props.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <iostream>
+
+namespace po = boost::program_options;
+
+int UHD_SAFE_MAIN(int argc, char *argv[]){
+    po::options_description desc("Allowed options");
+    desc.add_options()
+        ("help", "help message")
+        ("old", po::value<std::string>(), "old USRP serial number (optional)")
+        ("new", po::value<std::string>(), "new USRP serial number")
+    ;
+
+    po::variables_map vm;
+    po::store(po::parse_command_line(argc, argv, desc), vm);
+    po::notify(vm); 
+
+    //print the help message
+    if (vm.count("help")){
+        std::cout << boost::format("USRP serial burner %s") % desc << std::endl;
+        return ~0;
+    }
+
+    if(vm.count("new") == 0) {
+        std::cout << "error: must input --new arg" << std::endl;
+        return ~0;
+    }
+
+    //load the options into the address
+    uhd::device_addr_t device_addr;
+    device_addr["type"] = "usrp1";
+    if(vm.count("old")) device_addr["serial"] = vm["old"].as<std::string>();
+
+    //find and create a control transport to do the writing.
+
+    uhd::device_addrs_t found_addrs = uhd::device::find(device_addr);
+
+    if (found_addrs.size() == 0){
+        std::cerr << "No USRP devices found" << std::endl;
+        return ~0;
+    }
+
+    for (size_t i = 0; i < found_addrs.size(); i++){
+        uhd::device::sptr dev = uhd::device::make(found_addrs[i]);
+        wax::obj mb = (*dev)[uhd::usrp::DEVICE_PROP_MBOARD];
+        std::cout << "Writing serial number..." << std::endl;
+        mb[std::string("serial")] = vm["new"].as<std::string>();
+    }
+
+
+    std::cout << "Power-cycle the usrp for the changes to take effect." << std::endl;
+    return 0;
+}