4 files changed, 9 insertions, 6 deletions
diff --git a/gr-digital/include/digital_additive_scrambler_bb.h b/gr-digital/include/digital_additive_scrambler_bb.h
index d4bd7d4ae..f1d0113e9 100644
--- a/gr-digital/include/digital_additive_scrambler_bb.h
+++ b/gr-digital/include/digital_additive_scrambler_bb.h
@@ -24,7 +24,7 @@
 
 #include <digital_api.h>
 #include <gr_sync_block.h>
-#include <gri_lfsr.h>
+#include <analog/lfsr.h>
 
 class digital_additive_scrambler_bb;
 typedef boost::shared_ptr<digital_additive_scrambler_bb> digital_additive_scrambler_bb_sptr;
@@ -57,7 +57,7 @@ class DIGITAL_API digital_additive_scrambler_bb : public gr_sync_block
     digital_make_additive_scrambler_bb(int mask, int seed,
 				       int len, int count);
 
-  gri_lfsr d_lfsr;
+  gr::analog::lfsr d_lfsr;
   int      d_count;
   int      d_bits;
 
diff --git a/gr-digital/include/digital_constellation.h b/gr-digital/include/digital_constellation.h
index a72bfb74c..76cd30b25 100644
--- a/gr-digital/include/digital_constellation.h
+++ b/gr-digital/include/digital_constellation.h
@@ -120,6 +120,9 @@ public:
   unsigned int d_rotational_symmetry;
   unsigned int d_dimensionality;
   unsigned int d_arity;
+  // The orignal constellation points were multiplied by this factor to get a
+  // constellation with average magnitude 1.
+  float d_scalefactor;
 
   float get_distance(unsigned int index, const gr_complex *sample);
   unsigned int get_closest_point(const gr_complex *sample);
diff --git a/gr-digital/include/digital_descrambler_bb.h b/gr-digital/include/digital_descrambler_bb.h
index b719803f3..d503102a9 100644
--- a/gr-digital/include/digital_descrambler_bb.h
+++ b/gr-digital/include/digital_descrambler_bb.h
@@ -24,7 +24,7 @@
 
 #include <digital_api.h>
 #include <gr_sync_block.h>
-#include "gri_lfsr.h"
+#include <analog/lfsr.h>
 
 class digital_descrambler_bb;
 typedef boost::shared_ptr<digital_descrambler_bb> digital_descrambler_bb_sptr;
@@ -49,7 +49,7 @@ class DIGITAL_API digital_descrambler_bb : public gr_sync_block
   friend DIGITAL_API digital_descrambler_bb_sptr
     digital_make_descrambler_bb(int mask, int seed, int len);
 
-  gri_lfsr d_lfsr;
+  gr::analog::lfsr d_lfsr;
 
   digital_descrambler_bb(int mask, int seed, int len);
 
diff --git a/gr-digital/include/digital_scrambler_bb.h b/gr-digital/include/digital_scrambler_bb.h
index d6f08dcc8..cafb0e5f2 100644
--- a/gr-digital/include/digital_scrambler_bb.h
+++ b/gr-digital/include/digital_scrambler_bb.h
@@ -24,7 +24,7 @@
 
 #include <digital_api.h>
 #include <gr_sync_block.h>
-#include "gri_lfsr.h"
+#include <analog/lfsr.h>
 
 class digital_scrambler_bb;
 typedef boost::shared_ptr<digital_scrambler_bb> digital_scrambler_bb_sptr;
@@ -49,7 +49,7 @@ class DIGITAL_API digital_scrambler_bb : public gr_sync_block
   friend DIGITAL_API digital_scrambler_bb_sptr
     digital_make_scrambler_bb(int mask, int seed, int len);
 
-  gri_lfsr d_lfsr;
+  gr::analog::lfsr d_lfsr;
 
   digital_scrambler_bb(int mask, int seed, int len);