[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: build: clean up header installation
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: build: clean up header installation across tree |
|
Date: |
Fri, 24 Jun 2016 00:24:43 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 0e18622160a33c10d5853fc3e3d0ee4ebaa41829
Author: A. Maitland Bottoms <address@hidden>
Date: Thu Jun 23 16:01:01 2016 -0700
build: clean up header installation across tree
* Remove unused, uncompilable headers in gr-atsc or
gr-vocoder
* Don't install build-time only header in gr-qtgui
* Install missing headers in gr-fec
---
gr-atsc/include/gnuradio/atsc/CMakeLists.txt | 27 ------
.../include/gnuradio/atsc/GrAtscBitTimingLoop.h | 90 --------------------
.../include/gnuradio/atsc/GrAtscBitTimingLoop2.h | 80 ------------------
.../include/gnuradio/atsc/GrAtscBitTimingLoop3.h | 72 ----------------
.../include/gnuradio/atsc/GrAtscConvert2xTo20.h | 50 -----------
.../gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h | 50 -----------
.../include/gnuradio/atsc/GrAtscDeinterleaver.h | 51 ------------
gr-atsc/include/gnuradio/atsc/GrAtscDerandomizer.h | 51 ------------
gr-atsc/include/gnuradio/atsc/GrAtscEqualizer.h | 59 -------------
gr-atsc/include/gnuradio/atsc/GrAtscFPLL.h | 88 --------------------
.../include/gnuradio/atsc/GrAtscFieldSyncChecker.h | 54 ------------
.../gnuradio/atsc/GrAtscFieldSyncCorrelator.h | 56 -------------
.../include/gnuradio/atsc/GrAtscFieldSyncDemux.h | 60 -------------
gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncMux.h | 58 -------------
gr-atsc/include/gnuradio/atsc/GrAtscInterleaver.h | 51 ------------
gr-atsc/include/gnuradio/atsc/GrAtscRSDecoder.h | 51 ------------
gr-atsc/include/gnuradio/atsc/GrAtscRSEncoder.h | 51 ------------
gr-atsc/include/gnuradio/atsc/GrAtscRandomizer.h | 55 ------------
gr-atsc/include/gnuradio/atsc/GrAtscSegSymSync.h | 64 --------------
.../include/gnuradio/atsc/GrAtscSegSymSyncImpl.h | 69 ---------------
gr-atsc/include/gnuradio/atsc/GrAtscSymbolMapper.h | 97 ----------------------
.../include/gnuradio/atsc/GrAtscTrellisEncoder.h | 50 -----------
.../include/gnuradio/atsc/GrAtscViterbiDecoder.h | 51 ------------
gr-atsc/include/gnuradio/atsc/exp2_lp_impl.h | 35 --------
.../atsc/root_raised_cosine_bandpass_impl.h | 40 ---------
.../gnuradio/atsc/root_raised_cosine_impl.h | 36 --------
gr-atsc/include/gnuradio/atsc/vsbtx_lp_impl.h | 37 ---------
gr-fec/include/gnuradio/fec/CMakeLists.txt | 5 ++
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 2 -
gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt | 3 -
30 files changed, 5 insertions(+), 1538 deletions(-)
diff --git a/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
index cdf818a..342f55c 100644
--- a/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
+++ b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt
@@ -24,7 +24,6 @@ install(FILES
api.h
basic_trellis_encoder_impl.h
bit_timing_loop.h
- CMakeLists.txt
consts.h
convolutional_interleaver.h
create_atsci_equalizer.h
@@ -41,7 +40,6 @@ install(FILES
equalizer_lms2_impl.h
equalizer_lms_impl.h
equalizer_nop_impl.h
- exp2_lp_impl.h
fake_single_viterbi_impl.h
field_sync_demux.h
field_sync_mux.h
@@ -51,29 +49,7 @@ install(FILES
fs_checker_naive_impl.h
fs_correlator_impl.h
fs_correlator_naive_impl.h
- GrAtscBitTimingLoop2.h
- GrAtscBitTimingLoop3.h
- GrAtscBitTimingLoop.h
- GrAtscConvert2xTo20.h
- GrAtscDataSegToSoftDataSeg.h
- GrAtscDeinterleaver.h
- GrAtscDerandomizer.h
- GrAtscEqualizer.h
- GrAtscFieldSyncChecker.h
- GrAtscFieldSyncCorrelator.h
- GrAtscFieldSyncDemux.h
- GrAtscFieldSyncMux.h
- GrAtscFPLL.h
- GrAtscInterleaver.h
- GrAtscRandomizer.h
- GrAtscRSDecoder.h
- GrAtscRSEncoder.h
- GrAtscSegSymSync.h
GrAtscSegSymSyncImpl_export.h
- GrAtscSegSymSyncImpl.h
- GrAtscSymbolMapper.h
- GrAtscTrellisEncoder.h
- GrAtscViterbiDecoder.h
interleaver_fifo.h
interleaver.h
pad.h
@@ -81,8 +57,6 @@ install(FILES
randomizer.h
randomizer_impl.h
reed_solomon_impl.h
- root_raised_cosine_bandpass_impl.h
- root_raised_cosine_impl.h
rs_decoder.h
rs_encoder.h
single_viterbi_impl.h
@@ -96,7 +70,6 @@ install(FILES
types.h
viterbi_decoder.h
viterbi_decoder_impl.h
- vsbtx_lp_impl.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/atsc
COMPONENT "atsc_devel"
)
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop.h
b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop.h
deleted file mode 100644
index e42d37c..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCBITTIMINGLOOP_H_
-#define _GRATSCBITTIMINGLOOP_H_
-
-#include <gnuradio/blocks/nco.h>
-#include <VrSigProc.h>
-#include <VrHistoryProc.h>
-#include <VrDecimatingSigProc.h>
-#include <gnuradio/atsc/interleaver_fifo.h>
-#include <gnuradio/filter/single_pole_iir.h>
-#include <gnuradio/filter/mmse_fir_interpolator.h>
-#include <gnuradio/atsc/slicer_agc_impl.h>
-#include <stdio.h>
-#include <gnuradio/atsc/diag_output_impl.h>
-
-
-/*!
- * \brief ATSC BitTimingLoop
- *
- * This class accepts a single real input and produces a single real output
- */
-
-class GrAtscBitTimingLoop : public VrDecimatingSigProc<float,float> {
-
- public:
-
- GrAtscBitTimingLoop ();
- virtual ~GrAtscBitTimingLoop () { };
-
- virtual const char *name () { return "GrAtscBitTimingLoop"; }
-
- virtual int forecast (VrSampleRange output,
- VrSampleRange inputs[]);
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
- // debug
- void set_mu (double a_mu) { mu = a_mu; }
- void set_no_update (bool a_no_update) { debug_no_update = a_no_update; }
- void set_loop_filter_tap (double tap) { loop.set_taps (tap); }
- void set_timing_rate (double rate) { d_timing_rate = rate; }
-
- protected:
-
- typedef float iType;
- typedef float oType;
-
- iType produce_sample (const iType *in, unsigned int &index);
- double filter_error (double e);
-
- VrSampleIndex next_input;
- gr_mmse_fir_interpolator intr;
- double w; // timing control word
- double mu; // fractional delay
- iType last_right; // last right
hand sample
- gr_single_pole_iir<double,double,double> loop;
- bool debug_no_update;// debug
-
- double d_loop_filter_tap;
- double d_timing_rate;
-
-#ifdef _BT_DIAG_OUTPUT_
- FILE *fp_loop;
- FILE *fp_ps;
-#endif
-};
-
-#endif // _GRATSCBITTIMINGLOOP_H_
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop2.h
b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop2.h
deleted file mode 100644
index 7acdbb6..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop2.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCBITTIMINGLOOP2_H_
-#define _GRATSCBITTIMINGLOOP2_H_
-
-#include <gnuradio/blocks/nco.h>
-#include <VrSigProc.h>
-#include <VrHistoryProc.h>
-#include <VrDecimatingSigProc.h>
-#include <gnuradio/atsc/interleaver_fifo.h>
-#include <filtersingle_pole_iir.h>
-#include <gnuradio/filter/mmse_fir_interpolator.h>
-
-/*!
- * \brief ATSC BitTimingLoop
- *
- * This class accepts a single real input and produces a single real output
- */
-
-class GrAtscBitTimingLoop2 : public VrDecimatingSigProc<float,float> {
-
- public:
-
- GrAtscBitTimingLoop2 ();
- virtual ~GrAtscBitTimingLoop2 () { };
-
- virtual const char *name () { return "GrAtscBitTimingLoop2"; }
-
- virtual int forecast (VrSampleRange output,
- VrSampleRange inputs[]);
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
- // debug
- void set_mu (float a_mu) {
- assert (0 <= a_mu && a_mu <= 1.9);
- use_right_p = a_mu < 1.0;
- mu = a_mu - floor (a_mu);
- cerr << "BTL2: mu: " << mu << " use_right_p: " << use_right_p << endl;
- }
-
- protected:
-
- typedef float iType;
- typedef float oType;
-
- iType produce_sample (const iType *in, unsigned int &index);
- float filter_error (float e);
-
- VrSampleIndex next_input;
- gr_single_pole_iir<float,float,float> dc; // used to
estimate DC component
- gr_mmse_fir_interpolator intr;
- float mu; // fractional
delay
- iType last_right; // last right
hand sample
-
- bool use_right_p; // ...else middle
-};
-
-#endif // _GRATSCBITTIMINGLOOP2_H_
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop3.h
b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop3.h
deleted file mode 100644
index cc90e66..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop3.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCBITTIMINGLOOP3_H_
-#define _GRATSCBITTIMINGLOOP3_H_
-
-#include <cstdio>
-#include <VrDecimatingSigProc.h>
-#include <gnuradio/atsc/diag_output_impl.h>
-#include <gnuradio/atsc/sssr_impl.h>
-#include <gnuradio/atsc/syminfo_impl.h>
-
-/*!
- * \brief ATSC BitTimingLoop3
- *
- * This class accepts a single real input and produces two outputs,
- * the raw symbol (float) and the tag (atsc_syminfo)
- */
-
-class GrAtscBitTimingLoop3 : public VrDecimatingSigProc<float,float> {
-
- public:
-
- GrAtscBitTimingLoop3 (double ratio_of_rx_clock_to_symbol_freq);
- virtual ~GrAtscBitTimingLoop3 () { };
-
- virtual const char *name () { return "GrAtscBitTimingLoop3"; }
-
- virtual int forecast (VrSampleRange output,
- VrSampleRange inputs[]);
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
- // debug (NOPs)
- void set_mu (double a_mu) { }
- void set_no_update (bool a_no_update) { }
- void set_loop_filter_tap (double tap) { }
- void set_timing_rate (double rate) { }
-
- protected:
-
- typedef float iType;
- typedef float oDataType;
- typedef atsc::syminfo oTagType;
-
- atsci_sssr d_sssr;
- atsci_interpolator d_interp;
- VrSampleIndex d_next_input;
- double d_rx_clock_to_symbol_freq;
-};
-
-#endif // _GRATSCBITTIMINGLOOP3_H_
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscConvert2xTo20.h
b/gr-atsc/include/gnuradio/atsc/GrAtscConvert2xTo20.h
deleted file mode 100644
index 5920832..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscConvert2xTo20.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCCONVERT2XTO20_H_
-#define _GRATSCCONVERT2XTO20_H_
-
-#include <VrDecimatingSigProc.h>
-#include <gnuradio/filter/mmse_fir_interpolator.h>
-
-class GrAtscConvert2xTo20 : public VrDecimatingSigProc<float,float> {
- gr_mmse_fir_interpolator d_interp;
- double d_frac_part;
- VrSampleIndex d_next_input;
-
-public:
- GrAtscConvert2xTo20 ();
- ~GrAtscConvert2xTo20 ();
-
- virtual const char *name () { return "GrAtscConvert2xTo20"; }
-
- virtual int forecast (VrSampleRange output,
- VrSampleRange inputs[]);
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
- void pre_initialize ();
- int checkOutputSamplingFrequency(float) { return 0; } // bogus, but required
-
-};
-
-#endif /* _GRATSCCONVERT2XTO20_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h
b/gr-atsc/include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h
deleted file mode 100644
index c0f5cf8..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCDATASEGTOSOFTDATASEG_H_
-#define _GRATSCDATASEGTOSOFTDATASEG_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/types.h>
-
-/*!
- * \brief Debug glue routine (atsc_data_segment --> atsc_soft_data_segment)
- */
-
-class GrAtscDataSegToSoftDataSeg : public VrHistoryProc<atsc_data_segment,
- atsc_soft_data_segment>
-{
-
-public:
-
- GrAtscDataSegToSoftDataSeg ();
- ~GrAtscDataSegToSoftDataSeg ();
-
- const char *name () { return "GrAtscDataSegToSoftDataSeg"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
-};
-
-#endif /* _GRATSCDATASEGTOSOFTDATASEG_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscDeinterleaver.h
b/gr-atsc/include/gnuradio/atsc/GrAtscDeinterleaver.h
deleted file mode 100644
index 5cb59c0..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscDeinterleaver.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCDEINTERLEAVER_H_
-#define _GRATSCDEINTERLEAVER_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/types.h>
-#include <gnuradio/atsc/data_interleaver_impl.h>
-
-/*!
- * \brief Deinterleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded -->
atsc_mpeg_packet_rs_encoded)
- */
-
-class GrAtscDeinterleaver : public VrHistoryProc<atsc_mpeg_packet_rs_encoded,
atsc_mpeg_packet_rs_encoded>
-{
-
-public:
-
- GrAtscDeinterleaver ();
- ~GrAtscDeinterleaver ();
-
- const char *name () { return "GrAtscDeinterleaver"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_data_deinterleaver deinterleaver;
-};
-
-#endif /* _GRATSCDEINTERLEAVER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscDerandomizer.h
b/gr-atsc/include/gnuradio/atsc/GrAtscDerandomizer.h
deleted file mode 100644
index 2fb6ce3..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscDerandomizer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCDERANDOMIZER_H_
-#define _GRATSCDERANDOMIZER_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/types.h>
-#include <gnuradio/atsc/randomizer_impl.h>
-
-/*!
- * \brief Derandomize ATSC data (atsc_mpeg_packet_no_sync --> atsc_mpeg_packet)
- */
-
-class GrAtscDerandomizer : public VrHistoryProc<atsc_mpeg_packet_no_sync,
atsc_mpeg_packet>
-{
-
-public:
-
- GrAtscDerandomizer ();
- ~GrAtscDerandomizer ();
-
- const char *name () { return "GrAtscDerandomizer"; }
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_randomizer rand;
-};
-
-#endif /* _GRATSCDERANDOMIZER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscEqualizer.h
b/gr-atsc/include/gnuradio/atsc/GrAtscEqualizer.h
deleted file mode 100644
index ff944de..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscEqualizer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCEQUALIZER_H_
-#define _GRATSCEQUALIZER_H_
-
-#include <VrHistoryProc.h>
-
-class atsci_equalizer;
-
-/*!
- * \brief ATSC equalizer (float,syminfo --> float,syminfo)
- *
- * first inputs are data samples, second inputs are tags.
- * first outputs are equalized data samples, second outputs are tags.
- *
- * tag values are defined in atsci_syminfo.h
- */
-
-class GrAtscEqualizer : public VrHistoryProc<float,float>
-{
-
-public:
-
- GrAtscEqualizer (atsci_equalizer *equalizer);
- ~GrAtscEqualizer ();
-
- const char *name () { return "GrAtscEqualizer"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
- // we've got a non-standard forecast routine
- int forecast (VrSampleRange output, VrSampleRange inputs[]);
-
-protected:
- atsci_equalizer *d_equalizer;
-};
-
-#endif /* _GRATSCEQUALIZER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscFPLL.h
b/gr-atsc/include/gnuradio/atsc/GrAtscFPLL.h
deleted file mode 100644
index 39d0532..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscFPLL.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCFPLL_H_
-#define _GRATSCFPLL_H_
-
-#include <gnuradio/blocks/nco.h>
-#include <gnuradio/filter/iir.h>
-#include <gnuradio/filter/single_pole_iir.h>
-#include <gnuradio/analog/agc.h>
-#include <VrSigProc.h>
-#include <stdio.h>
-#include <gnuradio/atsc/diag_output_impl.h>
-
-/*!
- * \brief ATSC FPLL (2nd Version)
- *
- * Used as follows:
- * float float
- * A/D --> GrFIRfilterFFF ----> GrAtscFPLL ---->
- *
- * We use GrFIRfilterFFF to bandpass filter the signal of interest.
- *
- * This class accepts a single real input and produces a single real output
- */
-
-class GrAtscFPLL : public VrSigProc {
- protected:
-
- typedef float iType;
- typedef float oType;
-
- public:
-
- GrAtscFPLL (double a_initial_freq);
- virtual ~GrAtscFPLL () {}
-
- virtual const char *name () { return "GrAtscFPLL"; }
-
- virtual void initialize ();
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-
- // diagnostic routines
- void set_initial_phase (double phase) { initial_phase = phase; } //
radians
- void set_no_update (bool a_no_update) { debug_no_update = a_no_update; }
-
-
- protected:
-
- double initial_freq;
- double initial_phase;
- bool debug_no_update;
- gr_nco<float,float> nco;
- gr_agc agc; // automatic gain control
- gr_single_pole_iir<float,float,float> afci;
- gr_single_pole_iir<float,float,float> afcq;
-
-#ifdef _FPLL_DIAG_OUTPUT_
- FILE *fp;
-#endif
-
-};
-
-
-#endif // _GRATSCFPLL_H_
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncChecker.h
b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncChecker.h
deleted file mode 100644
index 28458a1..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncChecker.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCFIELDSYNCCHECKER_H_
-#define _GRATSCFIELDSYNCCHECKER_H_
-
-#include <VrHistoryProc.h>
-
-class atsci_fs_checker;
-
-/*!
- * \brief ATSC field sync checker (float,syminfo --> float,syminfo)
- *
- * first output is delayed version of input.
- * second output is set of tags, one-for-one with first output.
- */
-
-class GrAtscFieldSyncChecker : public VrHistoryProc<float,float>
-{
-
-public:
-
- GrAtscFieldSyncChecker ();
- ~GrAtscFieldSyncChecker ();
-
- const char *name () { return "GrAtscFieldSyncChecker"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_fs_checker *d_fsc;
-};
-
-#endif /* _GRATSCFIELDSYNCCHECKER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncCorrelator.h
b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncCorrelator.h
deleted file mode 100644
index 1a16048..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncCorrelator.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCFIELDSYNCCORRELATOR_H_
-#define _GRATSCFIELDSYNCCORRELATOR_H_
-
-#include <VrHistoryProc.h>
-
-class atsci_fs_correlator;
-
-/*!
- * \brief ATSC field sync correlator (float --> float,float)
- *
- * first output is delayed version of input.
- * second output is set of tags, one-for-one with first output.
- *
- * tag values are defined in atsci_sync_tag.h
- */
-
-class GrAtscFieldSyncCorrelator : public VrHistoryProc<float,float>
-{
-
-public:
-
- GrAtscFieldSyncCorrelator ();
- ~GrAtscFieldSyncCorrelator ();
-
- const char *name () { return "GrAtscFieldSyncCorrelator"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_fs_correlator *d_fsc;
-};
-
-#endif /* _GRATSCFIELDSYNCCORRELATOR_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncDemux.h
b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncDemux.h
deleted file mode 100644
index ed7eb16..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncDemux.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCFIELDSYNCDEMUX_H_
-#define _GRATSCFIELDSYNCDEMUX_H_
-
-#include <VrDecimatingSigProc.h>
-#include <gnuradio/atsc/types.h>
-
-/*!
- * \brief ATSC Field Sync Demux
- *
- * This class accepts 1 stream of floats (data), and 1 stream of tags
(syminfo).
- * It outputs one stream of atsc_soft_data_segment packets
- */
-
-class GrAtscFieldSyncDemux : public
VrDecimatingSigProc<float,atsc_soft_data_segment> {
-
- public:
-
- GrAtscFieldSyncDemux ();
- virtual ~GrAtscFieldSyncDemux ();
-
- virtual const char *name () { return "GrAtscFieldSyncDemux"; }
-
- virtual int forecast (VrSampleRange output,
- VrSampleRange inputs[]);
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
- protected:
-
- bool d_locked;
- bool d_in_field2;
- int d_segment_number;
- VrSampleIndex d_next_input;
- VrSampleIndex d_lost_index; // diagnostic fluff
-};
-
-#endif // _GRATSCFIELDSYNCDEMUX_H_
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncMux.h
b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncMux.h
deleted file mode 100644
index 7998d9a..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncMux.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCFIELDSYNCMUX_H_
-#define _GRATSCFIELDSYNCMUX_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/types.h>
-
-/*!
- * \brief Insert ATSC Field Syncs as required (atsc_data_segment -->
atsc_data_segment)
- */
-
-class GrAtscFieldSyncMux : public VrHistoryProc<atsc_data_segment,
atsc_data_segment>
-{
-
-public:
-
- GrAtscFieldSyncMux ();
- ~GrAtscFieldSyncMux ();
-
- const char *name () { return "GrAtscFieldSyncMux"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
- int forecast (VrSampleRange output, VrSampleRange inputs[]);
-
- void pre_initialize ();
-
- static const int N_SAVED_SYMBOLS = 12;
-
-protected:
- VrSampleIndex d_current_index;
- bool d_already_output_field_sync;
- unsigned char d_saved_symbols[N_SAVED_SYMBOLS];
-};
-
-#endif /* _GRATSCFIELDSYNCMUX_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscInterleaver.h
b/gr-atsc/include/gnuradio/atsc/GrAtscInterleaver.h
deleted file mode 100644
index 158c6a6..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscInterleaver.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCINTERLEAVER_H_
-#define _GRATSCINTERLEAVER_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/types.h>
-#include <gnuradio/atsc/data_interleaver_impl.h>
-
-/*!
- * \brief Interleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded -->
atsc_mpeg_packet_rs_encoded)
- */
-
-class GrAtscInterleaver : public VrHistoryProc<atsc_mpeg_packet_rs_encoded,
atsc_mpeg_packet_rs_encoded>
-{
-
-public:
-
- GrAtscInterleaver ();
- ~GrAtscInterleaver ();
-
- const char *name () { return "GrAtscInterleaver"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_data_interleaver interleaver;
-};
-
-#endif /* _GRATSCINTERLEAVER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscRSDecoder.h
b/gr-atsc/include/gnuradio/atsc/GrAtscRSDecoder.h
deleted file mode 100644
index 160adc5..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscRSDecoder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCRSDECODER_H_
-#define _GRATSCRSDECODER_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/types.h>
-#include <gnuradio/atsc/reed_solomon_impl.h>
-
-/*!
- * \brief Pass ATSC data Reed-Solomon decoder( atsc_mpeg_packet_rs_encoded -->
atsc_mpeg_rs_no_sync)
- */
-
-class GrAtscRSDecoder : public VrHistoryProc<atsc_mpeg_packet_rs_encoded,
atsc_mpeg_packet_no_sync>
-{
-
-public:
-
- GrAtscRSDecoder ();
- ~GrAtscRSDecoder ();
-
- const char *name () { return "GrAtscRSDecoder"; }
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_reed_solomon rs_decoder;
-};
-
-#endif /* _GRATSCRSDECODER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscRSEncoder.h
b/gr-atsc/include/gnuradio/atsc/GrAtscRSEncoder.h
deleted file mode 100644
index b59e28d..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscRSEncoder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCRSENCODER_H_
-#define _GRATSCRSENCODER_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/types.h>
-#include <gnuradio/atsc/reed_solomon_impl.h>
-
-/*!
- * \brief Encode using Reed Solomon ATSC data (atsc_mpeg_packet_no_sync -->
atsc_mpeg_packet_rs_encoded)
- */
-
-class GrAtscRSEncoder : public VrHistoryProc<atsc_mpeg_packet_no_sync,
atsc_mpeg_packet_rs_encoded>
-{
-
-public:
-
- GrAtscRSEncoder ();
- ~GrAtscRSEncoder ();
-
- const char *name () { return "GrAtscRSEncoder"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_reed_solomon rs_encoder;
-};
-
-#endif /* _GRATSCRSENCODER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscRandomizer.h
b/gr-atsc/include/gnuradio/atsc/GrAtscRandomizer.h
deleted file mode 100644
index 44be873..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscRandomizer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCRANDOMIZER_H_
-#define _GRATSCRANDOMIZER_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/types.h>
-#include <gnuradio/atsc/randomizer_impl.h>
-
-/*!
- * \brief Randomize ATSC data (atsc_mpeg_packet --> atsc_mpeg_packet_no_sync)
- */
-
-class GrAtscRandomizer : public VrHistoryProc<atsc_mpeg_packet,
atsc_mpeg_packet_no_sync>
-{
-
-public:
-
- GrAtscRandomizer ();
- ~GrAtscRandomizer ();
-
- const char *name () { return "GrAtscRandomizer"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_randomizer rand;
-
- // used to initialize plinfo in output
- bool field2;
- int segno;
-};
-
-#endif /* _GRATSCRANDOMIZER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSync.h
b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSync.h
deleted file mode 100644
index 750483f..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSync.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCSEGSYMSYNC_H_
-#define _GRATSCSEGSYMSYNC_H_
-
-#include <VrDecimatingSigProc.h>
-
-/*!
- * \brief ATSC SegSymSync
- *
- * Abstract class that establishes symbol timing and synchronizes
- * with data segment boundaries.
- *
- * Takes a single stream of floats as the input and
- * produces two streams as output. The first stream is the data samples
- * and is of type float. The second stream is the tags, and is of type
syminfo.
- *
- * The current GNU Radio interface doesn't currently support different
- * types on the input ports (or output ports for that matter), but
- * since they are the same size, it works.
- */
-
-#include <atsci_syminfo.h>
-
-class GrAtscSegSymSync : public VrDecimatingSigProc<float,float> {
-
-public:
-
- GrAtscSegSymSync ();
- ~GrAtscSegSymSync ();
-
- /*!
- * \brief reset bit timing loop on channel change
- */
- virtual void reset () = 0;
-
- /*!
- * \brief create an instance of GrAtscSegSymSync
- */
- static GrAtscSegSymSync *create (double
nominal_ratio_of_rx_clock_to_symbol_freq);
-
-};
-
-#endif // _GRATSCSEGSYMSYNC_H_
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl.h
b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl.h
deleted file mode 100644
index e7b3a83..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCSEGSYMSYNCIMPL_H_
-#define _GRATSCSEGSYMSYNCIMPL_H_
-
-#include <GrAtscSegSymSync.h>
-#include <gnuradio/atsc/sssr_impl.h>
-
-
-/*!
- * \brief concrete implementation of GrAtscSegSymSync
- *
- * This class implements data segment sync tracking and symbol timing
- * using a variation of the method described in
- * "ATSC/VSB Tutorial - Receiver Technology" by Wayne E. Bretl of
- * Zenith, pgs 41-45.
- */
-
-class GrAtscSegSymSyncImpl : public GrAtscSegSymSync {
-
- atsci_sssr d_sssr;
- atsci_interpolator d_interp;
- VrSampleIndex d_next_input;
- double d_rx_clock_to_symbol_freq; // nominal ratio
-
-public:
-
- // the standard methods...
-
- GrAtscSegSymSyncImpl (double nominal_ratio_of_rx_clock_to_symbol_freq);
- virtual ~GrAtscSegSymSyncImpl ();
-
- virtual const char *name () { return "GrAtscSegSymSyncImpl"; }
-
- virtual int forecast (VrSampleRange output,
- VrSampleRange inputs[]);
-
- virtual int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
- void pre_initialize ();
-
-
- // reset on channel change
-
- virtual void reset ();
-
-};
-
-#endif /* _GRATSCSEGSYMSYNCIMPL_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscSymbolMapper.h
b/gr-atsc/include/gnuradio/atsc/GrAtscSymbolMapper.h
deleted file mode 100644
index a67b860..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscSymbolMapper.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCSYMBOLMAPPER_H_
-#define _GRATSCSYMBOLMAPPER_H_
-
-
-#include <VrInterpolatingSigProcNoWork.h>
-#include <gnuradio/atsc/types.h>
-#include <gnuradio/blocks/nco.h>
-
-/*!
- * \brief take atsc_data_segments and map them to symbols.
- *
- * Input is a stream of atsc_data_segments.
- * Output is a stream of symbols at 1x the symbol rate
- *
- * This module performs the signal mapping & pilot addition.
- */
-
-template<class oType>
-class GrAtscSymbolMapper
- : public VrInterpolatingSigProcNoWork<atsc_data_segment, oType> {
-
-public:
- GrAtscSymbolMapper ()
- : VrInterpolatingSigProcNoWork<atsc_data_segment, oType>(1, INTERP_FACTOR)
{};
-
- ~GrAtscSymbolMapper () {};
-
- const char *name () { return "GrAtscSymbolMapper"; }
-
- int work (VrSampleRange output, void *ao[],
- VrSampleRange inputs[], void *ai[]);
-
-protected:
- static const int INTERP_FACTOR = ATSC_DATA_SEGMENT_LENGTH;
-};
-
-
-template<class oType>
-int
-GrAtscSymbolMapper<oType>::work (VrSampleRange output, void *ao[],
- VrSampleRange inputs[], void *ai[])
-{
- atsc_data_segment *in = ((atsc_data_segment **) ai)[0];
- oType *out = ((oType **) ao)[0];
-
- assert ((output.size % INTERP_FACTOR) == 0);
-
- static const float pilot_add = 1.25;
- static const float map[8] = {
- -7 + pilot_add,
- -5 + pilot_add,
- -3 + pilot_add,
- -1 + pilot_add,
- 1 + pilot_add,
- 3 + pilot_add,
- 5 + pilot_add,
- 7 + pilot_add
- };
-
- unsigned int oo = 0;
- unsigned int nsegs = output.size / INTERP_FACTOR;
-
- for (unsigned int n = 0; n < nsegs; n++){
- unsigned char *symbol = in[n].data;
-
- for (int i = 0; i < ATSC_DATA_SEGMENT_LENGTH; i++){
- out[oo++] = (oType) map[symbol[i] & 0x7];
- }
- }
-
- assert (oo == output.size);
- return output.size;
-}
-
-#endif /* _GRATSCSYMBOLMAPPER_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscTrellisEncoder.h
b/gr-atsc/include/gnuradio/atsc/GrAtscTrellisEncoder.h
deleted file mode 100644
index 5e8115e..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscTrellisEncoder.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCTRELLISENCODER_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/trellis_encoder_impl.h>
-
-/*!
- * \brief ATSC 12-way interleaved trellis encoder (atsc_mpeg_packet_rs_encoded
--> atsc_data_segment)
- */
-
-class GrAtscTrellisEncoder : public
VrHistoryProc<atsc_mpeg_packet_rs_encoded,atsc_data_segment>
-{
-
-public:
-
- GrAtscTrellisEncoder ();
- ~GrAtscTrellisEncoder ();
-
- const char *name () { return "GrAtscTrellisEncoder"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_trellis_encoder encoder;
- int last_start;
-};
-
-#endif
diff --git a/gr-atsc/include/gnuradio/atsc/GrAtscViterbiDecoder.h
b/gr-atsc/include/gnuradio/atsc/GrAtscViterbiDecoder.h
deleted file mode 100644
index e33aba0..0000000
--- a/gr-atsc/include/gnuradio/atsc/GrAtscViterbiDecoder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _GRATSCVITERBIDECODER_H_
-
-#include <VrHistoryProc.h>
-#include <gnuradio/atsc/viterbi_decoder_impl.h>
-
-/*!
- * \brief ATSC 12-way interleaved viterbi decoder (atsc_soft_data_segment -->
atsc_mpeg_packet_rs_encoded)
- */
-
-class GrAtscViterbiDecoder : public VrHistoryProc<atsc_soft_data_segment,
- atsc_mpeg_packet_rs_encoded>
-{
-
-public:
-
- GrAtscViterbiDecoder ();
- ~GrAtscViterbiDecoder ();
-
- const char *name () { return "GrAtscViterbiDecoder"; }
-
- int work (VrSampleRange output, void *o[],
- VrSampleRange inputs[], void *i[]);
-
-protected:
- atsci_viterbi_decoder decoder;
- int last_start;
-};
-
-#endif
diff --git a/gr-atsc/include/gnuradio/atsc/exp2_lp_impl.h
b/gr-atsc/include/gnuradio/atsc/exp2_lp_impl.h
deleted file mode 100644
index 2d61fc8..0000000
--- a/gr-atsc/include/gnuradio/atsc/exp2_lp_impl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _ATSC_EXP2_LP_H_
-#define _ATSC_EXP2_LP_H_
-
-#include <gnuradio/atsc/api.h>
-#include <gr_fir_builder.h>
-
-class ATSC_API atsci_exp2_lp : public gr_fir_builder
-{
-public:
- virtual std::vector<float> taps (double sampling_freq);
-};
-
-#endif /* _ATSC_EXP2_LP_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/root_raised_cosine_bandpass_impl.h
b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_bandpass_impl.h
deleted file mode 100644
index 318d888..0000000
--- a/gr-atsc/include/gnuradio/atsc/root_raised_cosine_bandpass_impl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _ATSC_RRC_BANDPASS_H_
-#define _ATSC_RRC_BANDPASS_H_
-
-#include <gnuradio/atsc/api.h>
-#include <gnuradio/atsc/root_raised_cosine_impl.h>
-
-class ATSC_API atsc_root_raised_cosine_bandpass : public
atsc_root_raised_cosine
-{
-public:
- atsc_root_raised_cosine_bandpass (double center_freq) : _center_freq
(center_freq) {}
- virtual std::vector<float> taps (double sampling_freq);
-
-protected:
- double _center_freq;
-};
-
-
-#endif /* _ATSC_RRC_BANDPASS_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/root_raised_cosine_impl.h
b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_impl.h
deleted file mode 100644
index 3489a7a..0000000
--- a/gr-atsc/include/gnuradio/atsc/root_raised_cosine_impl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _ATSC_RRC_H_
-#define _ATSC_RRC_H_
-
-#include <gnuradio/atsc/api.h>
-#include <gr_fir_builder.h>
-
-class ATSC_API atsc_root_raised_cosine : public gr_fir_builder
-{
-public:
- virtual std::vector<float> taps (double sampling_freq);
-};
-
-
-#endif /* _ATSC_RRC_H_ */
diff --git a/gr-atsc/include/gnuradio/atsc/vsbtx_lp_impl.h
b/gr-atsc/include/gnuradio/atsc/vsbtx_lp_impl.h
deleted file mode 100644
index ce6f8bf..0000000
--- a/gr-atsc/include/gnuradio/atsc/vsbtx_lp_impl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002 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 _ATSC_VSBTX_LP_H_
-#define _ATSC_VSBTX_LP_H_
-
-#include <gnuradio/atsc/api.h>
-#include <gr_fir_builder.h>
-
-class ATSC_API atsc_vsbtx_lp : public gr_fir_builder
-{
-public:
- virtual std::vector<float> taps (double sampling_freq);
-};
-
-
-
-#endif /* _ATSC_VSBTX_LP_H_ */
diff --git a/gr-fec/include/gnuradio/fec/CMakeLists.txt
b/gr-fec/include/gnuradio/fec/CMakeLists.txt
index aca8c8d..57594b4 100644
--- a/gr-fec/include/gnuradio/fec/CMakeLists.txt
+++ b/gr-fec/include/gnuradio/fec/CMakeLists.txt
@@ -47,6 +47,11 @@ install(FILES
puncture_bb.h
puncture_ff.h
depuncture_bb.h
+ cldpc.h
+ alist.h
+ gf2mat.h
+ gf2vec.h
+ awgn_bp.h
ldpc_encoder.h
ldpc_decoder.h
polar_encoder.h
diff --git a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
index 1e0c9f3..29022b6 100644
--- a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
+++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt
@@ -45,8 +45,6 @@ install(FILES
qtgui_types.h
sink_c.h
sink_f.h
- spectrumdisplayform.h
- SpectrumGUIClass.h
spectrumUpdateEvents.h
timedisplayform.h
timecontrolpanel.h
diff --git a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt
b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt
index 1ad2f71..60f75e7 100644
--- a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt
+++ b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt
@@ -24,9 +24,6 @@ install(FILES
api.h
alaw_decode_bs.h
alaw_encode_sb.h
- codec2.h
- codec2_decode_ps.h
- codec2_encode_sp.h
cvsd_decode_bs.h
cvsd_encode_sb.h
g721_decode_bs.h