summaryrefslogtreecommitdiff
path: root/gr-digital
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2013-04-02 16:02:33 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2013-04-02 16:02:33 -0700
commiteea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch)
treeaf3aa889c94cff9c503edefeaf19cb3635693bfb /gr-digital
parente648165dcc7609524681b5eaf9620798b75b8420 (diff)
parent9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff)
Merge branch 'runtime-gruel' into next
Conflicts: gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-digital')
-rw-r--r--gr-digital/include/digital/api.h2
-rw-r--r--gr-digital/lib/CMakeLists.txt1
-rw-r--r--gr-digital/lib/constellation_receiver_cb_impl.h2
-rw-r--r--gr-digital/lib/map_bb_impl.cc4
-rw-r--r--gr-digital/lib/map_bb_impl.h4
-rw-r--r--gr-digital/lib/mpsk_receiver_cc_impl.h2
-rwxr-xr-xgr-digital/python/qa_crc32_bb.py3
-rwxr-xr-xgr-digital/python/qa_header_payload_demux.py3
-rwxr-xr-xgr-digital/python/qa_ofdm_carrier_allocator_cvc.py3
-rwxr-xr-xgr-digital/python/qa_ofdm_chanest_vcvc.py3
-rwxr-xr-xgr-digital/python/qa_ofdm_cyclic_prefixer.py3
-rwxr-xr-xgr-digital/python/qa_ofdm_frame_equalizer_vcvc.py3
-rwxr-xr-xgr-digital/python/qa_ofdm_serializer_vcc.py3
-rwxr-xr-xgr-digital/python/qa_packet_headergenerator_bb.py3
-rwxr-xr-xgr-digital/python/qa_packet_headerparser_b.py3
-rw-r--r--gr-digital/python/utils/tagged_streams.py25
-rw-r--r--gr-digital/swig/CMakeLists.txt4
-rw-r--r--gr-digital/swig/digital_swig.i3
18 files changed, 41 insertions, 33 deletions
diff --git a/gr-digital/include/digital/api.h b/gr-digital/include/digital/api.h
index d45ace13f2..815f7b6627 100644
--- a/gr-digital/include/digital/api.h
+++ b/gr-digital/include/digital/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_DIGITAL_API_H
#define INCLUDED_DIGITAL_API_H
-#include <gruel/attributes.h>
+#include <attributes.h>
#ifdef gnuradio_digital_EXPORTS
# define DIGITAL_API __GR_ATTR_EXPORT
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index faa10c6b65..a17c91a85a 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -29,7 +29,6 @@ include_directories(
${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS}
- ${GRUEL_INCLUDE_DIRS}
${LOG4CPP_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h b/gr-digital/lib/constellation_receiver_cb_impl.h
index 763dabfde2..7c34518340 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.h
+++ b/gr-digital/lib/constellation_receiver_cb_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_IMPL_H
#include <digital/constellation_receiver_cb.h>
-#include <gruel/attributes.h>
+#include <attributes.h>
#include <gr_complex.h>
#include <blocks/control_loop.h>
diff --git a/gr-digital/lib/map_bb_impl.cc b/gr-digital/lib/map_bb_impl.cc
index 3a06394ec4..4ea91835a9 100644
--- a/gr-digital/lib/map_bb_impl.cc
+++ b/gr-digital/lib/map_bb_impl.cc
@@ -51,7 +51,7 @@ namespace gr {
void
map_bb_impl::set_map(const std::vector<int> &map)
{
- gruel::scoped_lock guard(d_mutex);
+ gr::thread::scoped_lock guard(d_mutex);
for(int i = 0; i < 0x100; i++)
d_map[i] = i;
@@ -75,7 +75,7 @@ namespace gr {
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- gruel::scoped_lock guard(d_mutex);
+ gr::thread::scoped_lock guard(d_mutex);
const unsigned char *in = (const unsigned char*)input_items[0];
unsigned char *out = (unsigned char*)output_items[0];
diff --git a/gr-digital/lib/map_bb_impl.h b/gr-digital/lib/map_bb_impl.h
index bce2b9b1b3..59f1e834b7 100644
--- a/gr-digital/lib/map_bb_impl.h
+++ b/gr-digital/lib/map_bb_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_GR_MAP_BB_IMPL_H
#include <digital/map_bb.h>
-#include <gruel/thread.h>
+#include <thread/thread.h>
namespace gr {
namespace digital {
@@ -33,7 +33,7 @@ namespace gr {
{
private:
unsigned char d_map[0x100];
- gruel::mutex d_mutex;
+ gr::thread::mutex d_mutex;
public:
map_bb_impl(const std::vector<int> &map);
diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h b/gr-digital/lib/mpsk_receiver_cc_impl.h
index 099dd424a3..ed53d0f2e4 100644
--- a/gr-digital/lib/mpsk_receiver_cc_impl.h
+++ b/gr-digital/lib/mpsk_receiver_cc_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_IMPL_H
#include <digital/mpsk_receiver_cc.h>
-#include <gruel/attributes.h>
+#include <attributes.h>
#include <blocks/control_loop.h>
#include <gr_complex.h>
#include <fstream>
diff --git a/gr-digital/python/qa_crc32_bb.py b/gr-digital/python/qa_crc32_bb.py
index 6ee7ca1bcf..6f5249ca08 100755
--- a/gr-digital/python/qa_crc32_bb.py
+++ b/gr-digital/python/qa_crc32_bb.py
@@ -22,8 +22,7 @@
from gnuradio import gr, gr_unittest
import blocks_swig as blocks
import digital_swig as digital
-try: import pmt
-except: from gruel import pmt
+import pmt
class qa_crc32_bb (gr_unittest.TestCase):
diff --git a/gr-digital/python/qa_header_payload_demux.py b/gr-digital/python/qa_header_payload_demux.py
index 7595409ef8..222b457021 100755
--- a/gr-digital/python/qa_header_payload_demux.py
+++ b/gr-digital/python/qa_header_payload_demux.py
@@ -20,8 +20,7 @@
#
from gnuradio import gr, gr_unittest
-try: import pmt
-except: from gruel import pmt
+import pmt
import digital_swig as digital
import blocks_swig as blocks
import time
diff --git a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py b/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py
index e1f017ba9e..f5c72fb87e 100755
--- a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py
+++ b/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py
@@ -20,8 +20,7 @@
#
from gnuradio import gr, gr_unittest
-try: import pmt
-except: from gruel import pmt
+import pmt
import digital_swig as digital
import blocks_swig as blocks
diff --git a/gr-digital/python/qa_ofdm_chanest_vcvc.py b/gr-digital/python/qa_ofdm_chanest_vcvc.py
index cd3aaa85d1..d095bbcd9c 100755
--- a/gr-digital/python/qa_ofdm_chanest_vcvc.py
+++ b/gr-digital/python/qa_ofdm_chanest_vcvc.py
@@ -20,8 +20,7 @@
#
from gnuradio import gr, gr_unittest
-try: import pmt
-except: from gruel import pmt
+import pmt
import blocks_swig as blocks
import analog_swig as analog
import digital_swig as digital
diff --git a/gr-digital/python/qa_ofdm_cyclic_prefixer.py b/gr-digital/python/qa_ofdm_cyclic_prefixer.py
index 355742ab07..0469b3f970 100755
--- a/gr-digital/python/qa_ofdm_cyclic_prefixer.py
+++ b/gr-digital/python/qa_ofdm_cyclic_prefixer.py
@@ -21,8 +21,7 @@
#
from gnuradio import gr, gr_unittest
-try: import pmt
-except: from gruel import pmt
+import pmt
import digital_swig as digital
import blocks_swig as blocks
diff --git a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py b/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py
index 6df9ecbecf..5a34791650 100755
--- a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py
+++ b/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py
@@ -21,8 +21,7 @@
import numpy
from gnuradio import gr, gr_unittest
-try: import pmt
-except: from gruel import pmt
+import pmt
import digital_swig as digital
import blocks_swig as blocks
diff --git a/gr-digital/python/qa_ofdm_serializer_vcc.py b/gr-digital/python/qa_ofdm_serializer_vcc.py
index a5dee78558..0ce6f01348 100755
--- a/gr-digital/python/qa_ofdm_serializer_vcc.py
+++ b/gr-digital/python/qa_ofdm_serializer_vcc.py
@@ -25,8 +25,7 @@ import blocks_swig as blocks
import fft_swig as fft
import analog_swig as analog
import digital_swig as digital
-try: import pmt
-except: from gruel import pmt
+import pmt
import numpy
class qa_ofdm_serializer_vcc (gr_unittest.TestCase):
diff --git a/gr-digital/python/qa_packet_headergenerator_bb.py b/gr-digital/python/qa_packet_headergenerator_bb.py
index 0f42c33a51..bb0cfef9f4 100755
--- a/gr-digital/python/qa_packet_headergenerator_bb.py
+++ b/gr-digital/python/qa_packet_headergenerator_bb.py
@@ -22,8 +22,7 @@
from gnuradio import gr, gr_unittest
import digital_swig as digital
import blocks_swig as blocks
-try: import pmt
-except: from gruel import pmt
+import pmt
class qa_packet_headergenerator_bb (gr_unittest.TestCase):
diff --git a/gr-digital/python/qa_packet_headerparser_b.py b/gr-digital/python/qa_packet_headerparser_b.py
index da7aef69d3..3c8cd67335 100755
--- a/gr-digital/python/qa_packet_headerparser_b.py
+++ b/gr-digital/python/qa_packet_headerparser_b.py
@@ -21,8 +21,7 @@
import time
from gnuradio import gr, gr_unittest
-try: import pmt
-except: from gruel import pmt
+import pmt
import blocks_swig as blocks
import digital_swig as digital
diff --git a/gr-digital/python/utils/tagged_streams.py b/gr-digital/python/utils/tagged_streams.py
index 6a956aa642..f2a58ffe1e 100644
--- a/gr-digital/python/utils/tagged_streams.py
+++ b/gr-digital/python/utils/tagged_streams.py
@@ -1,6 +1,27 @@
+#!/usr/bin/env python
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
from gnuradio import gr
-try: import pmt
-except: from gruel import pmt
+import pmt
def make_lengthtags(lengths, offsets, tagname='length', vlen=1):
tags = []
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
index 6f49298209..76054de3fa 100644
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@ -30,7 +30,6 @@ set(GR_SWIG_INCLUDE_DIRS
${GR_FFT_INCLUDE_DIRS}
${GR_FILTER_INCLUDE_DIRS}
${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
- ${GRUEL_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
@@ -42,7 +41,8 @@ endif(ENABLE_GR_CTRLPORT)
# Setup swig docs to depend on includes and pull in from build directory
set(GR_SWIG_TARGET_DEPS digital_generated_includes)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/digital)
+set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_LIBRARIES gnuradio-digital
gnuradio-filter gnuradio-analog gnuradio-blocks)
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index 275496a5c6..54f9c64e2d 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -36,9 +36,6 @@
%}
%include <blocks/control_loop.h>
-// Used in the constellation objects
-%template(unsigned_int_vector) std::vector<unsigned int>;
-
%{
#include "digital/additive_scrambler_bb.h"
#include "digital/binary_slicer_fb.h"
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 15:21:19 +0000