digital: switched digital components over to using LFSR class now in gr-analog.

6 files changed, 10 insertions, 7 deletions

diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index eb7ed67e1..864cd673a 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -29,6 +29,7 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-digital" ENABLE_GR_DIGITAL
     Boost_FOUND
     ENABLE_GR_CORE
+    ENABLE_GR_ANALOG
 )
 
 GR_SET_GLOBAL(GR_DIGITAL_INCLUDE_DIRS
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_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);
 
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index bd4f1a500..155a10098 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -22,6 +22,7 @@
 ########################################################################
 include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_ANALOG_INCLUDE_DIRS}
     ${GR_DIGITAL_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}/../include
 )
@@ -146,4 +147,4 @@ add_library(gnuradio-digital SHARED ${gr_digital_sources})
 target_link_libraries(gnuradio-digital ${digital_libs})
 GR_LIBRARY_FOO(gnuradio-digital RUNTIME_COMPONENT "digital_runtime" DEVEL_COMPONENT "digital_devel")
 
-add_dependencies(gnuradio-digital digital_generated_includes digital_generated_swigs)
+add_dependencies(gnuradio-digital digital_generated_includes digital_generated_swigs gnuradio-analog)
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
index df5f04148..42bc8baa6 100644
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@ -105,6 +105,7 @@ execute_process(
 )
 
 set(GR_SWIG_INCLUDE_DIRS
+    ${GR_ANALOG_INCLUDE_DIRS}
     ${GR_DIGITAL_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}