diff options
Diffstat (limited to 'gr-digital/hier')
-rw-r--r-- | gr-digital/hier/CMakeLists.txt | 43 | ||||
-rw-r--r-- | gr-digital/hier/digital_cpmmod_bc.h | 7 | ||||
-rw-r--r-- | gr-digital/hier/digital_gmskmod_bc.h | 7 |
3 files changed, 51 insertions, 6 deletions
diff --git a/gr-digital/hier/CMakeLists.txt b/gr-digital/hier/CMakeLists.txt new file mode 100644 index 000000000..f46acc81e --- /dev/null +++ b/gr-digital/hier/CMakeLists.txt @@ -0,0 +1,43 @@ +# Copyright 2011 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. + +######################################################################## +# This file included, use CMake directory variables +######################################################################## + +LIST(APPEND gr_digital_sources + ${CMAKE_CURRENT_SOURCE_DIR}/digital_gmskmod_bc.cc + ${CMAKE_CURRENT_SOURCE_DIR}/digital_cpmmod_bc.cc +) + +INSTALL(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/digital_gmskmod_bc.h + ${CMAKE_CURRENT_SOURCE_DIR}/digital_cpmmod_bc.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio + COMPONENT "digital_devel" +) + +INSTALL( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/_digital_hier.i + ${CMAKE_CURRENT_SOURCE_DIR}/digital_gmskmod_bc.i + ${CMAKE_CURRENT_SOURCE_DIR}/digital_cpmmod_bc.i + DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig + COMPONENT "digital_swig" +) diff --git a/gr-digital/hier/digital_cpmmod_bc.h b/gr-digital/hier/digital_cpmmod_bc.h index 6212fc777..4e9547cd6 100644 --- a/gr-digital/hier/digital_cpmmod_bc.h +++ b/gr-digital/hier/digital_cpmmod_bc.h @@ -23,6 +23,7 @@ #ifndef INCLUDED_DIGITAL_CPMMOD_BC_H #define INCLUDED_DIGITAL_CPMMOD_BC_H +#include <digital_api.h> #include <gr_hier_block2.h> #include <gr_char_to_float.h> #include <gr_interp_fir_filter_fff.h> @@ -34,7 +35,7 @@ class digital_cpmmod_bc; typedef boost::shared_ptr<digital_cpmmod_bc> digital_cpmmod_bc_sptr; -digital_cpmmod_bc_sptr +DIGITAL_API digital_cpmmod_bc_sptr digital_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta=0.3); @@ -70,9 +71,9 @@ digital_make_cpmmod_bc(int type, float h, * The modulator will silently accept any other inputs, though. * The output is the phase-modulated signal. */ -class digital_cpmmod_bc : public gr_hier_block2 +class DIGITAL_API digital_cpmmod_bc : public gr_hier_block2 { - friend digital_cpmmod_bc_sptr digital_make_cpmmod_bc(int type, float h, + friend DIGITAL_API digital_cpmmod_bc_sptr digital_make_cpmmod_bc(int type, float h, unsigned samples_per_sym, unsigned L, double beta); diff --git a/gr-digital/hier/digital_gmskmod_bc.h b/gr-digital/hier/digital_gmskmod_bc.h index 92b53cd4b..33fcc6c12 100644 --- a/gr-digital/hier/digital_gmskmod_bc.h +++ b/gr-digital/hier/digital_gmskmod_bc.h @@ -23,13 +23,14 @@ #ifndef INCLUDED_DIGITAL_GMSKMOD_BC_H #define INCLUDED_DIGITAL_GMSKMOD_BC_H +#include <digital_api.h> #include <digital_cpmmod_bc.h> class digital_gmskmod_bc; typedef boost::shared_ptr<digital_gmskmod_bc> digital_gmskmod_bc_sptr; -digital_gmskmod_bc_sptr +DIGITAL_API digital_gmskmod_bc_sptr digital_make_gmskmod_bc(unsigned samples_per_sym=2, double bt=0.3, unsigned L=4); @@ -49,9 +50,9 @@ digital_make_gmskmod_bc(unsigned samples_per_sym=2, * The modulator will silently accept any other inputs, though. * The output is the phase-modulated signal. */ -class digital_gmskmod_bc : public digital_cpmmod_bc +class DIGITAL_API digital_gmskmod_bc : public digital_cpmmod_bc { - friend digital_gmskmod_bc_sptr digital_make_gmskmod_bc(unsigned samples_per_sym, + friend DIGITAL_API digital_gmskmod_bc_sptr digital_make_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L); digital_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L); |