Merge branch 'master' of gnuradio.org:gnuradio

1 files changed, 0 insertions, 124 deletions

diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_combined_fb.h b/gr-trellis/src/lib/trellis_pccc_decoder_combined_fb.h
deleted file mode 100644
index 0ed90b8b3..000000000
--- a/gr-trellis/src/lib/trellis_pccc_decoder_combined_fb.h
+++ /dev/null
@@ -1,124 +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.
- */
-
-// WARNING: this file is machine generated.  Edits will be over written
-
-#ifndef INCLUDED_TRELLIS_PCCC_DECODER_COMBINED_FB_H
-#define INCLUDED_TRELLIS_PCCC_DECODER_COMBINED_FB_H
-
-#include "fsm.h"
-#include "interleaver.h"
-#include <gr_block.h>
-#include <vector>
-#include "calc_metric.h"
-#include "siso_type.h"
-
-class trellis_pccc_decoder_combined_fb;
-typedef boost::shared_ptr<trellis_pccc_decoder_combined_fb> trellis_pccc_decoder_combined_fb_sptr;
-
-trellis_pccc_decoder_combined_fb_sptr trellis_make_pccc_decoder_combined_fb (
-  const fsm &FSMo, int STo0, int SToK,
-  const fsm &FSMi, int STi0, int STiK,
-  const interleaver &INTERLEAVER,
-  int blocklength,
-  int repetitions,
-  trellis_siso_type_t SISO_TYPE, // perform "min-sum" or "sum-product" combining 
-  int D,
-  const std::vector<float> &TABLE,
-  trellis_metric_type_t METRIC_TYPE,
-  float scaling
-);
-
-
-/*!
- *  \ingroup coding_blk
- */
-class trellis_pccc_decoder_combined_fb : public gr_block
-{
-  fsm d_FSMo;
-  fsm d_FSMi;
-  int d_STo0;
-  int d_SToK;
-  int d_STi0;
-  int d_STiK;
-  interleaver d_INTERLEAVER;
-  int d_blocklength;
-  int d_repetitions;
-  trellis_siso_type_t d_SISO_TYPE;
-  int d_D;
-  std::vector<float> d_TABLE;
-  trellis_metric_type_t d_METRIC_TYPE;
-  float d_scaling;
-  std::vector<float> d_buffer;
-
-  friend trellis_pccc_decoder_combined_fb_sptr trellis_make_pccc_decoder_combined_fb (
-    const fsm &FSMo, int STo0, int SToK,
-    const fsm &FSMi, int STi0, int STiK,
-    const interleaver &INTERLEAVER,
-    int blocklength,
-    int repetitions,
-    trellis_siso_type_t SISO_TYPE,
-    int D,
-    const std::vector<float> &TABLE,
-    trellis_metric_type_t METRIC_TYPE,
-    float scaling
-  );
-
-  trellis_pccc_decoder_combined_fb (
-    const fsm &FSMo, int STo0, int SToK,
-    const fsm &FSMi, int STi0, int STiK,
-    const interleaver &INTERLEAVER,
-    int blocklength,
-    int repetitions,
-    trellis_siso_type_t SISO_TYPE, 
-    int D,
-    const std::vector<float> &TABLE,
-    trellis_metric_type_t METRIC_TYPE,
-    float scaling
-  );
-
-public:
-  fsm FSM1 () const { return d_FSMo; }
-  fsm FSM2 () const { return d_FSMi; }
-  int ST10 () const { return d_STo0; }
-  int ST1K () const { return d_SToK; }
-  int ST20 () const { return d_STi0; }
-  int ST2K () const { return d_STiK; }
-  interleaver INTERLEAVER () const { return d_INTERLEAVER; }
-  int blocklength () const { return d_blocklength; }
-  int repetitions () const { return d_repetitions; }
-  int D () const { return d_D; }
-  std::vector<float> TABLE () const { return d_TABLE; }
-  trellis_metric_type_t METRIC_TYPE () const { return d_METRIC_TYPE; }
-  trellis_siso_type_t SISO_TYPE () const { return d_SISO_TYPE; }
-  float scaling () const { return d_scaling; }
-  void set_scaling (float scaling);
-
-  void forecast (int noutput_items,
-                 gr_vector_int &ninput_items_required);
-  int general_work (int noutput_items,
-                    gr_vector_int &ninput_items,
-                    gr_vector_const_void_star &input_items,
-                    gr_vector_void_star &output_items);
-};
-
-#endif