aboutsummaryrefslogtreecommitdiffstats
path: root/include/uhd/usrp/mboard/usrp2.hpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-02-12 18:07:55 -0800
committerJosh Blum <josh@joshknows.com>2010-02-12 18:07:55 -0800
commit9fff25f4e5da179ea29ff44278e0415a337870cb (patch)
treecfbee4cf2921fd4bd415e3af1c1d466f79bab3d7 /include/uhd/usrp/mboard/usrp2.hpp
parent350f5c5decca20a54132867283448fd32226bbc2 (diff)
downloaduhd-9fff25f4e5da179ea29ff44278e0415a337870cb.tar.gz
uhd-9fff25f4e5da179ea29ff44278e0415a337870cb.tar.bz2
uhd-9fff25f4e5da179ea29ff44278e0415a337870cb.zip
Added a templated dictionary class because its more useful than map.
Made the device addrs into a string:string dict. If its all strings we dont have to change the top level caller for new product. Created shared_iovec class to manage memory for device recvs. Work on the bro/dude control protocol for usrp2.
Diffstat (limited to 'include/uhd/usrp/mboard/usrp2.hpp')
-rw-r--r--include/uhd/usrp/mboard/usrp2.hpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/uhd/usrp/mboard/usrp2.hpp b/include/uhd/usrp/mboard/usrp2.hpp
index 8c2430dbd..4950f4cd1 100644
--- a/include/uhd/usrp/mboard/usrp2.hpp
+++ b/include/uhd/usrp/mboard/usrp2.hpp
@@ -21,6 +21,7 @@
#include <uhd/usrp/mboard/base.hpp>
#include <uhd/device_addr.hpp>
#include <uhd/usrp/dboard/manager.hpp>
+#include <uhd/transport/udp.hpp>
#include <map>
namespace uhd{ namespace usrp{ namespace mboard{
@@ -36,7 +37,7 @@ public:
* \param hint a device addr with the usrp2 address filled in
* \return a vector of device addresses for all usrp2s found
*/
- static std::vector<device_addr_t> discover(const device_addr_t &hint);
+ static device_addrs_t discover(const device_addr_t &hint);
usrp2(const device_addr_t &);
~usrp2(void);
@@ -46,6 +47,8 @@ private:
void set(const wax::obj &, const wax::obj &);
std::map<std::string, dboard::manager::sptr> _dboard_managers;
+ uhd::transport::udp::sptr _udp_ctrl_transport;
+ uhd::transport::udp::sptr _udp_data_transport;
};
}}} //namespace