diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-trellis | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/include/gnuradio/trellis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-trellis/include/gnuradio/trellis/siso_f.h | 2 | ||||
| -rw-r--r-- | gr-trellis/include/gnuradio/trellis/siso_type.h | 2 | ||||
| -rw-r--r-- | gr-trellis/lib/metrics_X_impl.h.t | 2 | ||||
| -rw-r--r-- | gr-trellis/lib/pccc_encoder_XX_impl.h.t | 4 | ||||
| -rw-r--r-- | gr-trellis/python/trellis/__init__.py | 10 | ||||
| -rw-r--r-- | gr-trellis/swig/trellis_swig.i | 8 |
7 files changed, 15 insertions, 15 deletions
diff --git a/gr-trellis/include/gnuradio/trellis/CMakeLists.txt b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt index b7ceea179e..5f30cc8e4e 100644 --- a/gr-trellis/include/gnuradio/trellis/CMakeLists.txt +++ b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt @@ -47,7 +47,7 @@ macro(expand_h root) string(REGEX REPLACE "X+" ${sig} name ${root}) list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h) endforeach(sig) - + #create a command to generate the files add_custom_command( OUTPUT ${expanded_files_h} diff --git a/gr-trellis/include/gnuradio/trellis/siso_f.h b/gr-trellis/include/gnuradio/trellis/siso_f.h index 60c3349e11..ae212cb4cf 100644 --- a/gr-trellis/include/gnuradio/trellis/siso_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_f.h @@ -47,7 +47,7 @@ namespace gr { siso_type_t d_SISO_TYPE); virtual fsm FSM() const = 0; - virtual int K() const = 0; + virtual int K() const = 0; virtual int S0() const = 0; virtual int SK() const = 0; virtual bool POSTI() const = 0; diff --git a/gr-trellis/include/gnuradio/trellis/siso_type.h b/gr-trellis/include/gnuradio/trellis/siso_type.h index 9167381164..9d147ce0f8 100644 --- a/gr-trellis/include/gnuradio/trellis/siso_type.h +++ b/gr-trellis/include/gnuradio/trellis/siso_type.h @@ -30,7 +30,7 @@ namespace gr { TRELLIS_MIN_SUM = 200, TRELLIS_SUM_PRODUCT } siso_type_t; - + } /* namespace trellis */ } /* namespace gr */ diff --git a/gr-trellis/lib/metrics_X_impl.h.t b/gr-trellis/lib/metrics_X_impl.h.t index 0cd7f0ba5b..2b4481fdb1 100644 --- a/gr-trellis/lib/metrics_X_impl.h.t +++ b/gr-trellis/lib/metrics_X_impl.h.t @@ -42,7 +42,7 @@ namespace gr { @IMPL_NAME@(int O, int D, const std::vector<@I_TYPE@> &TABLE, digital::trellis_metric_type_t TYPE); ~@IMPL_NAME@(); - + int O() const { return d_O; } int D() const { return d_D; } digital::trellis_metric_type_t TYPE() const { return d_TYPE; } diff --git a/gr-trellis/lib/pccc_encoder_XX_impl.h.t b/gr-trellis/lib/pccc_encoder_XX_impl.h.t index f7d6967584..5561b716d3 100644 --- a/gr-trellis/lib/pccc_encoder_XX_impl.h.t +++ b/gr-trellis/lib/pccc_encoder_XX_impl.h.t @@ -41,13 +41,13 @@ namespace gr { int d_blocklength; std::vector<int> d_buffer; - public: + public: @IMPL_NAME@(const fsm &FSM1, int ST1, const fsm &FSM2, int ST2, const interleaver &INTERLEAVER, int blocklength); ~@IMPL_NAME@(); - + fsm FSM1() const { return d_FSM1; } int ST1() const { return d_ST1; } fsm FSM2() const { return d_FSM2; } diff --git a/gr-trellis/python/trellis/__init__.py b/gr-trellis/python/trellis/__init__.py index f2540e835f..6c6d80ecdf 100644 --- a/gr-trellis/python/trellis/__init__.py +++ b/gr-trellis/python/trellis/__init__.py @@ -1,22 +1,22 @@ # Copyright 2012 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. -# +# ''' Blocks and utilities for trellis coding and related. diff --git a/gr-trellis/swig/trellis_swig.i b/gr-trellis/swig/trellis_swig.i index 6a0ab3a46d..8c71a5e93c 100644 --- a/gr-trellis/swig/trellis_swig.i +++ b/gr-trellis/swig/trellis_swig.i @@ -1,18 +1,18 @@ /* * Copyright 2012 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, |