diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-02 14:08:12 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-16 20:44:49 -0700 |
| commit | 58484632eb793b1ee1ffd06b9807023551133a1b (patch) | |
| tree | a4b1d223e9d7f3036ff57c268e8a1e45fac82ad8 /host/lib/usrp/e100/e100_ctrl.hpp | |
| parent | 9d30b8fc24dc7efa8973a4d305b240c245133fe6 (diff) | |
| download | uhd-58484632eb793b1ee1ffd06b9807023551133a1b.tar.gz uhd-58484632eb793b1ee1ffd06b9807023551133a1b.tar.bz2 uhd-58484632eb793b1ee1ffd06b9807023551133a1b.zip | |
e100: squashed host code for fifo control/timed commands
This uses the new b100/e100 common core and FIFO control modules.
Subsequent commit will be the compatible FPGA merge.
Conflicts:
host/lib/usrp/e100/io_impl.cpp
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 |