summaryrefslogtreecommitdiffstats
path: root/include/usrp_uhd/usrp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-01-29 19:22:40 -0800
committerJosh Blum <josh@joshknows.com>2010-01-29 19:22:40 -0800
commit5e455ca92280e3c22f5484cb81a2aef0cdfb5de4 (patch)
treed32d5aeebbef8fc2d15c42b281c893940f7f6b5b /include/usrp_uhd/usrp
parentaa2c904d7a6dad83f4a516a5a38ee9e765b9dfac (diff)
downloaduhd-5e455ca92280e3c22f5484cb81a2aef0cdfb5de4.tar.gz
uhd-5e455ca92280e3c22f5484cb81a2aef0cdfb5de4.tar.bz2
uhd-5e455ca92280e3c22f5484cb81a2aef0cdfb5de4.zip
Minimal framework in place to handle udp discovery.
Added usrp2 stuff, udp wrapper, discovery function. Added app called discover usrps (usrp2 only for now).
Diffstat (limited to 'include/usrp_uhd/usrp')
-rw-r--r--include/usrp_uhd/usrp/mboard/Makefile.am3
-rw-r--r--include/usrp_uhd/usrp/mboard/usrp2.hpp53
2 files changed, 55 insertions, 1 deletions
diff --git a/include/usrp_uhd/usrp/mboard/Makefile.am b/include/usrp_uhd/usrp/mboard/Makefile.am
index 558999850..bcc6b832c 100644
--- a/include/usrp_uhd/usrp/mboard/Makefile.am
+++ b/include/usrp_uhd/usrp/mboard/Makefile.am
@@ -22,4 +22,5 @@ SUBDIRS =
this_includedir = $(includedir)/usrp_uhd/usrp/mboard
this_include_HEADERS = \
base.hpp \
- test.hpp
+ test.hpp \
+ usrp2.hpp
diff --git a/include/usrp_uhd/usrp/mboard/usrp2.hpp b/include/usrp_uhd/usrp/mboard/usrp2.hpp
new file mode 100644
index 000000000..ea0083bc4
--- /dev/null
+++ b/include/usrp_uhd/usrp/mboard/usrp2.hpp
@@ -0,0 +1,53 @@
+//
+// Copyright 2010 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP
+#define INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP
+
+#include <usrp_uhd/usrp/mboard/base.hpp>
+#include <usrp_uhd/device_addr.hpp>
+#include <usrp_uhd/usrp/dboard/manager.hpp>
+#include <map>
+
+namespace usrp_uhd{ namespace usrp{ namespace mboard{
+
+/*!
+ * The usrp2 mboard class.
+ */
+class usrp2 : public base{
+public:
+ /*!
+ * Discover usrp2 devices over the ethernet.
+ * This static method will be called by the device::discover.
+ * \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);
+
+ usrp2(const device_addr_t &);
+ ~usrp2(void);
+
+private:
+ void get(const wax::type &, wax::type &);
+ void set(const wax::type &, const wax::type &);
+
+ std::map<std::string, dboard::manager::sptr> _dboard_managers;
+};
+
+}}} //namespace
+
+#endif /* INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP */