Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p

Conflicts:
	host/lib/usrp/usrp2/CMakeLists.txt
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_regs.hpp

4 files changed, 163 insertions, 4 deletions

diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index c349a9018..a95864ca7 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -39,9 +39,17 @@ TARGET_LINK_LIBRARIES(usrp2_addr_burner uhd)
 ADD_EXECUTABLE(usrp_burn_db_eeprom usrp_burn_db_eeprom.cpp)
 TARGET_LINK_LIBRARIES(usrp_burn_db_eeprom uhd)
 
+ADD_EXECUTABLE(usrp1_init_eeprom usrp1_init_eeprom.cpp)
+TARGET_LINK_LIBRARIES(usrp1_init_eeprom uhd)
+
+ADD_EXECUTABLE(usrp1_serial_burner usrp1_serial_burner.cpp)
+TARGET_LINK_LIBRARIES(usrp1_serial_burner uhd)
+
 INSTALL(TARGETS
     usrp2_addr_burner
     usrp_burn_db_eeprom
+    usrp1_init_eeprom
+    usrp1_serial_burner
     RUNTIME DESTINATION ${PKG_DATA_DIR}/utils
 )
 
diff --git a/host/utils/usrp1_init_eeprom.cpp b/host/utils/usrp1_init_eeprom.cpp
new file mode 100644
index 000000000..b05e400b1
--- /dev/null
+++ b/host/utils/usrp1_init_eeprom.cpp
@@ -0,0 +1,69 @@
+//
+// 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")
+        ("image", po::value<std::string>(), "BIN image file")
+    ;
+
+    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 EEPROM initialization %s") % desc << std::endl;
+        return ~0;
+    }
+
+    //load the options into the address
+    uhd::device_addr_t device_addr;
+    device_addr["type"] = "usrp1";
+    device_addr["uninit"] = "yeah"; //tell find to look for an uninitialized FX2
+
+    //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 uninitialized USRP devices found" << std::endl;
+        return ~0;
+    }
+
+    for (size_t i = 0; i < found_addrs.size(); i++){
+        std::cout << "Writing EEPROM data..." << std::endl;
+        //uhd::device_addrs_t devs = uhd::device::find(found_addrs[i]);
+        uhd::device::sptr dev = uhd::device::make(found_addrs[i]);
+        wax::obj mb = (*dev)[uhd::usrp::DEVICE_PROP_MBOARD];
+        mb[std::string("load_eeprom")] = vm["image"].as<std::string>();
+    }
+
+
+    std::cout << "Power-cycle the usrp for the changes to take effect." << std::endl;
+    return 0;
+}
diff --git a/host/utils/usrp1_serial_burner.cpp b/host/utils/usrp1_serial_burner.cpp
new file mode 100644
index 000000000..bf7d3d3bb
--- /dev/null
+++ b/host/utils/usrp1_serial_burner.cpp
@@ -0,0 +1,75 @@
+//
+// 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 << "Reading back serial number: " << mb[std::string("serial")].as<std::string>() << std::endl;
+    }
+
+
+    std::cout << "Power-cycle the usrp for the changes to take effect." << std::endl;
+    return 0;
+}
diff --git a/host/utils/usrp_burn_db_eeprom.cpp b/host/utils/usrp_burn_db_eeprom.cpp
index db2981e87..64ecf75d6 100644
--- a/host/utils/usrp_burn_db_eeprom.cpp
+++ b/host/utils/usrp_burn_db_eeprom.cpp
@@ -19,6 +19,7 @@
 #include <uhd/utils/safe_main.hpp>
 #include <uhd/device.hpp>
 #include <uhd/types/dict.hpp>
+#include <uhd/utils/assert.hpp>
 #include <uhd/usrp/dboard_id.hpp>
 #include <uhd/usrp/device_props.hpp>
 #include <uhd/usrp/mboard_props.hpp>
@@ -34,16 +35,19 @@ namespace po = boost::program_options;
 
 int UHD_SAFE_MAIN(int argc, char *argv[]){
     //command line variables
-    std::string args, db_name, unit;
+    std::string args, slot, unit;
     static const uhd::dict<std::string, mboard_prop_t> unit_to_db_prop = boost::assign::map_list_of
         ("RX", MBOARD_PROP_RX_DBOARD) ("TX", MBOARD_PROP_TX_DBOARD)
     ;
+    static const uhd::dict<std::string, mboard_prop_t> unit_to_db_names_prop = boost::assign::map_list_of
+        ("RX", MBOARD_PROP_RX_DBOARD_NAMES) ("TX", MBOARD_PROP_TX_DBOARD_NAMES)
+    ;
 
     po::options_description desc("Allowed options");
     desc.add_options()
         ("help", "help message")
         ("args", po::value<std::string>(&args)->default_value(""),    "device address args [default = \"\"]")
-        ("db",   po::value<std::string>(&db_name)->default_value(""), "dboard name [default = \"\"]")
+        ("slot", po::value<std::string>(&slot)->default_value(""),    "dboard slot name [default is blank for automatic]")
         ("unit", po::value<std::string>(&unit)->default_value(""),    "which unit [RX or TX]")
         ("id",   po::value<std::string>(),                            "dboard id to burn, omit for readback")
     ;
@@ -70,8 +74,11 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
 
     //make the device and extract the dboard w/ property
     device::sptr dev = device::make(args);
-    wax::obj dboard = (*dev)[DEVICE_PROP_MBOARD][named_prop_t(unit_to_db_prop[unit], db_name)];
-    std::string prefix = (db_name == "")? unit : (unit + ":" + db_name);
+    uhd::prop_names_t dboard_names = (*dev)[DEVICE_PROP_MBOARD][unit_to_db_names_prop[unit]].as<uhd::prop_names_t>();
+    if (dboard_names.size() == 1 and slot.empty()) slot = dboard_names.front();
+    uhd::assert_has(dboard_names, slot, "dboard slot name");
+    wax::obj dboard = (*dev)[DEVICE_PROP_MBOARD][named_prop_t(unit_to_db_prop[unit], slot)];
+    std::string prefix = unit + ":" + slot;
 
     //read the current dboard id from eeprom
     if (vm.count("id") == 0){