diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-07 02:23:38 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-07 02:23:38 +0000 |
| commit | f2e9d3ed0941dc5738149dd82d1eac158bdf0a0f (patch) | |
| tree | 82a350987e32cd329ab5fe56b6dd9fbfef08230f /host/utils/usrp2_addr_burner.cpp | |
| parent | 998fee6ef064f1d53a61dd0eec79276d1e85291e (diff) | |
| parent | 5c2cccfe8c4a9c6c912a4d18dc1e7a6f84c79609 (diff) | |
| download | uhd-f2e9d3ed0941dc5738149dd82d1eac158bdf0a0f.tar.gz uhd-f2e9d3ed0941dc5738149dd82d1eac158bdf0a0f.tar.bz2 uhd-f2e9d3ed0941dc5738149dd82d1eac158bdf0a0f.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Conflicts:
host/examples/rx_timed_samples.cpp
Diffstat (limited to 'host/utils/usrp2_addr_burner.cpp')
| -rw-r--r-- | host/utils/usrp2_addr_burner.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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; |