diff options
| author | Ben Reynwar | 2011-06-21 15:51:40 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2011-06-21 15:51:40 -0700 |
| commit | 233621d6bbc3c68109998d0e68ffc7df7de69eb4 (patch) | |
| tree | 9ddefc3f2eff9ab3e7de394e1304b6dd83715b83 /gnuradio-core/src/lib/general | |
| parent | 192f4a6614fb347c6bf5acb9cac0d190bb33089d (diff) | |
| download | gnuradio-233621d6bbc3c68109998d0e68ffc7df7de69eb4.tar.gz gnuradio-233621d6bbc3c68109998d0e68ffc7df7de69eb4.tar.bz2 gnuradio-233621d6bbc3c68109998d0e68ffc7df7de69eb4.zip | |
gr-digital, gr-trellis: Fixing gr-trellis to work with constellation now that it is in gr-digital.
Diffstat (limited to 'gnuradio-core/src/lib/general')
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 1 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_metric_type.h | 31 |
2 files changed, 0 insertions, 32 deletions
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index de1e50f0e..c157d4528 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -262,7 +262,6 @@ grinclude_HEADERS = \ gr_log2_const.h \ gr_map_bb.h \ gr_math.h \ - gr_metric_type.h \ gr_misc.h \ gr_nco.h \ gr_nlog10_ff.h \ diff --git a/gnuradio-core/src/lib/general/gr_metric_type.h b/gnuradio-core/src/lib/general/gr_metric_type.h deleted file mode 100644 index 74c93b55e..000000000 --- a/gnuradio-core/src/lib/general/gr_metric_type.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- 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_GR_METRIC_TYPE_H -#define INCLUDED_GR_METRIC_TYPE_H - -typedef enum { - TRELLIS_EUCLIDEAN = 200, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT -} trellis_metric_type_t; - -#endif - |