Merge branch 'usrp1' into next

2 files changed, 73 insertions, 0 deletions

diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index c349a9018..9d788b06c 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -39,9 +39,13 @@ 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(usrp_init_eeprom usrp_init_eeprom.cpp)
+TARGET_LINK_LIBRARIES(usrp_init_eeprom uhd)
+
 INSTALL(TARGETS
     usrp2_addr_burner
     usrp_burn_db_eeprom
+    usrp_init_eeprom
     RUNTIME DESTINATION ${PKG_DATA_DIR}/utils
 )
 
diff --git a/host/utils/usrp_init_eeprom.cpp b/host/utils/usrp_init_eeprom.cpp
new file mode 100644
index 000000000..28c7c5745
--- /dev/null
+++ b/host/utils/usrp_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>(), "IHX 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;
+}