diff options
| author | Josh Blum <josh@joshknows.com> | 2010-02-21 12:59:41 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-02-21 12:59:41 -0800 |
| commit | add5d32f9b0cb3cda15624fb7aef3998096ff3f6 (patch) | |
| tree | e5c10c2952b173b977e5835c34ac27ece92a0b45 /host/lib/device.cpp | |
| parent | aab51fa40769bb77af73aba69e16c9ac28e4943f (diff) | |
| download | uhd-add5d32f9b0cb3cda15624fb7aef3998096ff3f6.tar.gz uhd-add5d32f9b0cb3cda15624fb7aef3998096ff3f6.tar.bz2 uhd-add5d32f9b0cb3cda15624fb7aef3998096ff3f6.zip | |
Moved lib and include contents of dboard and mboard one directory up and prefixed them with dboard_ and mboard_.
And yes, the code is compiling.
Diffstat (limited to 'host/lib/device.cpp')
| -rw-r--r-- | host/lib/device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/device.cpp b/host/lib/device.cpp index 822733217..be27ac1ae 100644 --- a/host/lib/device.cpp +++ b/host/lib/device.cpp @@ -16,7 +16,7 @@ // #include <uhd/usrp/usrp.hpp> -#include <uhd/usrp/mboard/usrp2.hpp> +#include <uhd/usrp/usrp2.hpp> //TODO remove and call discover from usrp #include <uhd/device.hpp> #include <boost/format.hpp> #include <stdexcept> @@ -34,7 +34,7 @@ device_addrs_t device::discover(const device_addr_t &hint){ device_addrs.push_back(test_device_addr); } else if (hint["type"] == "udp"){ - std::vector<device_addr_t> usrp2_addrs = usrp::mboard::usrp2::discover(hint); + std::vector<device_addr_t> usrp2_addrs = usrp::usrp2::discover(hint); device_addrs.insert(device_addrs.begin(), usrp2_addrs.begin(), usrp2_addrs.end()); } return device_addrs; |