summaryrefslogtreecommitdiff
path: root/gr-comedi
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2013-05-19 02:55:33 -0700
committerBen Reynwar <ben@reynwar.net>2013-05-19 02:55:33 -0700
commitbb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch)
tree0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-comedi
parente4f0319eced22c112f7e6a4cc45bc2036d285332 (diff)
parent0fa219774dcf9141ae91204f948c029b05673f3f (diff)
Merged in next_docs branch.
Diffstat (limited to 'gr-comedi')
-rw-r--r--gr-comedi/CMakeLists.txt2
-rw-r--r--gr-comedi/include/gnuradio/comedi/CMakeLists.txt (renamed from gr-comedi/include/comedi/CMakeLists.txt)0
-rw-r--r--gr-comedi/include/gnuradio/comedi/api.h (renamed from gr-comedi/include/comedi/api.h)2
-rw-r--r--gr-comedi/include/gnuradio/comedi/sink_s.h (renamed from gr-comedi/include/comedi/sink_s.h)6
-rw-r--r--gr-comedi/include/gnuradio/comedi/source_s.h (renamed from gr-comedi/include/comedi/source_s.h)6
-rw-r--r--gr-comedi/lib/sink_s_impl.cc10
-rw-r--r--gr-comedi/lib/sink_s_impl.h2
-rw-r--r--gr-comedi/lib/source_s_impl.cc10
-rw-r--r--gr-comedi/lib/source_s_impl.h2
-rw-r--r--gr-comedi/swig/CMakeLists.txt2
-rw-r--r--gr-comedi/swig/comedi_swig.i8
11 files changed, 25 insertions, 25 deletions
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt
index 52a78605f3..d09bb186b4 100644
--- a/gr-comedi/CMakeLists.txt
+++ b/gr-comedi/CMakeLists.txt
@@ -88,7 +88,7 @@ CPACK_COMPONENT("comedi_swig"
########################################################################
# Add subdirectories
########################################################################
-add_subdirectory(include/comedi)
+add_subdirectory(include/gnuradio/comedi)
add_subdirectory(lib)
if(ENABLE_PYTHON)
add_subdirectory(swig)
diff --git a/gr-comedi/include/comedi/CMakeLists.txt b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt
index 51a609e421..51a609e421 100644
--- a/gr-comedi/include/comedi/CMakeLists.txt
+++ b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt
diff --git a/gr-comedi/include/comedi/api.h b/gr-comedi/include/gnuradio/comedi/api.h
index 54aa18f317..1afaf0d18c 100644
--- a/gr-comedi/include/comedi/api.h
+++ b/gr-comedi/include/gnuradio/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/gnuradio/comedi/sink_s.h
index 309bce17e5..e5aa6dcd33 100644
--- a/gr-comedi/include/comedi/sink_s.h
+++ b/gr-comedi/include/gnuradio/comedi/sink_s.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_COMEDI_SINK_H
#define INCLUDED_COMEDI_SINK_H
-#include <comedi/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/comedi/api.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/gnuradio/comedi/source_s.h
index 6608e45446..84c98517ce 100644
--- a/gr-comedi/include/comedi/source_s.h
+++ b/gr-comedi/include/gnuradio/comedi/source_s.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_COMEDI_SOURCE_S_H
#define INCLUDED_COMEDI_SOURCE_S_H
-#include <comedi/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/comedi/api.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/sink_s_impl.h b/gr-comedi/lib/sink_s_impl.h
index 6d57591ed0..22838a812b 100644
--- a/gr-comedi/lib/sink_s_impl.h
+++ b/gr-comedi/lib/sink_s_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMEDI_SINK_IMPL_H
#define INCLUDED_COMEDI_SINK_IMPL_H
-#include <comedi/sink_s.h>
+#include <gnuradio/comedi/sink_s.h>
#include <string>
#include <comedilib.h>
#include <stdexcept>
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
diff --git a/gr-comedi/lib/source_s_impl.h b/gr-comedi/lib/source_s_impl.h
index e5b062323f..47e78c70e7 100644
--- a/gr-comedi/lib/source_s_impl.h
+++ b/gr-comedi/lib/source_s_impl.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_COMEDI_SOURCE_S_IMPL_H
#define INCLUDED_COMEDI_SOURCE_S_IMPL_H
-#include <comedi/source_s.h>
+#include <gnuradio/comedi/source_s.h>
#include <string>
#include <comedilib.h>
#include <stdexcept>
diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt
index 42e6286709..0c275cc48e 100644
--- a/gr-comedi/swig/CMakeLists.txt
+++ b/gr-comedi/swig/CMakeLists.txt
@@ -37,7 +37,7 @@ endif(ENABLE_GR_CTRLPORT)
# Setup swig docs to depend on includes and pull in from build directory
set(GR_SWIG_TARGET_DEPS comedi_generated_includes)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/comedi)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/comedi)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_LIBRARIES gnuradio-comedi)
diff --git a/gr-comedi/swig/comedi_swig.i b/gr-comedi/swig/comedi_swig.i
index 179882991a..f15873b830 100644
--- a/gr-comedi/swig/comedi_swig.i
+++ b/gr-comedi/swig/comedi_swig.i
@@ -28,12 +28,12 @@
%include "comedi_swig_doc.i"
%{
-#include "comedi/sink_s.h"
-#include "comedi/source_s.h"
+#include "gnuradio/comedi/sink_s.h"
+#include "gnuradio/comedi/source_s.h"
%}
-%include "comedi/sink_s.h"
-%include "comedi/source_s.h"
+%include "gnuradio/comedi/sink_s.h"
+%include "gnuradio/comedi/source_s.h"
GR_SWIG_BLOCK_MAGIC2(comedi, sink_s);
GR_SWIG_BLOCK_MAGIC2(comedi, source_s);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 18:10:19 +0000