aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp_e/usrp_e_iface.hpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-04-28 11:25:26 -0700
committerJosh Blum <josh@joshknows.com>2010-04-28 11:25:26 -0700
commit1b924876d7d7216504e604137ed0ade36460169f (patch)
tree0667a56d9fb77f5c1427bd44ed097997ea825c8a /host/lib/usrp/usrp_e/usrp_e_iface.hpp
parentcbd9e1da0866893d86320787a99cf4257478c539 (diff)
downloaduhd-1b924876d7d7216504e604137ed0ade36460169f.tar.gz
uhd-1b924876d7d7216504e604137ed0ade36460169f.tar.bz2
uhd-1b924876d7d7216504e604137ed0ade36460169f.zip
usrp-e branch compiling with recent master pulled in
Diffstat (limited to 'host/lib/usrp/usrp_e/usrp_e_iface.hpp')
-rw-r--r--host/lib/usrp/usrp_e/usrp_e_iface.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp_e/usrp_e_iface.hpp b/host/lib/usrp/usrp_e/usrp_e_iface.hpp
index 4fc3bb33d..850e15ac4 100644
--- a/host/lib/usrp/usrp_e/usrp_e_iface.hpp
+++ b/host/lib/usrp/usrp_e/usrp_e_iface.hpp
@@ -19,7 +19,7 @@
#define INCLUDED_USRP_E_IFACE_HPP
#include <uhd/transport/udp_simple.hpp>
-#include <uhd/usrp/dboard_iface.hpp> //spi config
+#include <uhd/types/serial.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/utility.hpp>
#include <boost/cstdint.hpp>
@@ -87,7 +87,7 @@ public:
*/
virtual boost::uint32_t transact_spi(
int which_slave,
- const uhd::usrp::spi_config_t &config,
+ const uhd::spi_config_t &config,
boost::uint32_t data,
size_t num_bits,
bool readback