summaryrefslogtreecommitdiff
path: root/gr-digital
diff options
context:
space:
mode:
Diffstat (limited to 'gr-digital')
-rw-r--r--gr-digital/CMakeLists.txt107
-rw-r--r--gr-digital/examples/CMakeLists.txt33
-rw-r--r--gr-digital/grc/CMakeLists.txt40
-rw-r--r--gr-digital/include/CMakeLists.txt44
-rw-r--r--gr-digital/include/Makefile.am1
-rw-r--r--gr-digital/include/digital_api.h33
-rw-r--r--gr-digital/include/digital_binary_slicer_fb.h7
-rw-r--r--gr-digital/include/digital_clock_recovery_mm_cc.h7
-rw-r--r--gr-digital/include/digital_clock_recovery_mm_ff.h7
-rw-r--r--gr-digital/include/digital_cma_equalizer_cc.h7
-rw-r--r--gr-digital/include/digital_constellation.h49
-rw-r--r--gr-digital/include/digital_constellation_decoder_cb.h7
-rw-r--r--gr-digital/include/digital_constellation_receiver_cb.h7
-rw-r--r--gr-digital/include/digital_correlate_access_code_bb.h7
-rw-r--r--gr-digital/include/digital_costas_loop_cc.h9
-rw-r--r--gr-digital/include/digital_cpmmod_bc.h7
-rw-r--r--gr-digital/include/digital_crc32.h9
-rw-r--r--gr-digital/include/digital_fll_band_edge_cc.h7
-rw-r--r--gr-digital/include/digital_gmskmod_bc.h7
-rw-r--r--gr-digital/include/digital_kurtotic_equalizer_cc.h7
-rw-r--r--gr-digital/include/digital_lms_dd_equalizer_cc.h7
-rw-r--r--gr-digital/include/digital_mpsk_receiver_cc.h7
-rw-r--r--gr-digital/lib/CMakeLists.txt67
-rw-r--r--gr-digital/python/CMakeLists.txt72
-rw-r--r--gr-digital/swig/CMakeLists.txt61
25 files changed, 546 insertions, 70 deletions
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
new file mode 100644
index 000000000..23bb48f94
--- /dev/null
+++ b/gr-digital/CMakeLists.txt
@@ -0,0 +1,107 @@
+# 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.
+
+########################################################################
+# Setup dependencies
+########################################################################
+INCLUDE(GrBoost)
+
+########################################################################
+# Register component
+########################################################################
+INCLUDE(GrComponent)
+GR_REGISTER_COMPONENT("gr-digital" ENABLE_GR_DIGITAL
+ Boost_FOUND
+ ENABLE_GR_CORE_
+)
+
+GR_SET_GLOBAL(GR_DIGITAL_INCLUDE_DIRS
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+
+GR_SET_GLOBAL(GR_DIGITAL_SWIG_INCLUDE_DIRS
+ ${CMAKE_CURRENT_SOURCE_DIR}/swig
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+IF(ENABLE_GR_DIGITAL)
+
+########################################################################
+# Setup CPack components
+########################################################################
+INCLUDE(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_DIGITAL_DESCRIPTION "GNU Radio Digital Blocks")
+
+CPACK_COMPONENT("digital_runtime"
+ GROUP "Digital"
+ DISPLAY_NAME "Runtime"
+ DESCRIPTION "Dynamic link libraries"
+ DEPENDS "core_runtime"
+)
+
+CPACK_COMPONENT("digital_devel"
+ GROUP "Digital"
+ DISPLAY_NAME "Development"
+ DESCRIPTION "C++ headers, package config, import libraries"
+ DEPENDS "core_devel"
+)
+
+CPACK_COMPONENT("digital_python"
+ GROUP "Digital"
+ DISPLAY_NAME "Python"
+ DESCRIPTION "Python modules for runtime"
+ DEPENDS "core_python;digital_runtime"
+)
+
+CPACK_COMPONENT("digital_swig"
+ GROUP "Digital"
+ DISPLAY_NAME "SWIG"
+ DESCRIPTION "SWIG development .i files"
+ DEPENDS "core_swig;digital_python;digital_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+ADD_SUBDIRECTORY(include)
+ADD_SUBDIRECTORY(lib)
+IF(ENABLE_PYTHON)
+ ADD_SUBDIRECTORY(swig)
+ ADD_SUBDIRECTORY(python)
+ ADD_SUBDIRECTORY(grc)
+ ADD_SUBDIRECTORY(examples)
+ENDIF(ENABLE_PYTHON)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+CONFIGURE_FILE(
+ ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-digital.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc
+@ONLY)
+
+INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc
+ DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ COMPONENT "digital_devel"
+)
+
+ENDIF(ENABLE_GR_DIGITAL)
diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt
new file mode 100644
index 000000000..f494d0f1e
--- /dev/null
+++ b/gr-digital/examples/CMakeLists.txt
@@ -0,0 +1,33 @@
+# 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.
+
+INCLUDE(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+ transmit_path.py
+ receive_path.py
+ benchmark_tx.py
+ benchmark_rx.py
+ tx_voice.py
+ rx_voice.py
+ run_length.py
+ gen_whitener.py
+ DESTINATION ${GR_PKG_DATA_DIR}/examples/digital
+ COMPONENT "digital_python"
+)
diff --git a/gr-digital/grc/CMakeLists.txt b/gr-digital/grc/CMakeLists.txt
new file mode 100644
index 000000000..89c6db6e2
--- /dev/null
+++ b/gr-digital/grc/CMakeLists.txt
@@ -0,0 +1,40 @@
+# 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.
+
+INSTALL(FILES
+ digital_block_tree.xml
+ digital_binary_slicer_fb.xml
+ digital_clock_recovery_mm_xx.xml
+ digital_constellation_decoder_cb.xml
+ digital_correlate_access_code_bb.xml
+ digital_costas_loop_cc.xml
+ digital_cma_equalizer_cc.xml
+ digital_fll_band_edge_cc.xml
+ digital_kurtotic_equalizer_cc.xml
+ digital_lms_dd_equalizer_cc.xml
+ digital_mpsk_receiver_cc.xml
+ digital_dxpsk_mod.xml
+ digital_dxpsk_demod.xml
+ digital_psk_mod.xml
+ digital_psk_demod.xml
+ digital_qam_mod.xml
+ digital_qam_demod.xml
+ DESTINATION ${GRC_BLOCKS_DIR}
+ COMPONENT "digital_python"
+)
diff --git a/gr-digital/include/CMakeLists.txt b/gr-digital/include/CMakeLists.txt
new file mode 100644
index 000000000..7b38e645b
--- /dev/null
+++ b/gr-digital/include/CMakeLists.txt
@@ -0,0 +1,44 @@
+# 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.
+
+########################################################################
+# Install header files
+########################################################################
+INSTALL(FILES
+ digital_api.h
+ digital_binary_slicer_fb.h
+ digital_clock_recovery_mm_cc.h
+ digital_clock_recovery_mm_ff.h
+ digital_constellation.h
+ digital_constellation_receiver_cb.h
+ digital_constellation_decoder_cb.h
+ digital_correlate_access_code_bb.h
+ digital_costas_loop_cc.h
+ digital_cma_equalizer_cc.h
+ digital_crc32.h
+ digital_fll_band_edge_cc.h
+ digital_lms_dd_equalizer_cc.h
+ digital_kurtotic_equalizer_cc.h
+ digital_metric_type.h
+ digital_mpsk_receiver_cc.h
+ digital_gmskmod_bc.h
+ digital_cpmmod_bc.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+ COMPONENT "digital_devel"
+)
diff --git a/gr-digital/include/Makefile.am b/gr-digital/include/Makefile.am
index ffbc0f793..346d036ce 100644
--- a/gr-digital/include/Makefile.am
+++ b/gr-digital/include/Makefile.am
@@ -23,6 +23,7 @@ include $(top_srcdir)/Makefile.common
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
+ digital_api.h \
digital_binary_slicer_fb.h \
digital_clock_recovery_mm_cc.h \
digital_clock_recovery_mm_ff.h \
diff --git a/gr-digital/include/digital_api.h b/gr-digital/include/digital_api.h
new file mode 100644
index 000000000..d45ace13f
--- /dev/null
+++ b/gr-digital/include/digital_api.h
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+#ifndef INCLUDED_DIGITAL_API_H
+#define INCLUDED_DIGITAL_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_digital_EXPORTS
+# define DIGITAL_API __GR_ATTR_EXPORT
+#else
+# define DIGITAL_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_DIGITAL_API_H */
diff --git a/gr-digital/include/digital_binary_slicer_fb.h b/gr-digital/include/digital_binary_slicer_fb.h
index 2d10484db..9da776012 100644
--- a/gr-digital/include/digital_binary_slicer_fb.h
+++ b/gr-digital/include/digital_binary_slicer_fb.h
@@ -23,12 +23,13 @@
#ifndef INCLUDED_DIGITAL_BINARY_SLICER_FB_H
#define INCLUDED_DIGITAL_BINARY_SLICER_FB_H
+#include <digital_api.h>
#include <gr_sync_block.h>
class digital_binary_slicer_fb;
typedef boost::shared_ptr<digital_binary_slicer_fb> digital_binary_slicer_fb_sptr;
-digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
+DIGITAL_API digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
/*!
* \brief slice float binary symbol outputting 1 bit output
@@ -37,9 +38,9 @@ digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
* x < 0 --> 0
* x >= 0 --> 1
*/
-class digital_binary_slicer_fb : public gr_sync_block
+class DIGITAL_API digital_binary_slicer_fb : public gr_sync_block
{
- friend digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
+ friend DIGITAL_API digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb ();
digital_binary_slicer_fb ();
public:
diff --git a/gr-digital/include/digital_clock_recovery_mm_cc.h b/gr-digital/include/digital_clock_recovery_mm_cc.h
index 422bf811c..e45b79229 100644
--- a/gr-digital/include/digital_clock_recovery_mm_cc.h
+++ b/gr-digital/include/digital_clock_recovery_mm_cc.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
#define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H
+#include <digital_api.h>
#include <gr_block.h>
#include <gr_complex.h>
#include <gr_math.h>
@@ -33,7 +34,7 @@ class digital_clock_recovery_mm_cc;
typedef boost::shared_ptr<digital_clock_recovery_mm_cc> digital_clock_recovery_mm_cc_sptr;
// public constructor
-digital_clock_recovery_mm_cc_sptr
+DIGITAL_API digital_clock_recovery_mm_cc_sptr
digital_make_clock_recovery_mm_cc (float omega, float gain_omega,
float mu, float gain_mu,
float omega_relative_limit=0.001);
@@ -49,7 +50,7 @@ digital_make_clock_recovery_mm_cc (float omega, float gain_omega,
* G. R. Danesfahani, T.G. Jeans, "Optimisation of modified Mueller and Muller
* algorithm," Electronics Letters, Vol. 31, no. 13, 22 June 1995, pp. 1032 - 1033.
*/
-class digital_clock_recovery_mm_cc : public gr_block
+class DIGITAL_API digital_clock_recovery_mm_cc : public gr_block
{
public:
~digital_clock_recovery_mm_cc ();
@@ -103,7 +104,7 @@ protected:
gr_complex slicer_0deg (gr_complex sample);
gr_complex slicer_45deg (gr_complex sample);
- friend digital_clock_recovery_mm_cc_sptr
+ friend DIGITAL_API digital_clock_recovery_mm_cc_sptr
digital_make_clock_recovery_mm_cc (float omega, float gain_omega,
float mu, float gain_mu,
float omega_relative_limit);
diff --git a/gr-digital/include/digital_clock_recovery_mm_ff.h b/gr-digital/include/digital_clock_recovery_mm_ff.h
index 6fc5ac261..6f88a4dcd 100644
--- a/gr-digital/include/digital_clock_recovery_mm_ff.h
+++ b/gr-digital/include/digital_clock_recovery_mm_ff.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
#define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H
+#include <digital_api.h>
#include <gr_block.h>
#include <gr_math.h>
#include <stdio.h>
@@ -33,7 +34,7 @@ class digital_clock_recovery_mm_ff;
typedef boost::shared_ptr<digital_clock_recovery_mm_ff> digital_clock_recovery_mm_ff_sptr;
// public constructor
-digital_clock_recovery_mm_ff_sptr
+DIGITAL_API digital_clock_recovery_mm_ff_sptr
digital_make_clock_recovery_mm_ff (float omega, float gain_omega,
float mu, float gain_mu,
float omega_relative_limit=0.001);
@@ -48,7 +49,7 @@ digital_make_clock_recovery_mm_ff (float omega, float gain_omega,
* Estimation and Signal Processing" by Heinrich Meyr, Marc Moeneclaey, & Stefan Fechtel.
* ISBN 0-471-50275-8.
*/
-class digital_clock_recovery_mm_ff : public gr_block
+class DIGITAL_API digital_clock_recovery_mm_ff : public gr_block
{
public:
~digital_clock_recovery_mm_ff ();
@@ -89,7 +90,7 @@ protected:
FILE *d_logfile;
float d_omega_relative_limit; // used to compute min and max omega
- friend digital_clock_recovery_mm_ff_sptr
+ friend DIGITAL_API digital_clock_recovery_mm_ff_sptr
digital_make_clock_recovery_mm_ff (float omega, float gain_omega,
float mu, float gain_mu,
float omega_relative_limit);
diff --git a/gr-digital/include/digital_cma_equalizer_cc.h b/gr-digital/include/digital_cma_equalizer_cc.h
index 0dd99debd..69e2f657a 100644
--- a/gr-digital/include/digital_cma_equalizer_cc.h
+++ b/gr-digital/include/digital_cma_equalizer_cc.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
#define INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
+#include <digital_api.h>
#include <gr_adaptive_fir_ccc.h>
#include <gr_math.h>
#include <iostream>
@@ -30,7 +31,7 @@
class digital_cma_equalizer_cc;
typedef boost::shared_ptr<digital_cma_equalizer_cc> digital_cma_equalizer_cc_sptr;
-digital_cma_equalizer_cc_sptr
+DIGITAL_API digital_cma_equalizer_cc_sptr
digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps);
/*!
@@ -43,13 +44,13 @@ digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps);
* Two-Dimensional Data Communication Systems," IEEE Transactions on
* Communications, Vol. 28, No. 11, pp. 1867 - 1875, 1980,
*/
-class digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
{
private:
float d_modulus;
float d_mu;
- friend digital_cma_equalizer_cc_sptr digital_make_cma_equalizer_cc(int num_taps,
+ friend DIGITAL_API digital_cma_equalizer_cc_sptr digital_make_cma_equalizer_cc(int num_taps,
float modulus,
float mu,
int sps);
diff --git a/gr-digital/include/digital_constellation.h b/gr-digital/include/digital_constellation.h
index 84f4814df..9b2a58588 100644
--- a/gr-digital/include/digital_constellation.h
+++ b/gr-digital/include/digital_constellation.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_CONSTELLATION_H
#define INCLUDED_DIGITAL_CONSTELLATION_H
+#include <digital_api.h>
#include <vector>
#include <math.h>
#include <gr_complex.h>
@@ -38,7 +39,7 @@
class digital_constellation;
typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr;
-class digital_constellation : public boost::enable_shared_from_this<digital_constellation>
+class DIGITAL_API digital_constellation : public boost::enable_shared_from_this<digital_constellation>
{
public:
digital_constellation (std::vector<gr_complex> constellation,
@@ -85,7 +86,7 @@ public:
unsigned int dimensionality() {return d_dimensionality;}
unsigned int bits_per_symbol () {
- return floor(log(double(d_constellation.size()))/d_dimensionality/log(2.0));
+ return floor(log(d_constellation.size())/d_dimensionality/log(2));
}
unsigned int arity () {
@@ -122,14 +123,14 @@ class digital_constellation_calcdist;
typedef boost::shared_ptr<digital_constellation_calcdist> digital_constellation_calcdist_sptr;
// public constructor
-digital_constellation_calcdist_sptr
+DIGITAL_API digital_constellation_calcdist_sptr
digital_make_constellation_calcdist (std::vector<gr_complex> constellation,
std::vector<unsigned int> pre_diff_code,
unsigned int rotational_symmetry,
unsigned int dimensionality);
-class digital_constellation_calcdist : public digital_constellation
+class DIGITAL_API digital_constellation_calcdist : public digital_constellation
{
public:
digital_constellation_calcdist (std::vector<gr_complex> constellation,
@@ -142,7 +143,7 @@ class digital_constellation_calcdist : public digital_constellation
// void calc_hard_symbol_metric(gr_complex *sample, float *metric);
private:
- friend digital_constellation_calcdist_sptr
+ friend DIGITAL_API digital_constellation_calcdist_sptr
digital_make_constellation_calcdist (std::vector<gr_complex> constellation);
};
@@ -155,7 +156,7 @@ class digital_constellation_calcdist : public digital_constellation
/* point. */
/************************************************************/
-class digital_constellation_sector : public digital_constellation
+class DIGITAL_API digital_constellation_sector : public digital_constellation
{
public:
@@ -198,7 +199,7 @@ class digital_constellation_rect;
typedef boost::shared_ptr<digital_constellation_rect> digital_constellation_rect_sptr;
// public constructor
-digital_constellation_rect_sptr
+DIGITAL_API digital_constellation_rect_sptr
digital_make_constellation_rect (std::vector<gr_complex> constellation,
std::vector<unsigned int> pre_diff_code,
unsigned int rotational_symmetry,
@@ -207,7 +208,7 @@ digital_make_constellation_rect (std::vector<gr_complex> constellation,
float width_real_sectors,
float width_imag_sectors);
-class digital_constellation_rect : public digital_constellation_sector
+class DIGITAL_API digital_constellation_rect : public digital_constellation_sector
{
public:
@@ -232,7 +233,7 @@ class digital_constellation_rect : public digital_constellation_sector
float d_width_real_sectors;
float d_width_imag_sectors;
- friend digital_constellation_rect_sptr
+ friend DIGITAL_API digital_constellation_rect_sptr
digital_make_constellation_rect (std::vector<gr_complex> constellation,
std::vector<unsigned int> pre_diff_code,
unsigned int rotational_symmetry,
@@ -257,12 +258,12 @@ class digital_constellation_psk;
typedef boost::shared_ptr<digital_constellation_psk> digital_constellation_psk_sptr;
// public constructor
-digital_constellation_psk_sptr
+DIGITAL_API digital_constellation_psk_sptr
digital_make_constellation_psk (std::vector<gr_complex> constellation,
std::vector<unsigned int> pre_diff_code,
unsigned int n_sectors);
-class digital_constellation_psk : public digital_constellation_sector
+class DIGITAL_API digital_constellation_psk : public digital_constellation_sector
{
public:
@@ -278,7 +279,7 @@ class digital_constellation_psk : public digital_constellation_sector
private:
- friend digital_constellation_psk_sptr
+ friend DIGITAL_API digital_constellation_psk_sptr
digital_make_constellation_psk (std::vector<gr_complex> constellation,
std::vector<unsigned int> pre_diff_code,
unsigned int n_sectors);
@@ -296,17 +297,17 @@ class digital_constellation_bpsk;
typedef boost::shared_ptr<digital_constellation_bpsk> digital_constellation_bpsk_sptr;
// public constructor
-digital_constellation_bpsk_sptr
+DIGITAL_API digital_constellation_bpsk_sptr
digital_make_constellation_bpsk ();
-class digital_constellation_bpsk : public digital_constellation
+class DIGITAL_API digital_constellation_bpsk : public digital_constellation
{
public:
digital_constellation_bpsk ();
unsigned int decision_maker (const gr_complex *sample);
- friend digital_constellation_bpsk_sptr
+ friend DIGITAL_API digital_constellation_bpsk_sptr
digital_make_constellation_bpsk ();
};
@@ -322,17 +323,17 @@ class digital_constellation_qpsk;
typedef boost::shared_ptr<digital_constellation_qpsk> digital_constellation_qpsk_sptr;
// public constructor
-digital_constellation_qpsk_sptr
+DIGITAL_API digital_constellation_qpsk_sptr
digital_make_constellation_qpsk ();
-class digital_constellation_qpsk : public digital_constellation
+class DIGITAL_API digital_constellation_qpsk : public digital_constellation
{
public:
digital_constellation_qpsk ();
unsigned int decision_maker (const gr_complex *sample);
- friend digital_constellation_qpsk_sptr
+ friend DIGITAL_API digital_constellation_qpsk_sptr
digital_make_constellation_qpsk ();
};
@@ -349,17 +350,17 @@ class digital_constellation_dqpsk;
typedef boost::shared_ptr<digital_constellation_dqpsk> digital_constellation_dqpsk_sptr;
// public constructor
-digital_constellation_dqpsk_sptr
+DIGITAL_API digital_constellation_dqpsk_sptr
digital_make_constellation_dqpsk ();
-class digital_constellation_dqpsk : public digital_constellation
+class DIGITAL_API digital_constellation_dqpsk : public digital_constellation
{
public:
digital_constellation_dqpsk ();
unsigned int decision_maker (const gr_complex *sample);
- friend digital_constellation_dqpsk_sptr
+ friend DIGITAL_API digital_constellation_dqpsk_sptr
digital_make_constellation_dqpsk ();
};
@@ -376,17 +377,17 @@ class digital_constellation_8psk;
typedef boost::shared_ptr<digital_constellation_8psk> digital_constellation_8psk_sptr;
// public constructor
-digital_constellation_8psk_sptr
+DIGITAL_API digital_constellation_8psk_sptr
digital_make_constellation_8psk ();
-class digital_constellation_8psk : public digital_constellation
+class DIGITAL_API digital_constellation_8psk : public digital_constellation
{
public:
digital_constellation_8psk ();
unsigned int decision_maker (const gr_complex *sample);
- friend digital_constellation_8psk_sptr
+ friend DIGITAL_API digital_constellation_8psk_sptr
digital_make_constellation_8psk ();
};
diff --git a/gr-digital/include/digital_constellation_decoder_cb.h b/gr-digital/include/digital_constellation_decoder_cb.h
index 022456733..1ce01fe12 100644
--- a/gr-digital/include/digital_constellation_decoder_cb.h
+++ b/gr-digital/include/digital_constellation_decoder_cb.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
#define INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
+#include <digital_api.h>
#include <gr_block.h>
#include <digital_constellation.h>
#include <vector>
@@ -30,7 +31,7 @@
class digital_constellation_decoder_cb;
typedef boost::shared_ptr<digital_constellation_decoder_cb>digital_constellation_decoder_cb_sptr;
-digital_constellation_decoder_cb_sptr
+DIGITAL_API digital_constellation_decoder_cb_sptr
digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
/*!
@@ -38,14 +39,14 @@ digital_make_constellation_decoder_cb (digital_constellation_sptr constellation)
* \ingroup coding_blk
*
*/
-class digital_constellation_decoder_cb : public gr_block
+class DIGITAL_API digital_constellation_decoder_cb : public gr_block
{
private:
digital_constellation_sptr d_constellation;
unsigned int d_dim;
- friend digital_constellation_decoder_cb_sptr
+ friend DIGITAL_API digital_constellation_decoder_cb_sptr
digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
digital_constellation_decoder_cb (digital_constellation_sptr constellation);
diff --git a/gr-digital/include/digital_constellation_receiver_cb.h b/gr-digital/include/digital_constellation_receiver_cb.h
index 0ac80450f..d33be8958 100644
--- a/gr-digital/include/digital_constellation_receiver_cb.h
+++ b/gr-digital/include/digital_constellation_receiver_cb.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
#define INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
+#include <digital_api.h>
#include <gr_block.h>
#include <digital_constellation.h>
#include <gri_control_loop.h>
@@ -34,7 +35,7 @@ class digital_constellation_receiver_cb;
typedef boost::shared_ptr<digital_constellation_receiver_cb> digital_constellation_receiver_cb_sptr;
// public constructor
-digital_constellation_receiver_cb_sptr
+DIGITAL_API digital_constellation_receiver_cb_sptr
digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
float loop_bw, float fmin, float fmax);
@@ -64,7 +65,7 @@ digital_make_constellation_receiver_cb (digital_constellation_sptr constellation
*
*/
-class digital_constellation_receiver_cb : public gr_block, public gri_control_loop
+class DIGITAL_API digital_constellation_receiver_cb : public gr_block, public gri_control_loop
{
public:
int general_work (int noutput_items,
@@ -106,7 +107,7 @@ private:
//! index to delay line
unsigned int d_dl_idx;
- friend digital_constellation_receiver_cb_sptr
+ friend DIGITAL_API digital_constellation_receiver_cb_sptr
digital_make_constellation_receiver_cb (digital_constellation_sptr constell,
float loop_bw, float fmin, float fmax);
};
diff --git a/gr-digital/include/digital_correlate_access_code_bb.h b/gr-digital/include/digital_correlate_access_code_bb.h
index 2607ae84c..c4cb60428 100644
--- a/gr-digital/include/digital_correlate_access_code_bb.h
+++ b/gr-digital/include/digital_correlate_access_code_bb.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H
#define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H
+#include <digital_api.h>
#include <gr_sync_block.h>
#include <string>
@@ -33,7 +34,7 @@ typedef boost::shared_ptr<digital_correlate_access_code_bb> digital_correlate_ac
* \param access_code is represented with 1 byte per bit, e.g., "010101010111000100"
* \param threshold maximum number of bits that may be wrong
*/
-digital_correlate_access_code_bb_sptr
+DIGITAL_API digital_correlate_access_code_bb_sptr
digital_make_correlate_access_code_bb (const std::string &access_code, int threshold);
/*!
@@ -49,9 +50,9 @@ digital_make_correlate_access_code_bb (const std::string &access_code, int thres
* flag bit and is 1 if the corresponding data bit is the first data
* bit following the access code. Otherwise the flag bit is 0.
*/
-class digital_correlate_access_code_bb : public gr_sync_block
+class DIGITAL_API digital_correlate_access_code_bb : public gr_sync_block
{
- friend digital_correlate_access_code_bb_sptr
+ friend DIGITAL_API digital_correlate_access_code_bb_sptr
digital_make_correlate_access_code_bb (const std::string &access_code, int threshold);
private:
unsigned long long d_access_code; // access code to locate start of packet
diff --git a/gr-digital/include/digital_costas_loop_cc.h b/gr-digital/include/digital_costas_loop_cc.h
index 7b2cd6dad..c78726341 100644
--- a/gr-digital/include/digital_costas_loop_cc.h
+++ b/gr-digital/include/digital_costas_loop_cc.h
@@ -54,11 +54,14 @@
* \param min_freq the minimum frequency deviation (radians/sample) the loop can handle
* \param order the loop order, either 2 or 4
*/
+
+#include <digital_api.h>
+
class digital_costas_loop_cc;
typedef boost::shared_ptr<digital_costas_loop_cc> digital_costas_loop_cc_sptr;
-digital_costas_loop_cc_sptr
+DIGITAL_API digital_costas_loop_cc_sptr
digital_make_costas_loop_cc (float loop_bw, int order
) throw (std::invalid_argument);
@@ -73,9 +76,9 @@ digital_make_costas_loop_cc (float loop_bw, int order
*
* \p order must be 2 or 4.
*/
-class digital_costas_loop_cc : public gr_sync_block, public gri_control_loop
+class DIGITAL_API digital_costas_loop_cc : public gr_sync_block, public gri_control_loop
{
- friend digital_costas_loop_cc_sptr
+ friend DIGITAL_API digital_costas_loop_cc_sptr
digital_make_costas_loop_cc (float loop_bw, int order
) throw (std::invalid_argument);
diff --git a/gr-digital/include/digital_cpmmod_bc.h b/gr-digital/include/digital_cpmmod_bc.h
index 6212fc777..4e9547cd6 100644
--- a/gr-digital/include/digital_cpmmod_bc.h
+++ b/gr-digital/include/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/include/digital_crc32.h b/gr-digital/include/digital_crc32.h
index 64aa12f7b..852d06f49 100644
--- a/gr-digital/include/digital_crc32.h
+++ b/gr-digital/include/digital_crc32.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_CRC32_H
#define INCLUDED_DIGITAL_CRC32_H
+#include <digital_api.h>
#include <string>
#include <gr_types.h>
@@ -35,16 +36,16 @@
* complement of the final running CRC. The resulting CRC should be
* transmitted in big endian order.
*/
-unsigned int
+DIGITAL_API unsigned int
digital_update_crc32(unsigned int crc, const unsigned char *buf, size_t len);
-unsigned int
+DIGITAL_API unsigned int
digital_update_crc32(unsigned int crc, const std::string buf);
-unsigned int
+DIGITAL_API unsigned int
digital_crc32(const unsigned char *buf, size_t len);
-unsigned int
+DIGITAL_API unsigned int
digital_crc32(const std::string buf);
#endif /* INCLUDED_CRC32_H */
diff --git a/gr-digital/include/digital_fll_band_edge_cc.h b/gr-digital/include/digital_fll_band_edge_cc.h
index 4fa7b3a3e..6ef8376ac 100644
--- a/gr-digital/include/digital_fll_band_edge_cc.h
+++ b/gr-digital/include/digital_fll_band_edge_cc.h
@@ -24,12 +24,13 @@
#ifndef INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H
#define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H
+#include <digital_api.h>
#include <gr_sync_block.h>
#include <gri_control_loop.h>
class digital_fll_band_edge_cc;
typedef boost::shared_ptr<digital_fll_band_edge_cc> digital_fll_band_edge_cc_sptr;
-digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym,
+DIGITAL_API digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym,
float rolloff,
int filter_size,
float bandwidth);
@@ -84,7 +85,7 @@ digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym
*
*/
-class digital_fll_band_edge_cc : public gr_sync_block, public gri_control_loop
+class DIGITAL_API digital_fll_band_edge_cc : public gr_sync_block, public gri_control_loop
{
private:
/*!
@@ -94,7 +95,7 @@ class digital_fll_band_edge_cc : public gr_sync_block, public gri_control_loop
* \param filter_size (int) Size (in taps) of the filter
* \param bandwidth (float) Loop bandwidth
*/
- friend digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym,
+ friend DIGITAL_API digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym,
float rolloff,
int filter_size,
float bandwidth);
diff --git a/gr-digital/include/digital_gmskmod_bc.h b/gr-digital/include/digital_gmskmod_bc.h
index 92b53cd4b..33fcc6c12 100644
--- a/gr-digital/include/digital_gmskmod_bc.h
+++ b/gr-digital/include/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);
diff --git a/gr-digital/include/digital_kurtotic_equalizer_cc.h b/gr-digital/include/digital_kurtotic_equalizer_cc.h
index e01cbd6e6..c07862e11 100644
--- a/gr-digital/include/digital_kurtotic_equalizer_cc.h
+++ b/gr-digital/include/digital_kurtotic_equalizer_cc.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
#define INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
+#include <digital_api.h>
#include <gr_adaptive_fir_ccc.h>
#include <gr_math.h>
#include <iostream>
@@ -30,7 +31,7 @@
class digital_kurtotic_equalizer_cc;
typedef boost::shared_ptr<digital_kurtotic_equalizer_cc> digital_kurtotic_equalizer_cc_sptr;
-digital_kurtotic_equalizer_cc_sptr
+DIGITAL_API digital_kurtotic_equalizer_cc_sptr
digital_make_kurtotic_equalizer_cc(int num_taps, float mu);
/*!
@@ -41,7 +42,7 @@ digital_make_kurtotic_equalizer_cc(int num_taps, float mu);
* equalization algorithm," IEEE Conf. on Control, Automation,
* Robotics and Vision, Vol. 3, Dec. 2004, pp. 2052 - 2057.
*/
-class digital_kurtotic_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_kurtotic_equalizer_cc : public gr_adaptive_fir_ccc
{
private:
float d_mu;
@@ -49,7 +50,7 @@ private:
gr_complex d_q, d_u;
float d_alpha_p, d_alpha_q, d_alpha_m;
- friend digital_kurtotic_equalizer_cc_sptr digital_make_kurtotic_equalizer_cc(int num_taps,
+ friend DIGITAL_API digital_kurtotic_equalizer_cc_sptr digital_make_kurtotic_equalizer_cc(int num_taps,
float mu);
digital_kurtotic_equalizer_cc(int num_taps, float mu);
diff --git a/gr-digital/include/digital_lms_dd_equalizer_cc.h b/gr-digital/include/digital_lms_dd_equalizer_cc.h
index e3ad4bf4a..edfa18e23 100644
--- a/gr-digital/include/digital_lms_dd_equalizer_cc.h
+++ b/gr-digital/include/digital_lms_dd_equalizer_cc.h
@@ -23,13 +23,14 @@
#ifndef INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
#define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
+#include <digital_api.h>
#include <gr_adaptive_fir_ccc.h>
#include <digital_constellation.h>
class digital_lms_dd_equalizer_cc;
typedef boost::shared_ptr<digital_lms_dd_equalizer_cc> digital_lms_dd_equalizer_cc_sptr;
-digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
+DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
float mu, int sps,
digital_constellation_sptr cnst);
@@ -65,10 +66,10 @@ digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
* Prentice Hall, 1996.
*
*/
-class digital_lms_dd_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_lms_dd_equalizer_cc : public gr_adaptive_fir_ccc
{
private:
- friend digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
+ friend DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
float mu, int sps,
digital_constellation_sptr cnst);
diff --git a/gr-digital/include/digital_mpsk_receiver_cc.h b/gr-digital/include/digital_mpsk_receiver_cc.h
index f8aa4e341..85cd81e99 100644
--- a/gr-digital/include/digital_mpsk_receiver_cc.h
+++ b/gr-digital/include/digital_mpsk_receiver_cc.h
@@ -23,6 +23,7 @@
#ifndef INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
#define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
+#include <digital_api.h>
#include <gruel/attributes.h>
#include <gri_control_loop.h>
#include <gr_block.h>
@@ -35,7 +36,7 @@ class digital_mpsk_receiver_cc;
typedef boost::shared_ptr<digital_mpsk_receiver_cc> digital_mpsk_receiver_cc_sptr;
// public constructor
-digital_mpsk_receiver_cc_sptr
+DIGITAL_API digital_mpsk_receiver_cc_sptr
digital_make_mpsk_receiver_cc (unsigned int M, float theta,
float loop_bw,
float fmin, float fmax,
@@ -78,7 +79,7 @@ digital_make_mpsk_receiver_cc (unsigned int M, float theta,
*
*/
-class digital_mpsk_receiver_cc : public gr_block, public gri_control_loop
+class DIGITAL_API digital_mpsk_receiver_cc : public gr_block, public gri_control_loop
{
public:
~digital_mpsk_receiver_cc ();
@@ -290,7 +291,7 @@ private:
//! index to delay line
unsigned int d_dl_idx;
- friend digital_mpsk_receiver_cc_sptr
+ friend DIGITAL_API digital_mpsk_receiver_cc_sptr
digital_make_mpsk_receiver_cc (unsigned int M, float theta,
float loop_bw,
float fmin, float fmax,
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
new file mode 100644
index 000000000..7cd89a56f
--- /dev/null
+++ b/gr-digital/lib/CMakeLists.txt
@@ -0,0 +1,67 @@
+# 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.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+INCLUDE_DIRECTORIES(
+ ${GNURADIO_CORE_INCLUDE_DIRS}
+ ${GR_DIGITAL_INCLUDE_DIRS}
+)
+
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+
+########################################################################
+# Setup library
+########################################################################
+LIST(APPEND gr_digital_sources
+ digital_binary_slicer_fb.cc
+ digital_clock_recovery_mm_cc.cc
+ digital_clock_recovery_mm_ff.cc
+ digital_constellation.cc
+ digital_constellation_receiver_cb.cc
+ digital_constellation_decoder_cb.cc
+ digital_correlate_access_code_bb.cc
+ digital_costas_loop_cc.cc
+ digital_cma_equalizer_cc.cc
+ digital_crc32.cc
+ digital_fll_band_edge_cc.cc
+ digital_lms_dd_equalizer_cc.cc
+ digital_kurtotic_equalizer_cc.cc
+ digital_mpsk_receiver_cc.cc
+ digital_gmskmod_bc.cc
+ digital_cpmmod_bc.cc
+)
+
+LIST(APPEND digital_libs
+ gnuradio-core
+ ${Boost_LIBRARIES}
+)
+
+ADD_LIBRARY(gnuradio-digital SHARED ${gr_digital_sources})
+TARGET_LINK_LIBRARIES(gnuradio-digital ${digital_libs})
+SET_TARGET_PROPERTIES(gnuradio-digital PROPERTIES DEFINE_SYMBOL "gnuradio_digital_EXPORTS")
+SET_TARGET_PROPERTIES(gnuradio-digital PROPERTIES SOVERSION ${LIBVER})
+
+INSTALL(TARGETS gnuradio-digital
+ LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "digital_runtime" # .so/.dylib file
+ ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "digital_devel" # .lib file
+ RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "digital_runtime" # .dll file
+)
diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt
new file mode 100644
index 000000000..2d09a4945
--- /dev/null
+++ b/gr-digital/python/CMakeLists.txt
@@ -0,0 +1,72 @@
+# 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.
+
+########################################################################
+# Setup python install
+########################################################################
+INCLUDE(GrPython)
+
+GR_PYTHON_INSTALL(
+ FILES
+ __init__.py
+ bpsk.py
+ cpm.py
+ crc.py
+ generic_mod_demod.py
+ gmsk.py
+ modulation_utils.py
+ modulation_utils2.py
+ packet_utils.py
+ pkt.py
+ psk.py
+ psk2.py
+ qam.py
+ qpsk.py
+ DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
+ COMPONENT "digital_python"
+)
+
+GR_PYTHON_INSTALL(
+ FILES
+ utils/__init__.py
+ utils/gray_code.py
+ utils/mod_codes.py
+ utils/alignment.py
+ DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital/utils
+ COMPONENT "digital_python"
+)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+IF(ENABLE_TESTING)
+INCLUDE(GrTest)
+FILE(GLOB py_qa_test_files "qa_*.py")
+FOREACH(py_qa_test_file ${py_qa_test_files})
+ GET_FILENAME_COMPONENT(py_qa_test_name ${py_qa_test_file} NAME_WE)
+ SET(GR_TEST_PYTHON_DIRS
+ ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+ ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+ ${CMAKE_BINARY_DIR}/gr-digital/python
+ ${CMAKE_BINARY_DIR}/gr-digital/swig
+ )
+ SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital)
+ GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ENDFOREACH(py_qa_test_file)
+ENDIF(ENABLE_TESTING)
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
new file mode 100644
index 000000000..307fba248
--- /dev/null
+++ b/gr-digital/swig/CMakeLists.txt
@@ -0,0 +1,61 @@
+# 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.
+
+########################################################################
+# Setup swig generation
+########################################################################
+INCLUDE(GrPython)
+INCLUDE(GrSwig)
+
+SET(GR_SWIG_INCLUDE_DIRS
+ ${GR_DIGITAL_INCLUDE_DIRS}
+ ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+SET(GR_SWIG_LIBRARIES gnuradio-digital)
+
+GR_SWIG_MAKE(digital_swig digital_swig.i)
+
+GR_SWIG_INSTALL(
+ TARGETS digital_hier digital_swig
+ DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
+ COMPONENT "digital_python"
+)
+
+INSTALL(
+ FILES
+ digital_binary_slicer_fb.i
+ digital_clock_recovery_mm_cc.i
+ digital_clock_recovery_mm_ff.i
+ digital_constellation.i
+ digital_constellation_receiver_cb.i
+ digital_constellation_decoder_cb.i
+ digital_correlate_access_code_bb.i
+ digital_costas_loop_cc.i
+ digital_cma_equalizer_cc.i
+ digital_crc32.i
+ digital_fll_band_edge_cc.i
+ digital_lms_dd_equalizer_cc.i
+ digital_kurtotic_equalizer_cc.i
+ digital_mpsk_receiver_cc.i
+ digital_gmskmod_bc.i
+ digital_cpmmod_bc.i
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+ COMPONENT "digital_swig"
+)