gr-digital: adding a new top-level block for digital comms work.

22 files changed, 871 insertions, 0 deletions

diff --git a/gr-digital/.gitignore b/gr-digital/.gitignore
new file mode 100644
index 000000000..37c287f40
--- /dev/null
+++ b/gr-digital/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+gnuradio-digital.pc
diff --git a/gr-digital/Makefile.am b/gr-digital/Makefile.am
new file mode 100644
index 000000000..62c40f2df
--- /dev/null
+++ b/gr-digital/Makefile.am
@@ -0,0 +1,31 @@
+#
+# 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 $(top_srcdir)/Makefile.common
+
+SUBDIRS = lib
+
+if PYTHON
+SUBDIRS += swig python apps grc
+endif
+
+pkgconfigdir = $(libdir)/pkgconfig
+dist_pkgconfig_DATA = gnuradio-digital.pc
diff --git a/gr-digital/README b/gr-digital/README
new file mode 100644
index 000000000..af2005c97
--- /dev/null
+++ b/gr-digital/README
@@ -0,0 +1,4 @@
+This GNU Radio component for implementing digitial modulators and demodulators.
+
+
+FIXME: just fixme.
\ No newline at end of file
diff --git a/gr-digital/apps/.gitignore b/gr-digital/apps/.gitignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/gr-digital/apps/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/gr-digital/apps/Makefile.am b/gr-digital/apps/Makefile.am
new file mode 100644
index 000000000..7373a0719
--- /dev/null
+++ b/gr-digital/apps/Makefile.am
@@ -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 $(top_srcdir)/Makefile.common
+
+if PYTHON
+
+dist_bin_SCRIPTS =
+
+noinst_PYTHON =
+
+endif
+
+EXTRA_DIST +=
+
diff --git a/gr-digital/gnuradio-digital.pc.in b/gr-digital/gnuradio-digital.pc.in
new file mode 100644
index 000000000..6c0a7ccf8
--- /dev/null
+++ b/gr-digital/gnuradio-digital.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: gnuradio-digital
+Description: GNU Radio blocks for digital communications
+Requires: gnuradio-core
+Version: @LIBVER@
+Libs: -L${libdir} -lgnuradio-digital
+Cflags: -I${includedir}
diff --git a/gr-digital/grc/.gitignore b/gr-digital/grc/.gitignore
new file mode 100644
index 000000000..3dda72986
--- /dev/null
+++ b/gr-digital/grc/.gitignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am
new file mode 100644
index 000000000..062b85005
--- /dev/null
+++ b/gr-digital/grc/Makefile.am
@@ -0,0 +1,27 @@
+#
+# 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 $(top_srcdir)/Makefile.common
+
+grcblocksdir = $(grc_blocksdir)
+
+dist_grcblocks_DATA = 
+
diff --git a/gr-digital/lib/.gitignore b/gr-digital/lib/.gitignore
new file mode 100644
index 000000000..1b6114c39
--- /dev/null
+++ b/gr-digital/lib/.gitignore
@@ -0,0 +1,4 @@
+/.libs
+/.deps
+/Makefile
+/Makefile.in
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
new file mode 100644
index 000000000..c37b48786
--- /dev/null
+++ b/gr-digital/lib/Makefile.am
@@ -0,0 +1,38 @@
+#
+# 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 $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+
+# These headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS = \
+	gr_costas_loop_cc.h
+
+lib_LTLIBRARIES = libgnuradio-digital.la
+
+libgnuradio_digital_la_SOURCES = \
+	gr_costas_loop_cc.cc
+
+libgnuradio_digital_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)
+
+libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gr-digital/lib/gr_costas_loop_cc.cc b/gr-digital/lib/gr_costas_loop_cc.cc
new file mode 100644
index 000000000..b77b19745
--- /dev/null
+++ b/gr-digital/lib/gr_costas_loop_cc.cc
@@ -0,0 +1,186 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2010,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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_costas_loop_cc.h>
+#include <gr_io_signature.h>
+#include <gr_expj.h>
+#include <gr_sincos.h>
+#include <math.h>
+
+#define M_TWOPI (2*M_PI)
+
+gr_costas_loop_cc_sptr
+gr_make_costas_loop_cc (float alpha, float beta,
+			float max_freq, float min_freq,
+			int order
+			) throw (std::invalid_argument)
+{
+  return gnuradio::get_initial_sptr(new gr_costas_loop_cc (alpha, beta,
+							max_freq, min_freq,
+							order));
+}
+
+gr_costas_loop_cc::gr_costas_loop_cc (float alpha, float beta,
+				      float max_freq, float min_freq,
+				      int order
+				      ) throw (std::invalid_argument)
+  : gr_sync_block ("costas_loop_cc",
+		   gr_make_io_signature (1, 1, sizeof (gr_complex)),
+		   gr_make_io_signature (1, 2, sizeof (gr_complex))),
+    d_alpha(alpha), d_beta(beta), 
+    d_max_freq(max_freq), d_min_freq(min_freq),
+    d_phase(0), d_freq((max_freq+min_freq)/2),
+    d_order(order), d_phase_detector(0)
+{
+  switch(d_order) {
+  case 2:
+    d_phase_detector = &gr_costas_loop_cc::phase_detector_2;
+    break;
+
+  case 4:
+    d_phase_detector = &gr_costas_loop_cc::phase_detector_4;
+    break;
+
+  case 8:
+    d_phase_detector = &gr_costas_loop_cc::phase_detector_8;
+    break;
+
+  default: 
+    throw std::invalid_argument("order must be 2, 4, or 8");
+    break;
+  }
+}
+
+float
+gr_costas_loop_cc::phase_detector_8(gr_complex sample) const
+{
+  float K = sqrt(2.0) - 1;
+  
+  if(abs(sample.real()) >= abs(sample.imag())) {
+    return ((sample.real()>0 ? 1.0 : -1.0) * sample.imag() -
+	    (sample.imag()>0 ? 1.0 : -1.0) * sample.real() * K);
+  }
+  else {
+    return ((sample.real()>0 ? 1.0 : -1.0) * sample.imag() * K -
+	    (sample.imag()>0 ? 1.0 : -1.0) * sample.real());
+  }
+}
+
+float
+gr_costas_loop_cc::phase_detector_4(gr_complex sample) const
+{
+
+  return ((sample.real()>0 ? 1.0 : -1.0) * sample.imag() -
+	  (sample.imag()>0 ? 1.0 : -1.0) * sample.real());
+}
+
+float
+gr_costas_loop_cc::phase_detector_2(gr_complex sample) const
+{
+  return (sample.real()*sample.imag());
+}
+
+void
+gr_costas_loop_cc::set_alpha(float alpha)
+{
+  d_alpha = alpha;
+}
+
+void
+gr_costas_loop_cc::set_beta(float beta)
+{
+  d_beta = beta;
+}
+
+int
+gr_costas_loop_cc::work (int noutput_items,
+			 gr_vector_const_void_star &input_items,
+			 gr_vector_void_star &output_items)
+{
+  const gr_complex *iptr = (gr_complex *) input_items[0];
+  gr_complex *optr = (gr_complex *) output_items[0];
+  gr_complex *foptr = (gr_complex *) output_items[1];
+
+  bool write_foptr = output_items.size() >= 2;
+
+  float error;
+  gr_complex nco_out;
+  
+  if (write_foptr) {
+
+    for (int i = 0; i < noutput_items; i++){
+      nco_out = gr_expj(-d_phase);
+      optr[i] = iptr[i] * nco_out;
+      
+      error = (*this.*d_phase_detector)(optr[i]);
+      if (error > 1)
+	error = 1;
+      else if (error < -1)
+	error = -1;
+      
+      d_freq = d_freq + d_beta * error;
+      d_phase = d_phase + d_freq + d_alpha * error;
+      
+      while(d_phase>M_TWOPI)
+	d_phase -= M_TWOPI;
+      while(d_phase<-M_TWOPI)
+	d_phase += M_TWOPI;
+      
+      if (d_freq > d_max_freq)
+	d_freq = d_max_freq;
+      else if (d_freq < d_min_freq)
+	d_freq = d_min_freq;
+      
+      foptr[i] = gr_complex(d_freq,0);
+    } 
+  } else {
+    for (int i = 0; i < noutput_items; i++){
+      nco_out = gr_expj(-d_phase);
+      optr[i] = iptr[i] * nco_out;
+      
+      error = (*this.*d_phase_detector)(optr[i]);
+      if (error > 1)
+	error = 1;
+      else if (error < -1)
+	error = -1;
+      
+      d_freq = d_freq + d_beta * error;
+      d_phase = d_phase + d_freq + d_alpha * error;
+      
+      while(d_phase>M_TWOPI)
+	d_phase -= M_TWOPI;
+      while(d_phase<-M_TWOPI)
+	d_phase += M_TWOPI;
+      
+      if (d_freq > d_max_freq)
+	d_freq = d_max_freq;
+      else if (d_freq < d_min_freq)
+	d_freq = d_min_freq;
+      
+    }
+  }
+  return noutput_items;
+}
diff --git a/gr-digital/lib/gr_costas_loop_cc.h b/gr-digital/lib/gr_costas_loop_cc.h
new file mode 100644
index 000000000..181880f1c
--- /dev/null
+++ b/gr-digital/lib/gr_costas_loop_cc.h
@@ -0,0 +1,145 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006 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_GR_COSTAS_LOOP_CC_H
+#define INCLUDED_GR_COSTAS_LOOP_CC_H
+
+#include <gr_sync_block.h>
+#include <stdexcept>
+#include <fstream>
+
+
+/*! \brief A Costas loop carrier recovery module.
+ * \ingroup sync_blk
+ *  
+ *  The Costas loop locks to the center frequency of a signal and
+ *  downconverts it to baseband. The second (order=2) order loop is
+ *  used for BPSK where the real part of the output signal is the
+ *  baseband BPSK signal and the imaginary part is the error
+ *  signal. When order=4, it can be used for quadrature modulations
+ *  where both I and Q (real and imaginary) are outputted.
+ *
+ *  More details can be found online:
+ *
+ *  J. Feigin, "Practical Costas loop design: Designing a simple and inexpensive
+ *  BPSK Costas loop carrier recovery circuit," RF signal processing, pp. 20-36,
+ *  2002.
+ *
+ *  http://rfdesign.com/images/archive/0102Feigin20.pdf
+ *  
+ * \param alpha the loop gain used for phase adjustment
+ * \param beta the loop gain for frequency adjustments
+ * \param max_freq the maximum frequency deviation (radians/sample) the loop can handle
+ * \param min_freq the minimum frequency deviation (radians/sample) the loop can handle
+ * \param order the loop order, either 2 or 4
+ */
+class gr_costas_loop_cc;
+typedef boost::shared_ptr<gr_costas_loop_cc> gr_costas_loop_cc_sptr;
+
+
+gr_costas_loop_cc_sptr 
+gr_make_costas_loop_cc (float alpha, float beta,
+			float max_freq, float min_freq, 
+			int order
+			) throw (std::invalid_argument);
+
+
+/*!
+ * \brief Carrier tracking PLL for QPSK
+ * \ingroup sync_blk
+ * input: complex; output: complex
+ * <br>The Costas loop can have two output streams:
+ *    stream 1 is the baseband I and Q;
+ *    stream 2 is the normalized frequency of the loop
+ *
+ * \p order must be 2 or 4.
+ */
+class gr_costas_loop_cc : public gr_sync_block
+{
+  friend gr_costas_loop_cc_sptr gr_make_costas_loop_cc (float alpha, float beta,
+							float max_freq, float min_freq, 
+							int order
+							) throw (std::invalid_argument);
+
+  float d_alpha, d_beta, d_max_freq, d_min_freq, d_phase, d_freq;
+  int d_order;
+
+  gr_costas_loop_cc (float alpha, float beta,
+		     float max_freq, float min_freq, 
+		     int order
+		     ) throw (std::invalid_argument);
+
+  /*! \brief the phase detector circuit for 8th-order PSK loops
+   *  \param sample complex sample
+   *  \return the phase error
+   */
+  float phase_detector_8(gr_complex sample) const;    // for 8PSK
+
+  /*! \brief the phase detector circuit for fourth-order loops
+   *  \param sample complex sample
+   *  \return the phase error
+   */
+  float phase_detector_4(gr_complex sample) const;    // for QPSK
+
+  /*! \brief the phase detector circuit for second-order loops
+   *  \param sample a complex sample
+   *  \return the phase error
+   */
+  float phase_detector_2(gr_complex sample) const;    // for BPSK
+
+
+  float (gr_costas_loop_cc::*d_phase_detector)(gr_complex sample) const;
+
+public:
+
+  /*! \brief set the first order gain
+   *  \param alpha
+   */
+  void set_alpha(float alpha);
+
+  /*! \brief get the first order gain
+   * 
+   */
+  float alpha() const { return d_alpha; }
+  
+  /*! \brief set the second order gain
+   *  \param beta
+   */
+  void set_beta(float beta);
+
+  /*! \brief get the second order gain
+   * 
+   */
+  float beta() const { return d_beta; }
+  
+  int work (int noutput_items,
+	    gr_vector_const_void_star &input_items,
+	    gr_vector_void_star &output_items);
+
+  /*! \brief returns the current NCO frequency in radians/sample
+   *
+   */
+  float freq() const { return d_freq; }
+};
+
+#endif
diff --git a/gr-digital/python/.gitignore b/gr-digital/python/.gitignore
new file mode 100644
index 000000000..604b402c5
--- /dev/null
+++ b/gr-digital/python/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+/run_tests
diff --git a/gr-digital/python/Makefile.am b/gr-digital/python/Makefile.am
new file mode 100644
index 000000000..5805d7933
--- /dev/null
+++ b/gr-digital/python/Makefile.am
@@ -0,0 +1,38 @@
+#
+# 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 $(top_srcdir)/Makefile.common
+
+TESTS =
+EXTRA_DIST += run_tests.in
+
+if PYTHON
+TESTS += run_tests
+
+digitaldir = $(grpythondir)/digital
+
+noinst_PYTHON = \
+	qa_digital.py
+
+digital_PYTHON = \
+	__init__.py
+
+endif
diff --git a/gr-digital/python/__init__.py b/gr-digital/python/__init__.py
new file mode 100644
index 000000000..c1aed10f9
--- /dev/null
+++ b/gr-digital/python/__init__.py
@@ -0,0 +1,24 @@
+#
+# Copyright 2006 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.
+# 
+
+# The presence of this file turns this directory into a Python package
+
+from digital_swig import *
diff --git a/gr-digital/python/qa_digital.py b/gr-digital/python/qa_digital.py
new file mode 100755
index 000000000..97e35da56
--- /dev/null
+++ b/gr-digital/python/qa_digital.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+
+class test_digital(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+if __name__ == '__main__':
+    gr_unittest.run(test_digital, "test_digital.xml")
diff --git a/gr-digital/python/run_tests.in b/gr-digital/python/run_tests.in
new file mode 100644
index 000000000..b39e7e847
--- /dev/null
+++ b/gr-digital/python/run_tests.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
+
+@top_builddir@/run_tests.sh \
+    @abs_top_srcdir@/gr-digital \
+    @abs_top_builddir@/gr-digital \
+    @srcdir@
diff --git a/gr-digital/swig/.gitignore b/gr-digital/swig/.gitignore
new file mode 100644
index 000000000..7e864f43f
--- /dev/null
+++ b/gr-digital/swig/.gitignore
@@ -0,0 +1,9 @@
+/Makefile
+/Makefile.in
+/pager_swig.py
+/pager_swig.cc
+/*.pyc
+/run_tests
+/run_guile_tests
+/guile
+/python
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
new file mode 100644
index 000000000..3b30ba789
--- /dev/null
+++ b/gr-digital/swig/Makefile.am
@@ -0,0 +1,63 @@
+#
+# 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 $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+TESTS =
+EXTRA_DIST += $(nobase_guile_DATA)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gr-digital/lib \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(PYTHON_CPPFLAGS) \
+	$(WITH_INCLUDES)
+
+if GUILE
+nobase_guile_DATA = \
+	gnuradio/digital.scm
+endif
+
+noinst_GUILE  = digital.test
+
+
+##############################
+# SWIG interface and library
+TOP_SWIG_IFILES = \
+	gr_costas_loop_cc.i
+
+# Install so that they end up available as:
+#   import gnuradio.digital
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/digital
+digital_swig_pythondir_category = \
+	gnuradio/digital
+
+# additional libraries for linking with the SWIG-generated library
+digital_swig_la_swig_libadd = \
+	$(abs_top_builddir)/gr-digital/lib/libgnuradio-digital.la
+
+# additional SWIG files to be installed
+digital_swig_swiginclude_headers = 
+
+if GUILE
+TESTS += run_guile_tests
+endif
\ No newline at end of file
diff --git a/gr-digital/swig/Makefile.swig.gen b/gr-digital/swig/Makefile.swig.gen
new file mode 100644
index 000000000..bd9aabcea
--- /dev/null
+++ b/gr-digital/swig/Makefile.swig.gen
@@ -0,0 +1,145 @@
+# -*- Makefile -*-
+#
+# Copyright 2009 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.
+# 
+
+# Makefile.swig.gen for digital_swig.i
+
+## Default install locations for these files:
+##
+## Default location for the Python directory is:
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/digital_swig
+## Default location for the Python exec directory is:
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/digital_swig
+##
+## The following can be overloaded to change the install location, but
+## this has to be done in the including Makefile.am -before-
+## Makefile.swig is included.
+
+digital_swig_pythondir_category ?= gnuradio/digital_swig
+digital_swig_pylibdir_category ?= $(digital_swig_pythondir_category)
+digital_swig_pythondir = $(pythondir)/$(digital_swig_pythondir_category)
+digital_swig_pylibdir = $(pyexecdir)/$(digital_swig_pylibdir_category)
+
+# The .so libraries for the guile modules get installed whereever guile
+# is installed, usually /usr/lib/guile/gnuradio/
+# FIXME: determince whether these should be installed with gnuradio.
+digital_swig_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/digital_swig
+# FIXME: determince whether these should be installed with gnuradio.
+digital_swig_scmdir = $(guiledir)
+
+## SWIG headers are always installed into the same directory.
+
+digital_swig_swigincludedir = $(swigincludedir)
+
+## This is a template file for a "generated" Makefile addition (in
+## this case, "Makefile.swig.gen").  By including the top-level
+## Makefile.swig, this file will be used to generate the SWIG
+## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
+## SWIG .i files to generated wrappings for; there can be more than 1
+## so long as the names are unique (no sorting is done on the
+## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
+## file will generate .cc, .py, and possibly .h files -- meaning that
+## all of these files will have the same base name (that provided for
+## the SWIG .i file).
+##
+## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
+## right thing.  For more info, see <
+## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
+
+## Other cleaned files: dependency files generated by SWIG or this Makefile
+
+MOSTLYCLEANFILES += $(DEPDIR)/*.S*
+
+## Various SWIG variables.  These can be overloaded in the including
+## Makefile.am by setting the variable value there, then including
+## Makefile.swig .
+
+digital_swig_swiginclude_HEADERS =		\
+	digital_swig.i			\
+	$(digital_swig_swiginclude_headers)
+
+if PYTHON
+digital_swig_pylib_LTLIBRARIES =		\
+	_digital_swig.la
+
+_digital_swig_la_SOURCES = 			\
+	python/digital_swig.cc		\
+	$(digital_swig_la_swig_sources)
+
+digital_swig_python_PYTHON =			\
+	digital_swig.py			\
+	$(digital_swig_python)
+
+_digital_swig_la_LIBADD =			\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(digital_swig_la_swig_libadd)
+
+_digital_swig_la_LDFLAGS =			\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(digital_swig_la_swig_ldflags)
+
+_digital_swig_la_CXXFLAGS =			\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(digital_swig_la_swig_cxxflags)
+
+python/digital_swig.cc: digital_swig.py
+digital_swig.py: digital_swig.i
+
+# Include the python dependencies for this file
+-include python/digital_swig.d
+
+endif		# end of if python
+
+if GUILE
+
+digital_swig_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-digital_swig.la
+libguile_gnuradio_digital_swig_la_SOURCES =	\
+	guile/digital_swig.cc			\
+	$(digital_swig_la_swig_sources)
+nobase_digital_swig_scm_DATA = 		\
+	gnuradio/digital_swig.scm 		\
+	gnuradio/digital_swig-primitive.scm
+libguile_gnuradio_digital_swig_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(digital_swig_la_swig_libadd)
+libguile_gnuradio_digital_swig_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(digital_swig_la_swig_ldflags)
+libguile_gnuradio_digital_swig_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(digital_swig_la_swig_cxxflags)
+
+guile/digital_swig.cc: gnuradio/digital_swig.scm
+gnuradio/digital_swig.scm: digital_swig.i
+gnuradio/digital_swig-primitive.scm: gnuradio/digital_swig.scm
+
+# Include the guile dependencies for this file
+-include guile/digital_swig.d
+
+endif				# end of GUILE
+
+
diff --git a/gr-digital/swig/gr_costas_loop_cc.i b/gr-digital/swig/gr_costas_loop_cc.i
new file mode 100644
index 000000000..488cab370
--- /dev/null
+++ b/gr-digital/swig/gr_costas_loop_cc.i
@@ -0,0 +1,44 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(gr,costas_loop_cc);
+
+gr_costas_loop_cc_sptr
+gr_make_costas_loop_cc (float alpha, float beta, 
+			float max_freq, float min_freq,
+			int order
+			) throw (std::invalid_argument);
+
+
+class gr_costas_loop_cc : public gr_sync_block
+{
+ private:
+  gr_costas_loop_cc (float alpha, float beta,
+		     float max_freq, float min_freq, int order);
+
+ public:
+   void set_alpha(float alpha);
+   float alpha();
+   void set_beta(float beta);
+   float beta();
+   float freq();   
+};
diff --git a/gr-digital/swig/run_guile_tests.in b/gr-digital/swig/run_guile_tests.in
new file mode 100644
index 000000000..5d08b0dd5
--- /dev/null
+++ b/gr-digital/swig/run_guile_tests.in
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. @top_builddir@/setup_guile_test_env
+
+# 1st argument is absolute path to hand coded guile source directory
+# 2nd argument is absolute path to component C++ shared library build directory
+# 3nd argument is absolute path to component SWIG build directory
+
+add_local_paths \
+    @srcdir@ \
+    @abs_builddir@ \
+    @abs_builddir@
+
+@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@