From 39b55a1daa03afd058c53def62a777e9d13e6d81 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Fri, 21 Jun 2013 21:58:56 +0200 Subject: [PATCH] delete pdu_to_blob block --- grc/CMakeLists.txt | 1 - grc/foo_pdu_to_blob.xml | 19 ----------- include/foo/CMakeLists.txt | 1 - include/foo/pdu_to_blob.h | 38 ---------------------- lib/CMakeLists.txt | 1 - lib/pdu_to_blob_impl.cc | 65 -------------------------------------- swig/foo_swig.i | 3 -- 7 files changed, 128 deletions(-) delete mode 100644 grc/foo_pdu_to_blob.xml delete mode 100644 include/foo/pdu_to_blob.h delete mode 100644 lib/pdu_to_blob_impl.cc diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 48db919..431b864 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -21,7 +21,6 @@ install(FILES foo_burst_tagger.xml foo_packet_dropper.xml foo_packet_pad.xml - foo_pdu_to_blob.xml foo_periodic_msg_source.xml foo_string_to_blob.xml foo_wireshark_connector.xml diff --git a/grc/foo_pdu_to_blob.xml b/grc/foo_pdu_to_blob.xml deleted file mode 100644 index 05aca8d..0000000 --- a/grc/foo_pdu_to_blob.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - PDU to Blob - foo_pdu_to_blob - Foo - import foo - foo.pdu_to_blob() - - - in - message - - - - out - message - - diff --git a/include/foo/CMakeLists.txt b/include/foo/CMakeLists.txt index 6fb73e8..8fba7e1 100644 --- a/include/foo/CMakeLists.txt +++ b/include/foo/CMakeLists.txt @@ -25,7 +25,6 @@ install(FILES burst_tagger.h packet_dropper.h packet_pad.h - pdu_to_blob.h periodic_msg_source.h string_to_blob.h wireshark_connector.h diff --git a/include/foo/pdu_to_blob.h b/include/foo/pdu_to_blob.h deleted file mode 100644 index 5e18e3e..0000000 --- a/include/foo/pdu_to_blob.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 this program. If not, see . - */ -#ifndef INCLUDED_FOO_PDU_TO_BLOB_H -#define INCLUDED_FOO_PDU_TO_BLOB_H - -#include -#include - -namespace gr { -namespace foo { - -class FOO_API pdu_to_blob : virtual public gr::block -{ -public: - - typedef boost::shared_ptr sptr; - static sptr make(); - -}; - -} // namespace foo -} // namespace gr - -#endif /* INCLUDED_FOO_PDU_TO_BLOB_H */ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index cabc325..7583511 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -29,7 +29,6 @@ list(APPEND foo_sources burst_tagger_impl.cc packet_dropper_impl.cc packet_pad_impl.cc - pdu_to_blob_impl.cc periodic_msg_source_impl.cc string_to_blob_impl.cc wireshark_connector_impl.cc diff --git a/lib/pdu_to_blob_impl.cc b/lib/pdu_to_blob_impl.cc deleted file mode 100644 index 228bde9..0000000 --- a/lib/pdu_to_blob_impl.cc +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2013 Bastian Bloessl - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 this program. If not, see . - */ -#include - -#include -#include - -using namespace gr::foo; - -class pdu_to_blob_impl : public pdu_to_blob { - -public: - -pdu_to_blob_impl() : - block("pdu_to_blob", - gr::io_signature::make(0, 0, 0), - gr::io_signature::make(0, 0, 0)) { - - message_port_register_out(pmt::mp("out")); - - message_port_register_in(pmt::mp("in")); - set_msg_handler(pmt::mp("in"), boost::bind(&pdu_to_blob_impl::make_blob, this, _1)); -} - -~pdu_to_blob_impl() { - -} - -void make_blob(pmt::pmt_t msg) { - - if(!pmt::is_pair(msg)) - throw std::invalid_argument("this block expects PDUs as input"); - - pmt::pmt_t vec = pmt::cdr(msg); - - if(!pmt::is_u8vector(vec)) - throw std::invalid_argument("this block expects PDUs as input"); - - size_t len; - const void *data = pmt::uniform_vector_elements(vec, len); - - pmt::pmt_t blob = pmt::make_blob(data, len); - message_port_pub(pmt::mp("out"), blob); -} - -}; - -pdu_to_blob::sptr -pdu_to_blob::make() { - return gnuradio::get_initial_sptr(new pdu_to_blob_impl()); -} diff --git a/swig/foo_swig.i b/swig/foo_swig.i index 99f4250..9040e9f 100644 --- a/swig/foo_swig.i +++ b/swig/foo_swig.i @@ -9,7 +9,6 @@ #include "foo/burst_tagger.h" #include "foo/packet_dropper.h" #include "foo/packet_pad.h" -#include "foo/pdu_to_blob.h" #include "foo/periodic_msg_source.h" #include "foo/string_to_blob.h" #include "foo/wireshark_connector.h" @@ -19,7 +18,6 @@ %include "foo/burst_tagger.h" %include "foo/packet_dropper.h" %include "foo/packet_pad.h" -%include "foo/pdu_to_blob.h" %include "foo/periodic_msg_source.h" %include "foo/string_to_blob.h" %include "foo/wireshark_connector.h" @@ -28,6 +26,5 @@ GR_SWIG_BLOCK_MAGIC2(foo, burst_tagger); GR_SWIG_BLOCK_MAGIC2(foo, packet_dropper); GR_SWIG_BLOCK_MAGIC2(foo, wireshark_connector); GR_SWIG_BLOCK_MAGIC2(foo, packet_pad); -GR_SWIG_BLOCK_MAGIC2(foo, pdu_to_blob); GR_SWIG_BLOCK_MAGIC2(foo, periodic_msg_source); GR_SWIG_BLOCK_MAGIC2(foo, string_to_blob);