diff options
| author | Josh Blum <josh@joshknows.com> | 2011-06-29 14:00:22 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-29 14:00:22 -0700 |
| commit | 11539ef6f690b4ebd69485be9a61f5422d8cdc99 (patch) | |
| tree | 529cf29a314ac5b8b3dfaab94f98caca972cc462 /host/lib/usrp/usrp2/usrp2_iface.hpp | |
| parent | bc8aaf3952f1c192030d1c9a0b6ddcbe14d9c062 (diff) | |
| download | uhd-11539ef6f690b4ebd69485be9a61f5422d8cdc99.tar.gz uhd-11539ef6f690b4ebd69485be9a61f5422d8cdc99.tar.bz2 uhd-11539ef6f690b4ebd69485be9a61f5422d8cdc99.zip | |
usrp2: moved impl back into usrp subdir
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.hpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp index 16b640a70..f36febce4 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.hpp +++ b/host/lib/usrp/usrp2/usrp2_iface.hpp @@ -19,15 +19,14 @@ #define INCLUDED_USRP2_IFACE_HPP #include <uhd/transport/udp_simple.hpp> -#include <uhd/usrp/mboard_iface.hpp> +#include <uhd/types/serial.hpp> +#include <uhd/usrp/mboard_eeprom.hpp> #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> -#include <boost/cstdint.hpp> #include <boost/function.hpp> -#include <utility> -#include <string> #include "usrp2_regs.hpp" - +#include "wb_iface.hpp" +#include <string> //TODO: kill this crap when you have the top level GPS include file typedef boost::function<void(std::string)> gps_send_fn_t; @@ -38,7 +37,7 @@ typedef boost::function<std::string(void)> gps_recv_fn_t; * Provides a set of functions to implementation layer. * Including spi, peek, poke, control... */ -class usrp2_iface : public uhd::usrp::mboard_iface, boost::noncopyable{ +class usrp2_iface : public wb_iface, public uhd::spi_iface, public uhd::i2c_iface, public uhd::uart_iface{ public: typedef boost::shared_ptr<usrp2_iface> sptr; /*! |