diff options
| author | Philip Balister <philip@opensdr.com> | 2010-04-27 08:21:35 +0000 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-04-27 08:21:35 +0000 |
| commit | 7dba88b257f6a0fd5c35677ed5c7ce577cebbc74 (patch) | |
| tree | 3b44059774229d69fe521cbf035758115493c4ce /host/lib/usrp/usrp_e/usrp_e_iface.hpp | |
| parent | 245b46da0b603e3c12c56fdad782ff884b2a6432 (diff) | |
| parent | 1c4e9bd614dc8b7a17dc2bd95c322bbea940ca35 (diff) | |
| download | uhd-7dba88b257f6a0fd5c35677ed5c7ce577cebbc74.tar.gz uhd-7dba88b257f6a0fd5c35677ed5c7ce577cebbc74.tar.bz2 uhd-7dba88b257f6a0fd5c35677ed5c7ce577cebbc74.zip | |
Merge branch 'usrp_e' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/usrp/usrp_e/usrp_e_iface.hpp')
| -rw-r--r-- | host/lib/usrp/usrp_e/usrp_e_iface.hpp | 6 |
1 files changed, 3 insertions, 3 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..763d19581 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> @@ -29,7 +29,7 @@ * Provides a set of functions to implementation layer. * Including spi, peek, poke, control... */ -class usrp_e_iface : boost::noncopyable{ +class usrp_e_iface : boost::noncopyable, public uhd::i2c_iface{ public: typedef boost::shared_ptr<usrp_e_iface> sptr; @@ -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 |