diff options
author | Josh Blum <josh@joshknows.com> | 2010-07-06 17:09:50 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-07-06 17:09:50 -0700 |
commit | 01067698803179cf8021d30c881eb16f17b184db (patch) | |
tree | 0176e1238fb06b639a3a8fdaa471c35044712c14 /host/lib/usrp/usrp2/usrp2_iface.hpp | |
parent | 7bf4370762087eeb2e590414869f53c90c70398d (diff) | |
parent | 7f3c4791f7d19d02b7d4515c763b9c2044e96170 (diff) | |
download | uhd-01067698803179cf8021d30c881eb16f17b184db.tar.gz uhd-01067698803179cf8021d30c881eb16f17b184db.tar.bz2 uhd-01067698803179cf8021d30c881eb16f17b184db.zip |
Merge branch 'usrp2_mimo'
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.hpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.hpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp index 7b2a3a89d..9cc32104e 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.hpp +++ b/host/lib/usrp/usrp2/usrp2_iface.hpp @@ -23,6 +23,7 @@ #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> #include <boost/cstdint.hpp> +#include <utility> #include "fw_common.h" //////////////////////////////////////////////////////////////////////// @@ -49,6 +50,7 @@ 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. @@ -65,6 +67,14 @@ 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 |