diff options
author | Josh Blum <josh@joshknows.com> | 2010-08-31 18:03:20 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-08-31 18:03:20 -0700 |
commit | 53e5f300dedfe4b1d573877ef07db447d1f3a046 (patch) | |
tree | 3b7d8cb5c2450574ba718dc86f433fbf061501ff /host/utils | |
parent | b5461fc3f5e7d1da74735ba5e025115dd2b7f04a (diff) | |
parent | ce3a95dbefa8528354301529eeb30957412d9b9f (diff) | |
download | uhd-53e5f300dedfe4b1d573877ef07db447d1f3a046.tar.gz uhd-53e5f300dedfe4b1d573877ef07db447d1f3a046.tar.bz2 uhd-53e5f300dedfe4b1d573877ef07db447d1f3a046.zip |
Merge branch 'usrp1' into next
Diffstat (limited to 'host/utils')
-rw-r--r-- | host/utils/CMakeLists.txt | 12 | ||||
-rw-r--r-- | host/utils/usrp1_init_eeprom.cpp (renamed from host/utils/usrp_init_eeprom.cpp) | 0 | ||||
-rw-r--r-- | host/utils/usrp1_serial_burner.cpp (renamed from host/utils/usrp_serial_burner.cpp) | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 48f91aaa7..a95864ca7 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -39,17 +39,17 @@ TARGET_LINK_LIBRARIES(usrp2_addr_burner uhd) ADD_EXECUTABLE(usrp_burn_db_eeprom usrp_burn_db_eeprom.cpp) TARGET_LINK_LIBRARIES(usrp_burn_db_eeprom uhd) -ADD_EXECUTABLE(usrp_init_eeprom usrp_init_eeprom.cpp) -TARGET_LINK_LIBRARIES(usrp_init_eeprom uhd) +ADD_EXECUTABLE(usrp1_init_eeprom usrp1_init_eeprom.cpp) +TARGET_LINK_LIBRARIES(usrp1_init_eeprom uhd) -ADD_EXECUTABLE(usrp_serial_burner usrp_serial_burner.cpp) -TARGET_LINK_LIBRARIES(usrp_serial_burner uhd) +ADD_EXECUTABLE(usrp1_serial_burner usrp1_serial_burner.cpp) +TARGET_LINK_LIBRARIES(usrp1_serial_burner uhd) INSTALL(TARGETS usrp2_addr_burner usrp_burn_db_eeprom - usrp_init_eeprom - usrp_serial_burner + usrp1_init_eeprom + usrp1_serial_burner RUNTIME DESTINATION ${PKG_DATA_DIR}/utils ) diff --git a/host/utils/usrp_init_eeprom.cpp b/host/utils/usrp1_init_eeprom.cpp index b05e400b1..b05e400b1 100644 --- a/host/utils/usrp_init_eeprom.cpp +++ b/host/utils/usrp1_init_eeprom.cpp diff --git a/host/utils/usrp_serial_burner.cpp b/host/utils/usrp1_serial_burner.cpp index cdb6eff65..bf7d3d3bb 100644 --- a/host/utils/usrp_serial_burner.cpp +++ b/host/utils/usrp1_serial_burner.cpp @@ -66,6 +66,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ wax::obj mb = (*dev)[uhd::usrp::DEVICE_PROP_MBOARD]; std::cout << "Writing serial number..." << std::endl; mb[std::string("serial")] = vm["new"].as<std::string>(); + std::cout << "Reading back serial number: " << mb[std::string("serial")].as<std::string>() << std::endl; } |