diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-comedi | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/include/comedi/api.h | 2 | ||||
| -rw-r--r-- | gr-comedi/include/comedi/sink_s.h | 4 | ||||
| -rw-r--r-- | gr-comedi/include/comedi/source_s.h | 4 | ||||
| -rw-r--r-- | gr-comedi/lib/sink_s_impl.cc | 10 | ||||
| -rw-r--r-- | gr-comedi/lib/source_s_impl.cc | 10 |
5 files changed, 15 insertions, 15 deletions
diff --git a/gr-comedi/include/comedi/api.h b/gr-comedi/include/comedi/api.h index 54aa18f317..1afaf0d18c 100644 --- a/gr-comedi/include/comedi/api.h +++ b/gr-comedi/include/comedi/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_COMEDI_API_H #define INCLUDED_COMEDI_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_comedi_EXPORTS # define COMEDI_API __GR_ATTR_EXPORT diff --git a/gr-comedi/include/comedi/sink_s.h b/gr-comedi/include/comedi/sink_s.h index 309bce17e5..3996957dde 100644 --- a/gr-comedi/include/comedi/sink_s.h +++ b/gr-comedi/include/comedi/sink_s.h @@ -24,7 +24,7 @@ #define INCLUDED_COMEDI_SINK_H #include <comedi/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace comedi { @@ -36,7 +36,7 @@ namespace gr { * * Input samples must be in the range [-32768,32767]. */ - class COMEDI_API sink_s : virtual public gr_sync_block + class COMEDI_API sink_s : virtual public sync_block { public: // gr::comedi::sink_s::sptr diff --git a/gr-comedi/include/comedi/source_s.h b/gr-comedi/include/comedi/source_s.h index 6608e45446..25276948e1 100644 --- a/gr-comedi/include/comedi/source_s.h +++ b/gr-comedi/include/comedi/source_s.h @@ -24,7 +24,7 @@ #define INCLUDED_COMEDI_SOURCE_S_H #include <comedi/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace comedi { @@ -36,7 +36,7 @@ namespace gr { * * Output samples will be in the range [-32768,32767]. */ - class COMEDI_API source_s : virtual public gr_sync_block + class COMEDI_API source_s : virtual public sync_block { public: // gr::comedi::source_s::sptr diff --git a/gr-comedi/lib/sink_s_impl.cc b/gr-comedi/lib/sink_s_impl.cc index bc7ec5022a..df2040adf9 100644 --- a/gr-comedi/lib/sink_s_impl.cc +++ b/gr-comedi/lib/sink_s_impl.cc @@ -27,7 +27,7 @@ #include <sys/mman.h> #include "sink_s_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdio.h> #include <errno.h> #include <iostream> @@ -58,9 +58,9 @@ namespace gr { sink_s_impl::sink_s_impl(int sampling_freq, const std::string device_name) - : gr_sync_block("comedi_sink_s", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("comedi_sink_s", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sampling_freq(sampling_freq), d_device_name(device_name.empty() ? default_device_name() : device_name), d_dev(0), @@ -142,7 +142,7 @@ namespace gr { set_output_multiple(d_n_chan*sizeof(sampl_t)); assert(sizeof(sampl_t) == sizeof(short)); - set_output_signature(gr_make_io_signature(1, 1, sizeof(sampl_t))); + set_output_signature(io_signature::make(1, 1, sizeof(sampl_t))); } bool diff --git a/gr-comedi/lib/source_s_impl.cc b/gr-comedi/lib/source_s_impl.cc index 2082177933..2c839208be 100644 --- a/gr-comedi/lib/source_s_impl.cc +++ b/gr-comedi/lib/source_s_impl.cc @@ -27,7 +27,7 @@ #include <sys/mman.h> #include "source_s_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdio.h> #include <errno.h> #include <iostream> @@ -55,9 +55,9 @@ namespace gr { source_s_impl::source_s_impl(int sampling_freq, const std::string device_name) - : gr_sync_block("comedi_source_s", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), + : sync_block("comedi_source_s", + io_signature::make(0, 0, 0), + io_signature::make(0, 0, 0)), d_sampling_freq(sampling_freq), d_device_name(device_name.empty() ? default_device_name() : device_name), d_dev(0), @@ -139,7 +139,7 @@ namespace gr { set_output_multiple(d_n_chan*sizeof(sampl_t)); assert(sizeof(sampl_t) == sizeof(short)); - set_output_signature(gr_make_io_signature(1, 1, sizeof(sampl_t))); + set_output_signature(io_signature::make(1, 1, sizeof(sampl_t))); } bool |