diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-comedi | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | gr-comedi/include/gnuradio/comedi/sink_s.h | 2 | ||||
| -rw-r--r-- | gr-comedi/include/gnuradio/comedi/source_s.h | 2 | ||||
| -rw-r--r-- | gr-comedi/lib/sink_s_impl.h | 2 | ||||
| -rw-r--r-- | gr-comedi/lib/source_s_impl.cc | 4 | ||||
| -rw-r--r-- | gr-comedi/lib/source_s_impl.h | 2 | ||||
| -rw-r--r-- | gr-comedi/python/comedi/__init__.py | 10 |
7 files changed, 15 insertions, 15 deletions
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index d09bb186b4..7c67bb56ac 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 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, diff --git a/gr-comedi/include/gnuradio/comedi/sink_s.h b/gr-comedi/include/gnuradio/comedi/sink_s.h index e5aa6dcd33..6d60b76069 100644 --- a/gr-comedi/include/gnuradio/comedi/sink_s.h +++ b/gr-comedi/include/gnuradio/comedi/sink_s.h @@ -28,7 +28,7 @@ namespace gr { namespace comedi { - + /*! * \brief sink using COMEDI * diff --git a/gr-comedi/include/gnuradio/comedi/source_s.h b/gr-comedi/include/gnuradio/comedi/source_s.h index 84c98517ce..cab6f82018 100644 --- a/gr-comedi/include/gnuradio/comedi/source_s.h +++ b/gr-comedi/include/gnuradio/comedi/source_s.h @@ -28,7 +28,7 @@ namespace gr { namespace comedi { - + /*! * \brief source using COMEDI * diff --git a/gr-comedi/lib/sink_s_impl.h b/gr-comedi/lib/sink_s_impl.h index 22838a812b..738664c28c 100644 --- a/gr-comedi/lib/sink_s_impl.h +++ b/gr-comedi/lib/sink_s_impl.h @@ -30,7 +30,7 @@ namespace gr { namespace comedi { - + class sink_s_impl : public sink_s { private: diff --git a/gr-comedi/lib/source_s_impl.cc b/gr-comedi/lib/source_s_impl.cc index 2c839208be..4e3d9e1c08 100644 --- a/gr-comedi/lib/source_s_impl.cc +++ b/gr-comedi/lib/source_s_impl.cc @@ -70,7 +70,7 @@ namespace gr { { int aref = AREF_GROUND; int range = 0; - + d_dev = comedi_open(d_device_name.c_str()); if(d_dev == 0) { comedi_perror(d_device_name.c_str()); @@ -214,7 +214,7 @@ namespace gr { d_buf_back = d_buf_front; } while(work_left > 0); - + return noutput_items; } diff --git a/gr-comedi/lib/source_s_impl.h b/gr-comedi/lib/source_s_impl.h index 47e78c70e7..d3ba10d231 100644 --- a/gr-comedi/lib/source_s_impl.h +++ b/gr-comedi/lib/source_s_impl.h @@ -30,7 +30,7 @@ namespace gr { namespace comedi { - + class source_s_impl : public source_s { private: diff --git a/gr-comedi/python/comedi/__init__.py b/gr-comedi/python/comedi/__init__.py index 939889dccb..701b82af70 100644 --- a/gr-comedi/python/comedi/__init__.py +++ b/gr-comedi/python/comedi/__init__.py @@ -1,22 +1,22 @@ # Copyright 2012 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. -# +# ''' Blocks and utilities for COMEDI devices |