From 1ade1f94cb5aaf038d4914fb5cece82f055b8f0e Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Wed, 29 Jun 2011 13:02:42 -0700
Subject: uhd: implement prop tree usage in utils

---
 host/utils/usrp_burn_mb_eeprom.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'host/utils/usrp_burn_mb_eeprom.cpp')

diff --git a/host/utils/usrp_burn_mb_eeprom.cpp b/host/utils/usrp_burn_mb_eeprom.cpp
index 20e1b58b1..9f2fa611a 100644
--- a/host/utils/usrp_burn_mb_eeprom.cpp
+++ b/host/utils/usrp_burn_mb_eeprom.cpp
@@ -17,8 +17,7 @@
 
 #include <uhd/utils/safe_main.hpp>
 #include <uhd/device.hpp>
-#include <uhd/usrp/device_props.hpp>
-#include <uhd/usrp/mboard_props.hpp>
+#include <uhd/property_tree.hpp>
 #include <uhd/usrp/mboard_eeprom.hpp>
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
@@ -53,14 +52,12 @@ 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);
-    //FIXME the default mboard for now (may be others)
-    wax::obj mboard = (*dev)[uhd::usrp::DEVICE_PROP_MBOARD];
+    uhd::property_tree::sptr tree = (*dev)[0].as<uhd::property_tree::sptr>();
     std::cout << std::endl;
 
     if (true /*always readback*/){
         std::cout << "Fetching current settings from EEPROM..." << std::endl;
-        uhd::usrp::mboard_eeprom_t mb_eeprom = \
-            mboard[uhd::usrp::MBOARD_PROP_EEPROM_MAP].as<uhd::usrp::mboard_eeprom_t>();
+        uhd::usrp::mboard_eeprom_t mb_eeprom = tree->access<uhd::usrp::mboard_eeprom_t>("/mboards/0/eeprom").get();
         if (not mb_eeprom.has_key(key)){
             std::cerr << boost::format("Cannot find value for EEPROM[%s]") % key << std::endl;
             return ~0;
@@ -71,7 +68,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     if (vm.count("val")){
         uhd::usrp::mboard_eeprom_t mb_eeprom; mb_eeprom[key] = val;
         std::cout << boost::format("Setting EEPROM [\"%s\"] to \"%s\"...") % key % val << std::endl;
-        mboard[uhd::usrp::MBOARD_PROP_EEPROM_MAP] = mb_eeprom;
+        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;
     }
-- 
cgit v1.2.3