diff options
Diffstat (limited to 'host/utils')
| -rw-r--r-- | host/utils/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | host/utils/usrp2_addr_burner.cpp | 5 | ||||
| -rw-r--r-- | host/utils/usrp_burn_db_eeprom.cpp (renamed from host/utils/uhd_burn_db_eeprom.cpp) | 2 |
3 files changed, 24 insertions, 9 deletions
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 8d260c06c..c349a9018 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -15,21 +15,35 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +######################################################################## +# Utilities that get installed into the runtime path +######################################################################## ADD_EXECUTABLE(uhd_find_devices uhd_find_devices.cpp) TARGET_LINK_LIBRARIES(uhd_find_devices uhd) -INSTALL(TARGETS uhd_find_devices RUNTIME DESTINATION ${RUNTIME_DIR}) ADD_EXECUTABLE(uhd_usrp_probe uhd_usrp_probe.cpp) TARGET_LINK_LIBRARIES(uhd_usrp_probe uhd) -INSTALL(TARGETS uhd_usrp_probe RUNTIME DESTINATION ${RUNTIME_DIR}) +INSTALL(TARGETS + uhd_find_devices + uhd_usrp_probe + RUNTIME DESTINATION ${RUNTIME_DIR} +) + +######################################################################## +# Utilities that get installed into the share path +######################################################################## ADD_EXECUTABLE(usrp2_addr_burner usrp2_addr_burner.cpp) TARGET_LINK_LIBRARIES(usrp2_addr_burner uhd) -INSTALL(TARGETS usrp2_addr_burner RUNTIME DESTINATION ${PKG_DATA_DIR}/utils) -ADD_EXECUTABLE(uhd_burn_db_eeprom uhd_burn_db_eeprom.cpp) -TARGET_LINK_LIBRARIES(uhd_burn_db_eeprom uhd) -INSTALL(TARGETS uhd_burn_db_eeprom RUNTIME DESTINATION ${PKG_DATA_DIR}/utils) +ADD_EXECUTABLE(usrp_burn_db_eeprom usrp_burn_db_eeprom.cpp) +TARGET_LINK_LIBRARIES(usrp_burn_db_eeprom uhd) + +INSTALL(TARGETS + usrp2_addr_burner + usrp_burn_db_eeprom + RUNTIME DESTINATION ${PKG_DATA_DIR}/utils +) INSTALL(PROGRAMS usrp2_recovery.py diff --git a/host/utils/usrp2_addr_burner.cpp b/host/utils/usrp2_addr_burner.cpp index 08fc1e218..f0e3434b7 100644 --- a/host/utils/usrp2_addr_burner.cpp +++ b/host/utils/usrp2_addr_burner.cpp @@ -16,7 +16,7 @@ // #include <uhd/utils/safe_main.hpp> -#include <uhd/usrp/usrp2.hpp> +#include <uhd/device.hpp> #include <uhd/usrp/device_props.hpp> #include <boost/program_options.hpp> #include <boost/format.hpp> @@ -45,6 +45,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //load the options into the address uhd::device_addr_t device_addr; + device_addr["type"] = "usrp2"; if (vm.count("addr")){ device_addr["addr"] = vm["addr"].as<std::string>(); } @@ -54,7 +55,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ } //create a usrp2 device - uhd::device::sptr u2_dev = uhd::usrp::usrp2::make(device_addr); + uhd::device::sptr u2_dev = uhd::device::make(device_addr); //FIXME usees the default mboard for now (until the mimo link is supported) wax::obj u2_mb = (*u2_dev)[uhd::usrp::DEVICE_PROP_MBOARD]; std::cout << std::endl; diff --git a/host/utils/uhd_burn_db_eeprom.cpp b/host/utils/usrp_burn_db_eeprom.cpp index ba7aa6cec..db2981e87 100644 --- a/host/utils/uhd_burn_db_eeprom.cpp +++ b/host/utils/usrp_burn_db_eeprom.cpp @@ -54,7 +54,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //print the help message if (vm.count("help")){ - std::cout << boost::format("UHD Burn DB EEPROM %s") % desc << std::endl; + std::cout << boost::format("USRP Burn DB EEPROM %s") % desc << std::endl; std::cout << boost::format( "Omit the id argument to perform readback,\n" "Or specify a new id to burn into the eeprom.\n" |