From c5480830c6e8e8e862523b3ebf3117fda8a100df Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 9 Feb 2010 16:28:16 -0800 Subject: renamed usrp_uhd to uhd --- include/usrp_uhd/usrp/mboard/.gitignore | 2 -- include/usrp_uhd/usrp/mboard/Makefile.am | 26 ---------------- include/usrp_uhd/usrp/mboard/base.hpp | 45 --------------------------- include/usrp_uhd/usrp/mboard/test.hpp | 46 --------------------------- include/usrp_uhd/usrp/mboard/usrp2.hpp | 53 -------------------------------- 5 files changed, 172 deletions(-) delete mode 100644 include/usrp_uhd/usrp/mboard/.gitignore delete mode 100644 include/usrp_uhd/usrp/mboard/Makefile.am delete mode 100644 include/usrp_uhd/usrp/mboard/base.hpp delete mode 100644 include/usrp_uhd/usrp/mboard/test.hpp delete mode 100644 include/usrp_uhd/usrp/mboard/usrp2.hpp (limited to 'include/usrp_uhd/usrp/mboard') diff --git a/include/usrp_uhd/usrp/mboard/.gitignore b/include/usrp_uhd/usrp/mboard/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/include/usrp_uhd/usrp/mboard/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/include/usrp_uhd/usrp/mboard/Makefile.am b/include/usrp_uhd/usrp/mboard/Makefile.am deleted file mode 100644 index bcc6b832c..000000000 --- a/include/usrp_uhd/usrp/mboard/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# -# 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 . -# - -include $(top_srcdir)/Makefile.common - -SUBDIRS = - -this_includedir = $(includedir)/usrp_uhd/usrp/mboard -this_include_HEADERS = \ - base.hpp \ - test.hpp \ - usrp2.hpp diff --git a/include/usrp_uhd/usrp/mboard/base.hpp b/include/usrp_uhd/usrp/mboard/base.hpp deleted file mode 100644 index 65810f329..000000000 --- a/include/usrp_uhd/usrp/mboard/base.hpp +++ /dev/null @@ -1,45 +0,0 @@ -// -// 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_BASE_HPP -#define INCLUDED_USRP_UHD_USRP_MBOARD_BASE_HPP - -#include -#include -#include - -namespace usrp_uhd{ namespace usrp{ namespace mboard{ - -/*! - * A base class for usrp mboard objects. - */ -class base : boost::noncopyable, public wax::obj{ -public: - typedef boost::shared_ptr sptr; - base(void); - ~base(void); - - //TODO other api calls - -private: - virtual void get(const wax::obj &, wax::obj &) = 0; - virtual void set(const wax::obj &, const wax::obj &) = 0; -}; - -}}} //namespace - -#endif /* INCLUDED_USRP_UHD_USRP_MBOARD_BASE_HPP */ diff --git a/include/usrp_uhd/usrp/mboard/test.hpp b/include/usrp_uhd/usrp/mboard/test.hpp deleted file mode 100644 index fc1ea6e70..000000000 --- a/include/usrp_uhd/usrp/mboard/test.hpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// 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_TEST_HPP -#define INCLUDED_USRP_UHD_USRP_MBOARD_TEST_HPP - -#include -#include -#include -#include - -namespace usrp_uhd{ namespace usrp{ namespace mboard{ - -/*! - * A test usrp mboard object. - * Exercises access routines for the test suite. - */ -class test : public base{ -public: - test(const device_addr_t &); - ~test(void); - -private: - void get(const wax::obj &, wax::obj &); - void set(const wax::obj &, const wax::obj &); - - std::map _dboard_managers; -}; - -}}} //namespace - -#endif /* INCLUDED_USRP_UHD_USRP_MBOARD_TEST_HPP */ diff --git a/include/usrp_uhd/usrp/mboard/usrp2.hpp b/include/usrp_uhd/usrp/mboard/usrp2.hpp deleted file mode 100644 index a8e950d93..000000000 --- a/include/usrp_uhd/usrp/mboard/usrp2.hpp +++ /dev/null @@ -1,53 +0,0 @@ -// -// 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::obj &, wax::obj &); - void set(const wax::obj &, const wax::obj &); - - std::map _dboard_managers; -}; - -}}} //namespace - -#endif /* INCLUDED_USRP_UHD_USRP_MBOARD_USRP2_HPP */ -- cgit v1.2.3