Merged upstream from next

7 files changed, 70 insertions, 190 deletions

diff --git a/gr-atsc/src/lib/.gitignore b/gr-atsc/src/lib/.gitignore
index 01e4ffe9a..7cd5d520b 100644
--- a/gr-atsc/src/lib/.gitignore
+++ b/gr-atsc/src/lib/.gitignore
@@ -12,3 +12,6 @@
 /atsci_viterbi_mux.cc
 /test_atsci
 /*.pyc
+/gnuradio
+/guile
+/python
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index bf9c6626a..b1bda90ff 100644
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2001,2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,11 +20,12 @@
 # 
 
 include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 	$(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
-EXTRA_DIST =					\
+EXTRA_DIST +=					\
 	atsci_viterbi_gen.cc			\
 	gen_encoder.py				\
 	qa_atsci_trellis_encoder_t1_input.dat	\
@@ -84,9 +85,10 @@ libgnuradio_atsc_la_SOURCES = 			\
 	create_atsci_equalizer.cc		\
 	create_atsci_fs_checker.cc		\
 	create_atsci_fs_correlator.cc		\
-	plinfo.cc				
+	plinfo.cc
+
 
-BUILT_SOURCES = 				\
+BUILT_SOURCES += 				\
 	atsci_viterbi_mux.cc
 
 libgnuradio_atsc_la_LIBADD = 			\
@@ -210,12 +212,11 @@ test_atsci_LDADD   =  		\
 #  Cleanup
 # ------------------------------------------------------------------------
 
-CLEANFILES = atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT)
+CLEANFILES += atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT)
 
-if PYTHON
 # ------------------------------------------------------------------------
 #  This is the swig-ish part of the Makefile.
-#  It builds the atsc module which we'll load into python
+#  It builds the atsc modules which we'll load into python or guile
 # ------------------------------------------------------------------------
 
 TOP_SWIG_IFILES = 		\
@@ -232,11 +233,4 @@ atsc_pythondir_category =	\
 atsc_la_swig_libadd =		\
 	libgnuradio-atsc.la
 
-include $(top_srcdir)/Makefile.swig
-
-# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES += $(swig_built_sources)
 
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
-endif
diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen
index 2c7a7336d..7dbb98b46 100644
--- a/gr-atsc/src/lib/Makefile.swig.gen
+++ b/gr-atsc/src/lib/Makefile.swig.gen
@@ -38,6 +38,16 @@ atsc_pylibdir_category ?= $(atsc_pythondir_category)
 atsc_pythondir = $(pythondir)/$(atsc_pythondir_category)
 atsc_pylibdir = $(pyexecdir)/$(atsc_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.
+atsc_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/atsc
+# FIXME: determince whether these should be installed with gnuradio.
+atsc_scmdir = $(guiledir)
+
 ## SWIG headers are always installed into the same directory.
 
 atsc_swigincludedir = $(swigincludedir)
@@ -57,23 +67,10 @@ atsc_swigincludedir = $(swigincludedir)
 ## right thing.  For more info, see <
 ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
 
-## Stamps used to ensure parallel make does the right thing.  These
-## are removed by "make clean", but otherwise unused except during the
-## parallel built.  These will not be included in a tarball, because
-## the SWIG-generated files will be removed from the distribution.
-
-STAMPS += $(DEPDIR)/atsc-generate-*
-
 ## Other cleaned files: dependency files generated by SWIG or this Makefile
 
 MOSTLYCLEANFILES += $(DEPDIR)/*.S*
 
-## Add the .py and .cc files to the list of SWIG built sources.  The
-## .h file is sometimes built, but not always ... so that one has to
-## be added manually by the including Makefile.am .
-
-swig_built_sources += atsc.py atsc.cc
-
 ## Various SWIG variables.  These can be overloaded in the including
 ## Makefile.am by setting the variable value there, then including
 ## Makefile.swig .
@@ -82,13 +79,18 @@ atsc_swiginclude_HEADERS =		\
 	atsc.i			\
 	$(atsc_swiginclude_headers)
 
+if PYTHON
 atsc_pylib_LTLIBRARIES =		\
 	_atsc.la
 
 _atsc_la_SOURCES = 			\
-	atsc.cc			\
+	python/atsc.cc		\
 	$(atsc_la_swig_sources)
 
+atsc_python_PYTHON =			\
+	atsc.py			\
+	$(atsc_python)
+
 _atsc_la_LIBADD =			\
 	$(STD_SWIG_LA_LIB_ADD)		\
 	$(atsc_la_swig_libadd)
@@ -99,162 +101,45 @@ _atsc_la_LDFLAGS =			\
 
 _atsc_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
 	$(atsc_la_swig_cxxflags)
 
-atsc_python_PYTHON =			\
-	atsc.py			\
-	$(atsc_python)
+python/atsc.cc: atsc.py
+atsc.py: atsc.i
 
-## Entry rule for running SWIG
+# Include the python dependencies for this file
+-include python/atsc.d
 
-atsc.h atsc.py atsc.cc: atsc.i $(top_srcdir)/gnuradio-core/src/lib/swig/swig_doc.i
-## This rule will get called only when MAKE decides that one of the
-## targets needs to be created or re-created, because:
-##
-## * The .i file or the swig_doc.i are newer than any or all of the
-##   generated files;
-##
-## * Any or all of the .cc, .h, or .py files does not exist and is
-##   needed (in the case this file is not needed, the rule for it is
-##   ignored); or
-##
-## * Some SWIG-based dependecy of the .cc file isn't met and hence the
-##   .cc file needs be be regenerated.  Explanation: Because MAKE
-##   knows how to handle dependencies for .cc files (regardless of
-##   their name or extension), then the .cc file is used as a target
-##   instead of the .i file -- but with the dependencies of the .i
-##   file.  It is this last reason why the line:
-##
-##     	if test -f $@; then :; else
-##
-##   cannot be used in this case: If a .i file dependecy is not met,
-##   then the .cc file needs to be rebuilt.  But if the stamp is newer
-##   than the .cc file, and the .cc file exists, then in the original
-##   version (with the 'test' above) the internal MAKE call will not
-##   be issued and hence the .cc file will not be rebuilt.
-##
-## Once execution gets to here, it should always proceed no matter the
-## state of a stamp (as discussed in link above).  The
-## $(DEPDIR)/atsc-generate stuff is used to allow for parallel
-## builds to "do the right thing".  The stamp has no relationship with
-## either the target files or dependency file; it is used solely for
-## the protection of multiple builds during a given call to MAKE.
-##
-## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM
-## (15).  At a caught signal, the quoted command will be issued before
-## exiting.  In this case, remove any stamp, whether temporary of not.
-## The trap is valid until the process exits; the process includes all
-## commands appended via "\"s.
-##
-	trap 'rm -rf $(DEPDIR)/atsc-generate-*' 1 2 13 15; \
-##
-## Create a temporary directory, which acts as a lock.  The first
-## process to create the directory will succeed and issue the MAKE
-## command to do the actual work, while all subsequent processes will
-## fail -- leading them to wait for the first process to finish.
-##
-	if mkdir $(DEPDIR)/atsc-generate-lock 2>/dev/null; then \
-##
-## This code is being executed by the first process to succeed in
-## creating the directory lock.
-##
-## Remove the stamp associated with this filename.
-##
-		rm -f $(DEPDIR)/atsc-generate-stamp; \
-##
-## Tell MAKE to run the rule for creating this stamp.
-##
-		$(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/atsc-generate-stamp WHAT=$<; \
-##
-## Now that the .cc, .h, and .py files have been (re)created from the
-## .i file, future checking of this rule during the same MAKE
-## execution will come back that the rule doesn't need to be executed
-## because none of the conditions mentioned at the start of this rule
-## will be positive.  Remove the the directory lock, which frees up
-## any waiting process(es) to continue.
-##
-		rmdir $(DEPDIR)/atsc-generate-lock; \
-	else \
-##
-## This code is being executed by any follower processes while the
-## directory lock is in place.
-##
-## Wait until the first process is done, testing once per second.
-##
-		while test -d $(DEPDIR)/atsc-generate-lock; do \
-			sleep 1; \
-		done; \
-##
-## Succeed if and only if the first process succeeded; exit this
-## process returning the status of the generated stamp.
-##
-		test -f $(DEPDIR)/atsc-generate-stamp; \
-		exit $$?; \
-	fi;
+endif		# end of if python
 
-$(DEPDIR)/atsc-generate-stamp:
-## This rule will be called only by the first process issuing the
-## above rule to succeed in creating the lock directory, after
-## removing the actual stamp file in order to guarantee that MAKE will
-## execute this rule.
-##
-## Call SWIG to generate the various output files; special
-## post-processing on 'mingw32' host OS for the dependency file.
-##
-	if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(atsc_swig_args) \
-		-MD -MF $(DEPDIR)/atsc.Std \
-		-module atsc -o atsc.cc $(WHAT); then \
-	    if test $(host_os) = mingw32; then \
-		$(RM) $(DEPDIR)/atsc.Sd; \
-		$(SED) 's,\\\\,/,g' < $(DEPDIR)/atsc.Std \
-			> $(DEPDIR)/atsc.Sd; \
-		$(RM) $(DEPDIR)/atsc.Std; \
-		$(MV) $(DEPDIR)/atsc.Sd $(DEPDIR)/atsc.Std; \
-	    fi; \
-	else \
-	    $(RM) $(DEPDIR)/atsc.S*; exit 1; \
-	fi;
-##
-## Mess with the SWIG output .Std dependency file, to create a
-## dependecy file valid for the input .i file: Basically, simulate the
-## dependency file created for libraries by GNU's libtool for C++,
-## where all of the dependencies for the target are first listed, then
-## each individual dependency is listed as a target with no further
-## dependencies.
-##
-## (1) remove the current dependency file
-##
-	$(RM) $(DEPDIR)/atsc.d
-##
-## (2) Copy the whole SWIG file:
-##
-	cp $(DEPDIR)/atsc.Std $(DEPDIR)/atsc.d
-##
-## (3) all a carriage return to the end of the dependency file.
-##
-	echo "" >> $(DEPDIR)/atsc.d
-##
-## (4) from the SWIG file, remove the first line (the target); remove
-##     trailing " \" and " " from each line.  Append ":" to each line,
-##     followed by 2 carriage returns, then append this to the end of
-##     the dependency file.
-##
-	$(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/atsc.Std | \
-		awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/atsc.d
-##
-## (5) remove the SWIG-generated file
-##
-	$(RM) $(DEPDIR)/atsc.Std
-##
-## Create the stamp for this filename generation, to signal success in
-## executing this rule; allows other threads waiting on this process
-## to continue.
-##
-	touch $(DEPDIR)/atsc-generate-stamp
+if GUILE
+
+atsc_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-atsc.la
+libguile_gnuradio_atsc_la_SOURCES =	\
+	guile/atsc.cc			\
+	$(atsc_la_swig_sources)
+nobase_atsc_scm_DATA = 		\
+	gnuradio/atsc.scm 		\
+	gnuradio/atsc-primitive.scm
+libguile_gnuradio_atsc_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(atsc_la_swig_libadd)
+libguile_gnuradio_atsc_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(atsc_la_swig_ldflags)
+libguile_gnuradio_atsc_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(atsc_la_swig_cxxflags)
+
+guile/atsc.cc: gnuradio/atsc.scm
+gnuradio/atsc.scm: atsc.i
+gnuradio/atsc-primitive.scm: gnuradio/atsc.scm
+
+# Include the guile dependencies for this file
+-include guile/atsc.d
 
-# KLUDGE: Force runtime include of a SWIG dependency file.  This is
-# not guaranteed to be portable, but will probably work.  If it works,
-# we have accurate dependencies for our swig stuff, which is good.
+endif				# end of GUILE
 
-@am__include@ @am__quote@./$(DEPDIR)/atsc.d@am__quote@
 
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.cc b/gr-atsc/src/lib/atsci_equalizer_lms2.cc
index 345f6209f..f9fb57c7b 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms2.cc
+++ b/gr-atsc/src/lib/atsci_equalizer_lms2.cc
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <gr_math.h>
 #include <stdio.h>
+#include <boost/math/special_functions/fpclassify.hpp>
 
 using std::min;
 using std::max;
@@ -55,7 +56,7 @@ wrap (int d)
 static inline float 
 slice (float d)
 {
-  if (gr_isnan (d))
+  if (boost::math::isnan (d))
     return 0.0;
   
   if (d >= 0.0){
@@ -247,7 +248,7 @@ atsci_equalizer_lms2::filter1 (const float input[])
     acc -= d_taps_fb[i] * d_old_output[wrap(i + d_output_ptr)];
   }
 
-  if (gr_isnan (acc)){
+  if (boost::math::isnan (acc)){
     abort ();
   }
 
diff --git a/gr-atsc/src/lib/atsci_sssr.cc b/gr-atsc/src/lib/atsci_sssr.cc
index dc5c01b0d..4ccee85de 100644
--- a/gr-atsc/src/lib/atsci_sssr.cc
+++ b/gr-atsc/src/lib/atsci_sssr.cc
@@ -28,6 +28,7 @@
 #include <atsci_diag_output.h>
 #include <gr_math.h>
 #include <stdio.h>
+#include <boost/math/special_functions/sign.hpp>
 
 /*
  * ----------------------------------------------------------------
@@ -141,7 +142,7 @@ atsci_sssr::update (sssr::sample_t sample_in,	 // input
   double qo = d_quad_filter.update (sample_in);
   d_quad_output[d_counter] = qo;
 
-  int bit = gr_signbit (sample_in) ^ 1;	// slice on sign: + => 1, - => 0
+  int bit = boost::math::signbit (sample_in) ^ 1;	// slice on sign: + => 1, - => 0
   int corr_out = d_correlator.update (bit);
   int weight = sipp (corr_out);
   int corr_value = d_integrator.update (weight, d_counter);
diff --git a/gr-atsc/src/lib/test_atsci.cc b/gr-atsc/src/lib/test_atsci.cc
index 184895a90..031ca42ae 100644
--- a/gr-atsc/src/lib/test_atsci.cc
+++ b/gr-atsc/src/lib/test_atsci.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2002,2006,2010 Free Software Foundation, Inc.
+ * Copyright 2002,2006,2010,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -28,11 +28,8 @@
 int 
 main (int argc, char **argv)
 {
-  char path[200];
-  get_unittest_path ("gr_atsc.xml", path, 200);
-
   CppUnit::TextTestRunner runner;
-  std::ofstream xmlfile(path);
+  std::ofstream xmlfile(get_unittest_path("gr_atsc.xml").c_str());
   CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile);
 
   runner.addTest (qa_atsc::suite ());
diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am
index 37b60e6a4..7b2f5c871 100644
--- a/gr-atsc/src/python/Makefile.am
+++ b/gr-atsc/src/python/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST =		\
+EXTRA_DIST +=		\
 	run_tests.in
 
 ourdatadir = $(exampledir)/atsc
@@ -36,8 +36,7 @@ dist_ourdata_SCRIPTS =  \
 	xlate.py	\
 	viterbi-out.py
 
-TESTS = 				\
-	run_tests
+TESTS = run_tests
 
 noinst_PYTHON = 			\
 	atsc_utils.py			\