usrp_burn_mb_eeprom: deprecated --key and --val arguments

* New method: --values="key1=value1,key2=value2"
* To read key2: --values="key1=value1,key2,key3=value2"
* Added --read-all option to read all values in EEPROM without burning
* Old arguments still work but print deprecation warning

Conflicts:
	host/docs/usrp_x3x0.rst

6 files changed, 40 insertions, 28 deletions

diff --git a/host/docs/gpsdo.rst b/host/docs/gpsdo.rst
index 8ffff8672..5afd9d78d 100644
--- a/host/docs/gpsdo.rst
+++ b/host/docs/gpsdo.rst
@@ -55,10 +55,10 @@ To configure the USRP to communicate with the GPSDO, use the
 ::
 
     cd <install-path>/lib/uhd/utils
-    ./usrp_burn_mb_eeprom --args=<optional device args> --key=gpsdo --val=internal
+    ./usrp_burn_mb_eeprom --args=<optional device args> --values="gpsdo=internal"
 
     -- restore original setting --
-    ./usrp_burn_mb_eeprom --args=<optional device args> --key=gpsdo --val=none
+    ./usrp_burn_mb_eeprom --args=<optional device args> --values="gpsdo=none"
 
 ------------------------------------------------------------------------
 Using the GPSDO in Your Application
diff --git a/host/docs/identification.rst b/host/docs/identification.rst
index cbae25082..65b4e5e99 100644
--- a/host/docs/identification.rst
+++ b/host/docs/identification.rst
@@ -112,7 +112,7 @@ Run the following commands:
 ::
 
     cd <install-path>/lib/uhd/utils
-    ./usrp_burn_mb_eeprom --args=<optional device args> --key=name --val=lab1_xcvr
+    ./usrp_burn_mb_eeprom --args=<optional device args> --values="name=lab1_xcvr"
 
 ^^^^^^^^^^^^^^^^^^
 Discovery via name
diff --git a/host/docs/usrp1.rst b/host/docs/usrp1.rst
index be74fe00a..ecf90502b 100644
--- a/host/docs/usrp1.rst
+++ b/host/docs/usrp1.rst
@@ -102,7 +102,7 @@ Run the following commands to record the setting into the EEPROM:
 ::
 
     cd <install-path>/lib/uhd/utils
-    ./usrp_burn_mb_eeprom --args=<optional device args> --key=mcr --val=<rate>
+    ./usrp_burn_mb_eeprom --args=<optional device args> --values="mcr=<rate>"
 
 The user may override the clock rate specified in the EEPROM by using a device address:
 Example:
diff --git a/host/docs/usrp2.rst b/host/docs/usrp2.rst
index 361d98f01..1070a23fc 100644
--- a/host/docs/usrp2.rst
+++ b/host/docs/usrp2.rst
@@ -192,7 +192,7 @@ Run the following commands:
 ::
 
     cd <install-path>/lib/uhd/utils
-    ./usrp_burn_mb_eeprom --args=<optional device args> --key=ip-addr --val=192.168.10.3
+    ./usrp_burn_mb_eeprom --args=<optional device args> --values="ip-addr=192.168.10.3"
 
 **Method 2 (Linux Only):**
 This method assumes that you do not know the IP address of your USRP2.
@@ -360,8 +360,7 @@ Run the following commands:
 ::
 
     cd <install-path>/lib/uhd/utils
-    ./usrp_burn_mb_eeprom --args=<optional device args> --key=subnet --val=255.255.255.0
-    ./usrp_burn_mb_eeprom --args=<optional device args> --key=gateway --val=192.168.10.1
+    ./usrp_burn_mb_eeprom --args=<optional device args> --values="subnet=255.255.255.0,gateway=192.168.10.1"
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Create a receive streamer
diff --git a/host/docs/usrp_x3x0.rst b/host/docs/usrp_x3x0.rst
index 7dd322dbf..cfca09756 100644
--- a/host/docs/usrp_x3x0.rst
+++ b/host/docs/usrp_x3x0.rst
@@ -447,14 +447,14 @@ Run the following commands:
 ::
 
     cd <install-path>/lib/uhd/utils
-    ./usrp_burn_mb_eeprom --args=<optional device args> --key=ip-addr0 --val=192.168.10.3
+    ./usrp_burn_mb_eeprom --args=<optional device args> --values="ip-addr0=192.168.10.3"
 
 **Windows:**
 
 ::
 
     cd <install-path>\lib\uhd\utils
-    usrp_burn_mb_eeprom.exe --args=<optional device args> --key=ip-addr0 --val=192.168.10.3
+    usrp_burn_mb_eeprom.exe --args=<optional device args> --values="ip-addr0=192.168.10.3"
 
 ---------------------
 Addressing the Device
diff --git a/host/utils/usrp_burn_mb_eeprom.cpp b/host/utils/usrp_burn_mb_eeprom.cpp
index ce0879c8e..c631c9c09 100644
--- a/host/utils/usrp_burn_mb_eeprom.cpp
+++ b/host/utils/usrp_burn_mb_eeprom.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010,2013 Ettus Research LLC
+// Copyright 2010,2013-2014 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
@@ -19,6 +19,7 @@
 #include <uhd/device.hpp>
 #include <uhd/property_tree.hpp>
 #include <uhd/usrp/mboard_eeprom.hpp>
