diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-01 15:16:29 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-01 15:16:29 +0000 |
| commit | 8fd3ce07369a7962dc8eb5ace2007a80ad7dd907 (patch) | |
| tree | bb4f5c61f8a7809af1c58d5513dc6c3e78c7a5b2 /host/utils/usrp2_burner.cpp | |
| parent | 58d71729716a688af36ba4a413e6f6ee4729eefc (diff) | |
| parent | f1f4865119605c66ffece113a621308d82512d23 (diff) | |
| download | uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.tar.gz uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.tar.bz2 uhd-8fd3ce07369a7962dc8eb5ace2007a80ad7dd907.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e
Conflicts:
host/include/uhd/usrp/CMakeLists.txt
Diffstat (limited to 'host/utils/usrp2_burner.cpp')
| -rw-r--r-- | host/utils/usrp2_burner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/utils/usrp2_burner.cpp b/host/utils/usrp2_burner.cpp index b24425316..9c1bf72fe 100644 --- a/host/utils/usrp2_burner.cpp +++ b/host/utils/usrp2_burner.cpp @@ -17,7 +17,7 @@ #include <uhd/utils/safe_main.hpp> #include <uhd/usrp/usrp2.hpp> -#include <uhd/props.hpp> +#include <uhd/usrp/device_props.hpp> #include <boost/program_options.hpp> #include <boost/format.hpp> #include <iostream> @@ -56,7 +56,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //create a usrp2 device uhd::device::sptr u2_dev = uhd::usrp::usrp2::make(device_addr); //FIXME usees the default mboard for now (until the mimo link is supported) - wax::obj u2_mb = (*u2_dev)[uhd::DEVICE_PROP_MBOARD]; + wax::obj u2_mb = (*u2_dev)[uhd::usrp::DEVICE_PROP_MBOARD]; std::cout << std::endl; //fetch and print current settings |