diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-09-30 12:28:29 -0700 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-09-30 12:28:29 -0700 |
commit | 6dd502737bcf6e59933be01720672db9a496803b (patch) | |
tree | 5ab70f1c7cb4f2fdd8b5924b5d7abacbd772c9be /host/lib/usrp/usrp1/usrp1_iface.hpp | |
parent | ed245848df8cc011ae8fe30833ecc28049139db5 (diff) | |
parent | e4fffed05dda57bb37d693a3a26ea6a903c925f7 (diff) | |
download | uhd-6dd502737bcf6e59933be01720672db9a496803b.tar.gz uhd-6dd502737bcf6e59933be01720672db9a496803b.tar.bz2 uhd-6dd502737bcf6e59933be01720672db9a496803b.zip |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/lib/usrp/usrp2/io_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_iface.hpp')
-rw-r--r-- | host/lib/usrp/usrp1/usrp1_iface.hpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_iface.hpp b/host/lib/usrp/usrp1/usrp1_iface.hpp index 9a3fdd6bc..3f608584a 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.hpp +++ b/host/lib/usrp/usrp1/usrp1_iface.hpp @@ -54,20 +54,6 @@ public: virtual boost::uint32_t peek32(boost::uint32_t addr) = 0; /*! - * Write a register (16 bits) - * \param addr the address - * \param data the 16bit data - */ - virtual void poke16(boost::uint32_t addr, boost::uint16_t data) = 0; - - /*! - * read a register (16 bits) - * \param addr the address - * \return the 16bit data - */ - virtual boost::uint16_t peek16(boost::uint32_t addr) = 0; - - /*! * Perform an spi transaction. * \param which_slave the slave device number * \param config spi config args |