diff options
| author | Josh Blum <josh@joshknows.com> | 2012-08-31 11:20:17 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-08-31 11:20:17 -0700 |
| commit | 667dcf0b98bb5a99654cf883fb97d2a549582cff (patch) | |
| tree | 7c845d7ac3f506c000ab495b1d62d976b816b5cd /host/lib/usrp/e100/e100_ctrl.hpp | |
| parent | 05a06254a7f0149425bdda0e5544507bd35a671b (diff) | |
| parent | 36a7def9aa6cecaa6f3cbf9979544d6fd5848a08 (diff) | |
| download | uhd-667dcf0b98bb5a99654cf883fb97d2a549582cff.tar.gz uhd-667dcf0b98bb5a99654cf883fb97d2a549582cff.tar.bz2 uhd-667dcf0b98bb5a99654cf883fb97d2a549582cff.zip | |
Merge branch 'next'
Diffstat (limited to 'host/lib/usrp/e100/e100_ctrl.hpp')
| -rw-r--r-- | host/lib/usrp/e100/e100_ctrl.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/host/lib/usrp/e100/e100_ctrl.hpp b/host/lib/usrp/e100/e100_ctrl.hpp index fd66791d4..72dce134e 100644 --- a/host/lib/usrp/e100/e100_ctrl.hpp +++ b/host/lib/usrp/e100/e100_ctrl.hpp @@ -1,5 +1,5 @@ // -// Copyright 2011 Ettus Research LLC +// Copyright 2012 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -18,12 +18,11 @@ #ifndef INCLUDED_B100_CTRL_HPP #define INCLUDED_B100_CTRL_HPP -#include "wb_iface.hpp" +#include <uhd/transport/zero_copy.hpp> #include <uhd/types/serial.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> -class e100_ctrl : boost::noncopyable, public wb_iface{ +class e100_ctrl : public uhd::transport::zero_copy_if{ public: typedef boost::shared_ptr<e100_ctrl> sptr; @@ -33,7 +32,7 @@ public: //! Make an i2c iface for the i2c device node static uhd::i2c_iface::sptr make_dev_i2c_iface(const std::string &node); - //! Make an i2c iface for the i2c device node + //! Make a spi iface for the spi gpio static uhd::spi_iface::sptr make_aux_spi_iface(void); //! Make a uart iface for the uart device node |