diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-04 16:49:34 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-04 16:49:34 -0800 |
| commit | fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda (patch) | |
| tree | 107e43e35008e6df0d33b0e8a8f5f52d28a91493 /host/lib/usrp/usrp2/usrp2_iface.hpp | |
| parent | 4711829f03ee2fcd1c4e9dc2a353af0e35497180 (diff) | |
| parent | 7b0b2924d52bbbcb4660cad5d8070074426011ce (diff) | |
| download | uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.tar.gz uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.tar.bz2 uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.zip | |
Merge branch 'cordic_policy' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.hpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp index af3ed6c9f..2b4378ddf 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.hpp +++ b/host/lib/usrp/usrp2/usrp2_iface.hpp @@ -37,7 +37,6 @@ class usrp2_iface : public uhd::i2c_iface, boost::noncopyable{ public: typedef boost::shared_ptr<usrp2_iface> sptr; - typedef std::pair<boost::uint32_t, boost::uint32_t> pair64; /*! * Make a new usrp2 interface with the control transport. @@ -54,14 +53,6 @@ public: virtual usrp2_ctrl_data_t ctrl_send_and_recv(const usrp2_ctrl_data_t &data) = 0; /*! - * Read a dual register (64 bits) - * \param addrlo the address for the low-32 bits - * \param addrhi the address for the high-32 bits - * \return a pair of 32 bit integers lo, hi - */ - virtual pair64 peek64(boost::uint32_t addrlo, boost::uint32_t addrhi) = 0; - - /*! * Write a register (32 bits) * \param addr the address * \param data the 32bit data |