7 files changed, 16 insertions, 78 deletions
diff --git a/gr-trellis/grc/.gitignore b/gr-trellis/grc/.gitignore
deleted file mode 100644
index f3462d009..000000000
--- a/gr-trellis/grc/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/configure
-/config.h.in
-/stamp-h.in
-/libtool
-/config.log
-/config.h
-/config.cache
-/config.status
-/missing
-/stamp-h
-/stamp-h1
-/.deps
-/.libs
-/*.la
-/*.lo
-/autom4te.cache
-/*.cache
-/missing
-/make.log
-/*.pc
diff --git a/gr-trellis/grc/Makefile.am b/gr-trellis/grc/Makefile.am
deleted file mode 100644
index 518c7f055..000000000
--- a/gr-trellis/grc/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-grcblocksdir = $(grc_blocksdir)
-
-dist_grcblocks_DATA = \
-	trellis_encoder_xx.xml \
-	trellis_siso_combined_f.xml       \
-	trellis_viterbi_x.xml \
-	trellis_metrics_x.xml     \
-	trellis_siso_f.xml \
-	trellis_permutation.xml   \
-	trellis_viterbi_combined_xx.xml \
-        trellis_sccc_encoder_xx.xml \
-        trellis_sccc_decoder_x.xml \
-        trellis_sccc_decoder_combined_xx.xml \
-        trellis_pccc_encoder_xx.xml  \
-        trellis_pccc_decoder_x.xml  \
-        trellis_pccc_decoder_combined_xx.xml 
diff --git a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
index bd5a44cde..005a88d66 100644
--- a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
+++ b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
@@ -12,9 +12,9 @@
 	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis, digital</import>
 	<make>trellis.pccc_decoder_combined_$(type)$(out_type)(
-		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, 
-		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state, 
-		trellis.interleaver($interleaver), 
+		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state,
+		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state,
+		trellis.interleaver($interleaver),
 		$block_size,
 		$iterations,
                 $siso_type,
diff --git a/gr-trellis/grc/trellis_pccc_decoder_x.xml b/gr-trellis/grc/trellis_pccc_decoder_x.xml
index e6eb03f11..c79447826 100644
--- a/gr-trellis/grc/trellis_pccc_decoder_x.xml
+++ b/gr-trellis/grc/trellis_pccc_decoder_x.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 ###################################################
-## PCCC Decoder 
+## PCCC Decoder
 ###################################################
  -->
 
@@ -12,9 +12,9 @@
 	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.pccc_decoder_$(out_type)(
-		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, 
-		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state, 
-		trellis.interleaver($interleaver), 
+		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state,
+		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state,
+		trellis.interleaver($interleaver),
 		$block_size,
 		$iterations,
                 $siso_type)
diff --git a/gr-trellis/grc/trellis_permutation.xml b/gr-trellis/grc/trellis_permutation.xml
index 125a78d4d..212693311 100644
--- a/gr-trellis/grc/trellis_permutation.xml
+++ b/gr-trellis/grc/trellis_permutation.xml
@@ -75,7 +75,7 @@
 		<vlen>$vlen</vlen>
 	</source>
         <doc>
-Interleaver size is given in blocks. 
-One Symbol = (in/out type) * (vector length) 
+Interleaver size is given in blocks.
+One Symbol = (in/out type) * (vector length)
         </doc>
 </block>
diff --git a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
index 6b2bc0e38..324f06e7f 100644
--- a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
+++ b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
@@ -12,9 +12,9 @@
 	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis, digital</import>
 	<make>trellis.sccc_decoder_combined_$(type)$(out_type)(
-		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, 
-		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state, 
-		trellis.interleaver($interleaver), 
+		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state,
+		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state,
+		trellis.interleaver($interleaver),
 		$block_size,
 		$iterations,
                 $siso_type,
diff --git a/gr-trellis/grc/trellis_sccc_decoder_x.xml b/gr-trellis/grc/trellis_sccc_decoder_x.xml
index 9fc24927b..4bf8d26d5 100644
--- a/gr-trellis/grc/trellis_sccc_decoder_x.xml
+++ b/gr-trellis/grc/trellis_sccc_decoder_x.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 ###################################################
-## SCCC Decoder 
+## SCCC Decoder
 ###################################################
  -->
 
@@ -12,9 +12,9 @@
 	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.sccc_decoder_$(out_type)(
-		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, 
-		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state, 
-		trellis.interleaver($interleaver), 
+		trellis.fsm($o_fsm_args), $o_init_state, $o_final_state,
+		trellis.fsm($i_fsm_args), $i_init_state, $i_final_state,
+		trellis.interleaver($interleaver),
 		$block_size,
 		$iterations,
                 $siso_type)