diff options
| author | Ben Reynwar <ben@reynwar.net> | 2011-06-21 15:51:40 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2011-06-21 15:51:40 -0700 |
| commit | 233621d6bbc3c68109998d0e68ffc7df7de69eb4 (patch) | |
| tree | 9ddefc3f2eff9ab3e7de394e1304b6dd83715b83 /gr-digital/lib | |
| parent | 192f4a6614fb347c6bf5acb9cac0d190bb33089d (diff) | |
gr-digital, gr-trellis: Fixing gr-trellis to work with constellation now that it is in gr-digital.
Diffstat (limited to 'gr-digital/lib')
| -rw-r--r-- | gr-digital/lib/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-digital/lib/digital_constellation.cc | 2 | ||||
| -rw-r--r-- | gr-digital/lib/digital_constellation.h | 2 | ||||
| -rw-r--r-- | gr-digital/lib/digital_metric_type.h | 31 |
4 files changed, 35 insertions, 3 deletions
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am index 25a2b6f7fa..5d7fdecbfb 100644 --- a/gr-digital/lib/Makefile.am +++ b/gr-digital/lib/Makefile.am @@ -29,7 +29,8 @@ grinclude_HEADERS = \ digital_costas_loop_cc.h \ digital_cma_equalizer_cc.h \ digital_lms_dd_equalizer_cc.h \ - digital_kurtotic_equalizer_cc.h + digital_kurtotic_equalizer_cc.h \ + digital_metric_type.h lib_LTLIBRARIES = libgnuradio-digital.la diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc index edf0bda22f..2263bba0bc 100644 --- a/gr-digital/lib/digital_constellation.cc +++ b/gr-digital/lib/digital_constellation.cc @@ -22,7 +22,7 @@ #include <gr_io_signature.h> #include <digital_constellation.h> -#include <gr_metric_type.h> +#include <digital_metric_type.h> #include <gr_math.h> #include <gr_complex.h> #include <math.h> diff --git a/gr-digital/lib/digital_constellation.h b/gr-digital/lib/digital_constellation.h index 9da87a4de2..4119b58031 100644 --- a/gr-digital/lib/digital_constellation.h +++ b/gr-digital/lib/digital_constellation.h @@ -27,7 +27,7 @@ #include <math.h> #include <gr_complex.h> #include <boost/enable_shared_from_this.hpp> -#include <gr_metric_type.h> +#include <digital_metric_type.h> /************************************************************/ /* digital_constellation */ diff --git a/gr-digital/lib/digital_metric_type.h b/gr-digital/lib/digital_metric_type.h new file mode 100644 index 0000000000..83de166f09 --- /dev/null +++ b/gr-digital/lib/digital_metric_type.h @@ -0,0 +1,31 @@ +/* -*- c++ -*- */ +/* + * Copyright 2004 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_METRIC_TYPE_H +#define INCLUDED_DIGITAL_METRIC_TYPE_H + +typedef enum { + TRELLIS_EUCLIDEAN = 200, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT +} trellis_metric_type_t; + +#endif + |