[Commit-gnuradio] r8668 - gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib

[cswiger]

Author: cswiger
Date: 2008-06-23 13:06:16 -0600 (Mon, 23 Jun 2008)
New Revision: 8668

Modified:
   gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib/Makefile.am
   gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib/atsc_cpll.cc
Log:
Removed fpll, changed references to fpll_btloop_coupling to cpll_fpll_coupling


Modified: gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib/Makefile.am        
2008-06-23 18:38:18 UTC (rev 8667)
+++ gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib/Makefile.am        
2008-06-23 19:06:16 UTC (rev 8668)
@@ -75,7 +75,6 @@
        atsc_equalizer.cc                       \
        atsc_fs_checker.cc                      \
        atsc_bit_timing_loop.cc                 \
-       atsc_fpll.cc                            \
        atsc_cpll.cc                            \
        atsc_depad.cc                           \
        atsc_pad.cc                             \
@@ -137,7 +136,6 @@
        atsc_equalizer.h                        \
        atsc_fs_checker.h                       \
        atsc_bit_timing_loop.h                  \
-       atsc_fpll.h                             \
        atsc_cpll.h                             \
        atsc_depad.h                            \
        atsc_pad.h                              \
@@ -173,7 +171,7 @@
        create_atsci_equalizer.h                \
        create_atsci_fs_checker.h               \
        create_atsci_fs_correlator.h            \
-       fpll_btloop_coupling.h                  \
+       cpll_btloop_coupling.h                  \
        interleaver_fifo.h                      \
        qa_atsci.h                              \
        qa_atsci_basic_trellis_encoder.h        \

Modified: gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib/atsc_cpll.cc
===================================================================
--- gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib/atsc_cpll.cc       
2008-06-23 18:38:18 UTC (rev 8667)
+++ gnuradio/branches/developers/cswiger/wip/gr-atsc/src/lib/atsc_cpll.cc       
2008-06-23 19:06:16 UTC (rev 8668)
@@ -28,7 +28,7 @@
 #include <gr_io_signature.h>
 #include <atsc_consts.h>
 #include <algorithm>
-#include "fpll_btloop_coupling.h"
+#include "cpll_btloop_coupling.h"
 #include <gr_math.h>
 #include <math.h>
 #include <gr_sincos.h>
@@ -49,7 +49,7 @@
  * their value also sets the level of the symbols going
  * into the equalizer and viterbi decoder.
  */
-static const float CPLL_AGC_REFERENCE = 1.7675 * FPLL_BTLOOP_COUPLING_CONST;
+static const float CPLL_AGC_REFERENCE = 1.7675 * CPLL_BTLOOP_COUPLING_CONST;
 static const float CPLL_AGC_RATE = 0.25e-6;