diff options
author | Josh Blum | 2010-02-26 15:17:38 -0800 |
---|---|---|
committer | Josh Blum | 2010-02-26 15:17:38 -0800 |
commit | 7c23fd43214e8a729b3022db281dc85040f0e749 (patch) | |
tree | 9c53d9cbde010ba794b536f09dc85dd262002b3a /gr-uhd/lib | |
parent | 54179f7f860dcf8bc986fd90a22a5be8322b5fdf (diff) | |
download | gnuradio-7c23fd43214e8a729b3022db281dc85040f0e749.tar.gz gnuradio-7c23fd43214e8a729b3022db281dc85040f0e749.tar.bz2 gnuradio-7c23fd43214e8a729b3022db281dc85040f0e749.zip |
Created simple source (with nothing in it) and some swig build stuff.
Seems to work and compile
Diffstat (limited to 'gr-uhd/lib')
-rw-r--r-- | gr-uhd/lib/Makefile.am | 19 | ||||
-rw-r--r-- | gr-uhd/lib/uhd_simple_source.cc | 81 | ||||
-rw-r--r-- | gr-uhd/lib/uhd_simple_source.h | 50 |
3 files changed, 150 insertions, 0 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index b78d07ee8..2f49ed2d6 100644 --- a/gr-uhd/lib/Makefile.am +++ b/gr-uhd/lib/Makefile.am @@ -20,3 +20,22 @@ # include $(top_srcdir)/Makefile.common + +AM_CPPFLAGS = \ + $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_INCLUDES) \ + $(UHD_CFLAGS) + +lib_LTLIBRARIES = libgnuradio-uhd.la + +libgnuradio_uhd_la_SOURCES = \ + uhd_simple_source.cc + +libgnuradio_uhd_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + $(UHD_LIBS) + +grinclude_HEADERS = \ + uhd_simple_source.h + +noinst_HEADERS = diff --git a/gr-uhd/lib/uhd_simple_source.cc b/gr-uhd/lib/uhd_simple_source.cc new file mode 100644 index 000000000..588b27627 --- /dev/null +++ b/gr-uhd/lib/uhd_simple_source.cc @@ -0,0 +1,81 @@ +/* -*- c++ -*- */ +/* + * Copyright 2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio 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, or (at your option) + * any later version. + * + * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#include <uhd_simple_source.h> +#include <gr_io_signature.h> +#include <stdexcept> + +/*********************************************************************** + * Helper Functions + **********************************************************************/ +static gr_io_signature_sptr make_io_sig(const std::string &type){ + if(type == "32fc"){ + return gr_make_io_signature(1, 1, sizeof(std::complex<float>)); + } + if(type == "16sc"){ + return gr_make_io_signature(1, 1, sizeof(std::complex<short>)); + } + throw std::runtime_error("unknown type"); +} + +/*********************************************************************** + * Make UHD Source + **********************************************************************/ +boost::shared_ptr<uhd_simple_source> uhd_make_simple_source( + const uhd::device_addr_t &addr, + const std::string &type +){ + return boost::shared_ptr<uhd_simple_source>( + new uhd_simple_source(addr, type) + ); +} + +/*********************************************************************** + * UHD Source + **********************************************************************/ +uhd_simple_source::uhd_simple_source( + const uhd::device_addr_t &addr, + const std::string &type +) : gr_sync_block( + "uhd source", + gr_make_io_signature(0, 0, 0), + make_io_sig(type) +){ + _type = type; + _dev = uhd::device::make(addr); +} + +uhd_simple_source::~uhd_simple_source(void){ + /* NOP */ +} + +/*********************************************************************** + * Work + **********************************************************************/ +int uhd_simple_source::work( + int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items +){ + uhd::metadata_t metadata; + return _dev->recv(boost::asio::buffer(output_items[0], noutput_items), metadata, _type); +} diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h new file mode 100644 index 000000000..156b9f357 --- /dev/null +++ b/gr-uhd/lib/uhd_simple_source.h @@ -0,0 +1,50 @@ +/* -*- c++ -*- */ +/* + * Copyright 2010 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio 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, or (at your option) + * any later version. + * + * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_UHD_SIMPLE_SOURCE_H +#define INCLUDED_UHD_SIMPLE_SOURCE_H + +#include <gr_sync_block.h> +#include <uhd/device.hpp> + +class uhd_simple_source; + +boost::shared_ptr<uhd_simple_source> +uhd_make_simple_source(const uhd::device_addr_t &addr, const std::string &type); + +class uhd_simple_source : public gr_sync_block{ +public: + uhd_simple_source(const uhd::device_addr_t &addr, const std::string &type); + ~uhd_simple_source(void); + + int work( + int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items + ); + +protected: + uhd::device::sptr _dev; + std::string _type; +}; + +#endif /* INCLUDED_UHD_SIMPLE_SOURCE_H */ |