+#include <uhd/types/device_addr.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
@@ -28,14 +29,16 @@
 namespace po = boost::program_options;
 
 int UHD_SAFE_MAIN(int argc, char *argv[]){
-    std::string args, key, val;
+    std::string args, input_str, key, val;
 
     po::options_description desc("Allowed options");
     desc.add_options()
         ("help", "help message")
         ("args", po::value<std::string>(&args)->default_value(""), "device address args [default = \"\"]")
-        ("key", po::value<std::string>(&key), "identifiers for new values in EEPROM, separate multiple by \",\"")
-        ("val", po::value<std::string>(&val), "the new values to set, omit for readback, separate multiple by \",\"")
+        ("values", po::value<std::string>(&input_str), "keys+values to read/write, separate multiple by \",\"")
+        ("key", po::value<std::string>(&key), "identifiers for new values in EEPROM, separate multiple by \",\" (DEPRECATED)")
+        ("val", po::value<std::string>(&val), "the new values to set, omit for readback, separate multiple by \",\" (DEPRECATED)")
+        ("read-all", "Read all motherboard EEPROM values without writing")
     ;
 
     po::variables_map vm;
@@ -43,7 +46,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     po::notify(vm);
 
     //print the help message
-    if (vm.count("help") or not vm.count("key")){
+    if (vm.count("help") or (not vm.count("key") and not vm.count("values") and not vm.count("read-all"))){
         std::cout << boost::format("USRP Burn Motherboard EEPROM %s") % desc << std::endl;
         std::cout << boost::format(
             "Omit the value argument to perform a readback,\n"
@@ -55,23 +58,33 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     std::cout << "Creating USRP device from address: " + args << std::endl;
     uhd::device::sptr dev = uhd::device::make(args);
     uhd::property_tree::sptr tree = dev->get_tree();
+    uhd::usrp::mboard_eeprom_t mb_eeprom = tree->access<uhd::usrp::mboard_eeprom_t>("/mboards/0/eeprom").get();
     std::cout << std::endl;
 
-    //remove whitespace, split arguments and values 
-    boost::algorithm::erase_all(key, " ");
-    boost::algorithm::erase_all(val, " ");
-
     std::vector<std::string> keys_vec, vals_vec;
-    boost::split(keys_vec, key, boost::is_any_of("\"',"));
-    boost::split(vals_vec, val, boost::is_any_of("\"',"));
+    if(vm.count("read-all")) keys_vec = mb_eeprom.keys(); //Leaving vals_vec empty will force utility to only read
+    else if(vm.count("values")){
+        //uhd::device_addr_t properly parses input values
+        uhd::device_addr_t vals(input_str);
+        keys_vec = vals.keys();
+        vals_vec = vals.vals();
+    }
+    else{
+        std::cout << "WARNING: Use of --key and --val is deprecated!" << std::endl;
+        //remove whitespace, split arguments and values 
+        boost::algorithm::erase_all(key, " ");
+        boost::algorithm::erase_all(val, " ");
+
+        boost::split(keys_vec, key, boost::is_any_of("\"',"));
+        boost::split(vals_vec, val, boost::is_any_of("\"',"));
 
-    if((keys_vec.size() != vals_vec.size()) and val != "") {
-        //If zero values are given, then user just wants values read to them
-        throw std::runtime_error("Number of keys must match number of values!");
+        if((keys_vec.size() != vals_vec.size()) and val != "") {
+            //If zero values are given, then user just wants values read to them
+            throw std::runtime_error("Number of keys must match number of values!");
+        }
     }
 
     std::cout << "Fetching current settings from EEPROM..." << std::endl;
-    uhd::usrp::mboard_eeprom_t mb_eeprom = tree->access<uhd::usrp::mboard_eeprom_t>("/mboards/0/eeprom").get();
     for(size_t i = 0; i < keys_vec.size(); i++){
         if (not mb_eeprom.has_key(keys_vec[i])){
             std::cerr << boost::format("Cannot find value for EEPROM[%s]") % keys_vec[i] << std::endl;
@@ -80,15 +93,15 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         std::cout << boost::format("    EEPROM [\"%s\"] is \"%s\"") % keys_vec[i] % mb_eeprom[keys_vec[i]] << std::endl;
     }
     std::cout << std::endl;
-    if (vm.count("val")){
-        for(size_t i = 0; i < vals_vec.size(); i++){
+    for(size_t i = 0; i < vals_vec.size(); i++){
+        if(vals_vec[i] != ""){
             uhd::usrp::mboard_eeprom_t mb_eeprom; mb_eeprom[keys_vec[i]] = vals_vec[i];
             std::cout << boost::format("Setting EEPROM [\"%s\"] to \"%s\"...") % keys_vec[i] % vals_vec[i] << std::endl;
             tree->access<uhd::usrp::mboard_eeprom_t>("/mboards/0/eeprom").set(mb_eeprom);
         }
-        std::cout << "Power-cycle the USRP device for the changes to take effect." << std::endl;
-        std::cout << std::endl;
     }
+    std::cout << "Power-cycle the USRP device for the changes to take effect." << std::endl;
+    std::cout << std::endl;
 
     std::cout << "Done" << std::endl;
     return EXIT_SUCCESS;