summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormax <max@65a5c917-d112-43f1-993d-58c26a4786be>2012-08-15 17:30:59 +0000
committermax <max@65a5c917-d112-43f1-993d-58c26a4786be>2012-08-15 17:30:59 +0000
commita39f29ada820642707bec5a74430bd1c74e27840 (patch)
treed1323e8253d0cb1ecef1430c60e70d8a6277910f
parent459cb259d5337413150e471d331b801c93a483fe (diff)
fix gruel include error
git-svn-id: http://op25.osmocom.org/svn/trunk@305 65a5c917-d112-43f1-993d-58c26a4786be
-rw-r--r--repeater/Makefile.common5
-rw-r--r--repeater/src/lib/rs.cc2
2 files changed, 5 insertions, 2 deletions
diff --git a/repeater/Makefile.common b/repeater/Makefile.common
index 261de50..cc4df0c 100644
--- a/repeater/Makefile.common
+++ b/repeater/Makefile.common
@@ -26,6 +26,9 @@ grincludedir = $(includedir)/gnuradio
# swig includes
swigincludedir = $(grincludedir)/swig
+# gruel includes
+gruelincludedir = $(includedir)/gruel
+
# Install this stuff in the appropriate subdirectory
# This usually ends up at:
# ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -35,4 +38,4 @@ grpyexecdir = $(pyexecdir)/gnuradio
# swig flags
SWIGPYTHONFLAGS = -fvirtual -python -modern
-SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(GNURADIO_CORE_INCLUDEDIR)
+SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(GNURADIO_CORE_INCLUDEDIR) -I$(gruelincludedir)/swig
diff --git a/repeater/src/lib/rs.cc b/repeater/src/lib/rs.cc
index e1dd1d1..c14b783 100644
--- a/repeater/src/lib/rs.cc
+++ b/repeater/src/lib/rs.cc
@@ -209,7 +209,7 @@ static const uint32_t hmg1063EncTbl[64] = {
14, 2, 13, 1, 9, 5, 10, 6, 5, 9, 6, 10, 2, 14, 1, 13,
3, 15, 0, 12, 4, 8, 7, 11, 8, 4, 11, 7, 15, 3, 12, 0 };
static const uint32_t hmg1063DecTbl[16] = {
- 0, 0, 1, 0, 2, 4, 8, 0, 16, 32, 64, 128, 256, 512, 1024, 0 };
+ 0, 0, 0, 2, 0, 0, 0, 4, 0, 0, 0, 8, 1, 16, 32, 0 };
static const uint32_t rsGFexp[64] = {
1, 2, 4, 8, 16, 32, 3, 6, 12, 24, 48, 35, 5, 10, 20, 40,