From 5e455ca92280e3c22f5484cb81a2aef0cdfb5de4 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 29 Jan 2010 19:22:40 -0800 Subject: Minimal framework in place to handle udp discovery. Added usrp2 stuff, udp wrapper, discovery function. Added app called discover usrps (usrp2 only for now). --- include/usrp_uhd/usrp/mboard/Makefile.am | 3 +- include/usrp_uhd/usrp/mboard/usrp2.hpp | 53 ++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 include/usrp_uhd/usrp/mboard/usrp2.hpp (limited to 'include/usrp_uhd/usrp/mboard') 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 . +// + +#ifndef INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP +#define INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP + +#include +#include +#include +#include + +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 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 _dboard_managers; +}; + +}}} //namespace + +#endif /* INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP */ -- cgit v1.2.3