USRP2P: mboard rev works through props interface.

Added usrp2_burn_mb_rev.cpp to utils. It is not installed to the utils install dir.

Not all happy with the mboard_rev setup -- is_usrp2p() is too specific for a generalized mboard_rev concept. I'm not sure where else to put it so for now it stays.

2 files changed, 85 insertions, 0 deletions

diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index a95864ca7..083c7629c 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -45,6 +45,9 @@ TARGET_LINK_LIBRARIES(usrp1_init_eeprom uhd)
 ADD_EXECUTABLE(usrp1_serial_burner usrp1_serial_burner.cpp)
 TARGET_LINK_LIBRARIES(usrp1_serial_burner uhd)
 
+ADD_EXECUTABLE(usrp2_burn_mb_rev usrp2_burn_mb_rev.cpp)
+TARGET_LINK_LIBRARIES(usrp2_burn_mb_rev uhd)
+
 INSTALL(TARGETS
     usrp2_addr_burner
     usrp_burn_db_eeprom
diff --git a/host/utils/usrp2_burn_mb_rev.cpp b/host/utils/usrp2_burn_mb_rev.cpp
new file mode 100644
index 000000000..59b072d17
--- /dev/null
+++ b/host/utils/usrp2_burn_mb_rev.cpp
@@ -0,0 +1,82 @@
+//
+// 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/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>
+#include <uhd/usrp/mboard_rev.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <boost/assign.hpp>
+#include <iostream>
+
+using namespace uhd;
+using namespace uhd::usrp;
+namespace po = boost::program_options;
+
+int UHD_SAFE_MAIN(int argc, char *argv[]){
+    //command line variables
+    std::string args;
+
+    po::options_description desc("Allowed options");
+    desc.add_options()
+        ("help", "help message")
+        ("args", po::value<std::string>(&args)->default_value(""),    "device address args [default = \"\"]")
+        ("rev",   po::value<std::string>(),                           "mboard rev to burn, omit for readback")
+    ;
+
+    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 Burn MB HW revision %s") % desc << std::endl;
+        std::cout << boost::format(
+            "Omit the rev argument to perform readback,\n"
+            "Or specify a new rev to burn into the eeprom.\n"
+        ) << std::endl;
+        return ~0;
+    }
+
+    //make the device and extract the mboard
+    device::sptr dev = device::make(args);
+    wax::obj u2_mb = (*dev)[DEVICE_PROP_MBOARD];
+
+    //read the current mboard rev from eeprom
+    if (vm.count("rev") == 0){
+        std::cout << "Getting rev..." << std::endl;
+        uhd::usrp::mboard_rev_t rev = mboard_rev_t::from_string(u2_mb[std::string("hw-rev")].as<std::string>());
+        std::cout << boost::format("  Current rev: %s") % rev.to_pp_string() << std::endl;
+    }
+
+    //write a new mboard rev to eeprom
+    else{
+        mboard_rev_t rev = mboard_rev_t::from_string(vm["rev"].as<std::string>());
+        std::cout << "Setting mboard rev..." << std::endl;
+        std::cout << boost::format("  New rev: %s") % rev.to_pp_string() << std::endl;
+        u2_mb[std::string("hw-rev")] = rev.to_string();
+    }
+
+    std::cout << "  Done" << std::endl << std::endl;
+    return 0;
+}