diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-10-04 12:58:50 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-10-04 13:35:05 -0400 |
| commit | dfda3abece86bd3ba4ad51214726827cbc705c30 (patch) | |
| tree | cf2fe5c46203c1733953c8a4bcaa54da643e6e48 /gr-shd/lib | |
| parent | b205e8cda30fb3a20e2d0d0409c12e58417d92f3 (diff) | |
shd: changed name from xmini to smini in GR interface; needs to be matched in the s-mini firmware.
Diffstat (limited to 'gr-shd/lib')
| -rw-r--r-- | gr-shd/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-shd/lib/gr_shd_smini_sink.cc (renamed from gr-shd/lib/gr_shd_xmini_sink.cc) | 18 | ||||
| -rw-r--r-- | gr-shd/lib/gr_shd_smini_source.cc (renamed from gr-shd/lib/gr_shd_xmini_source.cc) | 18 |
3 files changed, 20 insertions, 20 deletions
diff --git a/gr-shd/lib/Makefile.am b/gr-shd/lib/Makefile.am index fe0f51e3db..7a887aebf0 100644 --- a/gr-shd/lib/Makefile.am +++ b/gr-shd/lib/Makefile.am @@ -30,8 +30,8 @@ AM_CPPFLAGS = \ lib_LTLIBRARIES = libgnuradio-shd.la libgnuradio_shd_la_SOURCES = \ - gr_shd_xmini_source.cc \ - gr_shd_xmini_sink.cc + gr_shd_smini_source.cc \ + gr_shd_smini_sink.cc libgnuradio_shd_la_LIBADD = \ $(GNURADIO_CORE_LA) \ diff --git a/gr-shd/lib/gr_shd_xmini_sink.cc b/gr-shd/lib/gr_shd_smini_sink.cc index d2dfb19ff3..c9fb222d09 100644 --- a/gr-shd/lib/gr_shd_xmini_sink.cc +++ b/gr-shd/lib/gr_shd_smini_sink.cc @@ -19,20 +19,20 @@ * Boston, MA 02110-1301, USA. */ -#include <gr_shd_xmini_sink.h> +#include <gr_shd_smini_sink.h> #include <gr_io_signature.h> #include <stdexcept> /********************************************************************* - * SHD Multi XMINI Sink Impl + * SHD Multi SMINI Sink Impl ********************************************************************/ -class shd_xmini_sink_impl : public shd_xmini_sink +class shd_smini_sink_impl : public shd_smini_sink { public: - shd_xmini_sink_impl(const shd::device_addr_t &device_addr, + shd_smini_sink_impl(const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels): - gr_sync_block("gr shd xmini sink", + gr_sync_block("gr shd smini sink", gr_make_io_signature(num_channels, num_channels, io_type.size), gr_make_io_signature(0, 0, 0)), _type(io_type), @@ -263,14 +263,14 @@ protected: }; /********************************************************************* - * Make SHD Multi XMINI Sink + * Make SHD Multi SMINI Sink ********************************************************************/ -boost::shared_ptr<shd_xmini_sink> shd_make_xmini_sink( +boost::shared_ptr<shd_smini_sink> shd_make_smini_sink( const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels) { - return boost::shared_ptr<shd_xmini_sink>( - new shd_xmini_sink_impl(device_addr, io_type, num_channels)); + return boost::shared_ptr<shd_smini_sink>( + new shd_smini_sink_impl(device_addr, io_type, num_channels)); } diff --git a/gr-shd/lib/gr_shd_xmini_source.cc b/gr-shd/lib/gr_shd_smini_source.cc index ac8e587097..caf98f3118 100644 --- a/gr-shd/lib/gr_shd_xmini_source.cc +++ b/gr-shd/lib/gr_shd_smini_source.cc @@ -19,25 +19,25 @@ * Boston, MA 02110-1301, USA. */ -#include <gr_shd_xmini_source.h> +#include <gr_shd_smini_source.h> #include <gr_io_signature.h> #include <stdexcept> #include <iostream> #include <boost/format.hpp> /********************************************************************* - * SHD Multi XMINI Source Impl + * SHD Multi S-MINI Source Impl ********************************************************************/ -class shd_xmini_source_impl : public shd_xmini_source +class shd_smini_source_impl : public shd_smini_source { public: - shd_xmini_source_impl( + shd_smini_source_impl( const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels ): gr_sync_block( - "gr shd xmini source", + "gr shd smini source", gr_make_io_signature(0, 0, 0), gr_make_io_signature(num_channels, num_channels, io_type.size) ), @@ -286,14 +286,14 @@ private: /********************************************************************* - * Make SHD Multi XMINI Source + * Make SHD Multi SMINI Source ********************************************************************/ -boost::shared_ptr<shd_xmini_source> shd_make_xmini_source( +boost::shared_ptr<shd_smini_source> shd_make_smini_source( const shd::device_addr_t &device_addr, const shd::io_type_t &io_type, size_t num_channels) { - return boost::shared_ptr<shd_xmini_source>( - new shd_xmini_source_impl(device_addr, io_type, num_channels)); + return boost::shared_ptr<shd_smini_source>( + new shd_smini_source_impl(device_addr, io_type, num_channels)); } |