summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-11-10 16:25:30 -0500
committerTom Rondeau <trondeau@vt.edu>2012-11-10 16:25:30 -0500
commitcd8b03e45ff50f6f65f57b2e62e70f725da638d4 (patch)
tree93690515965bdbed800259303cef0051cb7bf609
parent0cf561018b60bd00b2315f77c7ee073acb6a8758 (diff)
analog: moved lfsr from gr-analog to gr-digital where it is used.
Diffstat
-rw-r--r--gr-analog/swig/analog_swig.i2
-rw-r--r--gr-digital/include/digital/CMakeLists.txt1
-rw-r--r--gr-digital/include/digital/lfsr.h (renamed from gr-analog/include/analog/lfsr.h)14
-rw-r--r--gr-digital/lib/additive_scrambler_bb_impl.h4
-rw-r--r--gr-digital/lib/descrambler_bb_impl.h4
-rw-r--r--gr-digital/lib/scrambler_bb_impl.h4
-rwxr-xr-xgr-digital/python/qa_lfsr.py (renamed from gr-analog/python/qa_lfsr.py)4
-rw-r--r--gr-digital/swig/digital_swig.i3
8 files changed, 19 insertions, 17 deletions
diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i
index 016537c949..5171af09bb 100644
--- a/gr-analog/swig/analog_swig.i
+++ b/gr-analog/swig/analog_swig.i
@@ -40,7 +40,6 @@
#include "analog/feedforward_agc_cc.h"
#include "analog/fmdet_cf.h"
#include "analog/frequency_modulator_fc.h"
-#include "analog/lfsr.h"
#include "analog/noise_source_s.h"
#include "analog/noise_source_i.h"
#include "analog/noise_source_f.h"
@@ -79,7 +78,6 @@
%include "analog/feedforward_agc_cc.h"
%include "analog/fmdet_cf.h"
%include "analog/frequency_modulator_fc.h"
-%include "analog/lfsr.h"
%include "analog/noise_source_s.h"
%include "analog/noise_source_i.h"
%include "analog/noise_source_f.h"
diff --git a/gr-digital/include/digital/CMakeLists.txt b/gr-digital/include/digital/CMakeLists.txt
index d8e17546ed..1a5869b3cd 100644
--- a/gr-digital/include/digital/CMakeLists.txt
+++ b/gr-digital/include/digital/CMakeLists.txt
@@ -78,6 +78,7 @@ install(FILES
api.h
constellation.h
crc32.h
+ lfsr.h
glfsr.h
mpsk_snr_est.h
simple_framer_sync.h
diff --git a/gr-analog/include/analog/lfsr.h b/gr-digital/include/digital/lfsr.h
index 5cf2ec70df..2319961257 100644
--- a/gr-analog/include/analog/lfsr.h
+++ b/gr-digital/include/digital/lfsr.h
@@ -20,15 +20,15 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_ANALOG_LFSR_H
-#define INCLUDED_ANALOG_LFSR_H
+#ifndef INCLUDED_DIGITAL_LFSR_H
+#define INCLUDED_DIGITAL_LFSR_H
-#include <analog/api.h>
+#include <digital/api.h>
#include <stdexcept>
#include <stdint.h>
namespace gr {
- namespace analog {
+ namespace digital {
/*!
* \brief Fibonacci Linear Feedback Shift Register using specified
@@ -38,7 +38,7 @@ namespace gr {
* Generates a maximal length pseudo-random sequence of length
* 2^degree-1
*
- * Constructor: analog::lfsr(int mask, int seed, int reg_len);
+ * Constructor: digital::lfsr(int mask, int seed, int reg_len);
*
* \param mask - polynomial coefficients representing the
* locations of feedback taps from a shift register
@@ -156,7 +156,7 @@ namespace gr {
int mask() const { return d_mask; }
};
- } /* namespace analog */
+ } /* namespace digital */
} /* namespace gr */
-#endif /* INCLUDED_ANALOG_LFSR_H */
+#endif /* INCLUDED_DIGITAL_LFSR_H */
diff --git a/gr-digital/lib/additive_scrambler_bb_impl.h b/gr-digital/lib/additive_scrambler_bb_impl.h
index 1720eb59d5..5a4c2f5025 100644
--- a/gr-digital/lib/additive_scrambler_bb_impl.h
+++ b/gr-digital/lib/additive_scrambler_bb_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_ADDITIVE_SCRAMBLER_BB_IMPL_H
#include <digital/additive_scrambler_bb.h>
-#include <analog/lfsr.h>
+#include <digital/lfsr.h>
namespace gr {
namespace digital {
@@ -33,7 +33,7 @@ namespace gr {
: public additive_scrambler_bb
{
private:
- analog::lfsr d_lfsr;
+ digital::lfsr d_lfsr;
int d_count;
int d_bits;
int d_len;
diff --git a/gr-digital/lib/descrambler_bb_impl.h b/gr-digital/lib/descrambler_bb_impl.h
index e5ab8b80d5..4f07b7c329 100644
--- a/gr-digital/lib/descrambler_bb_impl.h
+++ b/gr-digital/lib/descrambler_bb_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_DESCRAMBLER_BB_IMPL_H
#include <digital/descrambler_bb.h>
-#include <analog/lfsr.h>
+#include <digital/lfsr.h>
namespace gr {
namespace digital {
@@ -32,7 +32,7 @@ namespace gr {
class descrambler_bb_impl : public descrambler_bb
{
private:
- analog::lfsr d_lfsr;
+ digital::lfsr d_lfsr;
public:
descrambler_bb_impl(int mask, int seed, int len);
diff --git a/gr-digital/lib/scrambler_bb_impl.h b/gr-digital/lib/scrambler_bb_impl.h
index b79b928c5b..8525e7ef5c 100644
--- a/gr-digital/lib/scrambler_bb_impl.h
+++ b/gr-digital/lib/scrambler_bb_impl.h
@@ -25,7 +25,7 @@
#include <digital/scrambler_bb.h>
#include <gr_sync_block.h>
-#include <analog/lfsr.h>
+#include <digital/lfsr.h>
namespace gr {
namespace digital {
@@ -33,7 +33,7 @@ namespace gr {
class scrambler_bb_impl : public scrambler_bb
{
private:
- analog::lfsr d_lfsr;
+ digital::lfsr d_lfsr;
public:
scrambler_bb_impl(int mask, int seed, int len);
diff --git a/gr-analog/python/qa_lfsr.py b/gr-digital/python/qa_lfsr.py
index 2a8167a571..d70c466ca7 100755
--- a/gr-analog/python/qa_lfsr.py
+++ b/gr-digital/python/qa_lfsr.py
@@ -21,7 +21,7 @@
#
from gnuradio import gr, gr_unittest
-import analog_swig as analog
+import digital_swig as digital
import math
@@ -35,7 +35,7 @@ class test_lfsr(gr_unittest.TestCase):
def test_lfsr_001(self):
reglen = 8
- l = analog.lfsr(1, 1, reglen)
+ l = digital.lfsr(1, 1, reglen)
result_data = []
for i in xrange(4*(reglen+1)):
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index 34a921f754..9cb78dd0dc 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -23,6 +23,7 @@
#define ANALOG_API
%include "gnuradio.i"
+%include "stdint.i"
//load generated python docstrings
%include "digital_swig_doc.i"
@@ -37,6 +38,7 @@
%{
#include "digital/metric_type.h"
#include "digital/mpsk_snr_est.h"
+#include "digital/lfsr.h"
#include "digital/additive_scrambler_bb.h"
#include "digital/binary_slicer_fb.h"
#include "digital/chunks_to_symbols_bf.h"
@@ -87,6 +89,7 @@
%include "digital/metric_type.h"
%include "digital/mpsk_snr_est.h"
+%include "digital/lfsr.h"
%include "digital/additive_scrambler_bb.h"
%include "digital/binary_slicer_fb.h"
%include "digital/chunks_to_symbols_bf.h"
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-16 23:36:08 +0000