diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-11-10 12:02:28 -0800 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-10 12:02:28 -0800 |
commit | 8fe1e7b29aacce7f75ae36e81706bbde02749b97 (patch) | |
tree | a3f99967174c5a8b4ec6cb38118d1adc5671d7d7 /host/utils | |
parent | 53412938fe7c851591026ef4c25233806f4f27a3 (diff) | |
download | uhd-8fe1e7b29aacce7f75ae36e81706bbde02749b97.tar.gz uhd-8fe1e7b29aacce7f75ae36e81706bbde02749b97.tar.bz2 uhd-8fe1e7b29aacce7f75ae36e81706bbde02749b97.zip |
2+: moved mboard_rev to usrp2/ in preparation for merging upstream
Diffstat (limited to 'host/utils')
-rw-r--r-- | host/utils/CMakeLists.txt | 3 | ||||
-rw-r--r-- | host/utils/usrp2_burn_mb_rev.cpp | 82 |
2 files changed, 0 insertions, 85 deletions
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 083c7629c..a95864ca7 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -45,9 +45,6 @@ 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 deleted file mode 100644 index 59b072d17..000000000 --- a/host/utils/usrp2_burn_mb_rev.cpp +++ /dev/null @@ -1,82 +0,0 @@ -// -// 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; -} |