diff options
-rw-r--r-- | grc/flow_control/CMakeLists.txt | 3 | ||||
-rw-r--r-- | grc/flow_control/gsm_dummy_burst_filter.xml | 24 | ||||
-rw-r--r-- | grc/gsm_block_tree.xml | 1 | ||||
-rw-r--r-- | include/grgsm/flow_control/CMakeLists.txt | 3 | ||||
-rw-r--r-- | include/grgsm/flow_control/dummy_burst_filter.h | 55 | ||||
-rw-r--r-- | lib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/flow_control/dummy_burst_filter_impl.cc | 105 | ||||
-rw-r--r-- | lib/flow_control/dummy_burst_filter_impl.h | 48 | ||||
-rw-r--r-- | python/CMakeLists.txt | 1 | ||||
-rwxr-xr-x | python/qa_dummy_burst_filter.py | 102 | ||||
-rw-r--r-- | swig/grgsm_swig.i | 3 |
11 files changed, 344 insertions, 2 deletions
diff --git a/grc/flow_control/CMakeLists.txt b/grc/flow_control/CMakeLists.txt index 37fa830..6531501 100644 --- a/grc/flow_control/CMakeLists.txt +++ b/grc/flow_control/CMakeLists.txt @@ -19,5 +19,6 @@ install(FILES gsm_burst_timeslot_splitter.xml - gsm_burst_fnr_filter.xml DESTINATION share/gnuradio/grc/blocks + gsm_burst_fnr_filter.xml + gsm_dummy_burst_filter.xml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/flow_control/gsm_dummy_burst_filter.xml b/grc/flow_control/gsm_dummy_burst_filter.xml new file mode 100644 index 0000000..046abbf --- /dev/null +++ b/grc/flow_control/gsm_dummy_burst_filter.xml @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<block> + <name>Dummy burst filter</name> + <key>gsm_dummy_burst_filter</key> + <import>import grgsm</import> + <make>grgsm.dummy_burst_filter()</make> + + <sink> + <name>in</name> + <type>message</type> + </sink> + + <source> + <name>out</name> + <type>message</type> + <optional>1</optional> + </source> + + <doc> +This block filters dummy bursts. + +For more information on dummy bursts, see GSM 05.02. + </doc> +</block> diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml index 2c48aff..1b8cd03 100644 --- a/grc/gsm_block_tree.xml +++ b/grc/gsm_block_tree.xml @@ -41,6 +41,7 @@ <name>Flow control</name> <block>gsm_burst_timeslot_splitter</block> <block>gsm_burst_fnr_filter</block> + <block>gsm_dummy_burst_filter</block> </cat> <cat> <name>Utilities</name> diff --git a/include/grgsm/flow_control/CMakeLists.txt b/include/grgsm/flow_control/CMakeLists.txt index 1063aae..380dd73 100644 --- a/include/grgsm/flow_control/CMakeLists.txt +++ b/include/grgsm/flow_control/CMakeLists.txt @@ -22,5 +22,6 @@ ######################################################################## install(FILES burst_timeslot_splitter.h - burst_fnr_filter.h DESTINATION include/grgsm/flow_control + burst_fnr_filter.h + dummy_burst_filter.h DESTINATION include/grgsm/flow_control ) diff --git a/include/grgsm/flow_control/dummy_burst_filter.h b/include/grgsm/flow_control/dummy_burst_filter.h new file mode 100644 index 0000000..0922433 --- /dev/null +++ b/include/grgsm/flow_control/dummy_burst_filter.h @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm 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. + * + * Gr-gsm 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 gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef INCLUDED_GSM_DUMMY_BURST_FILTER_H +#define INCLUDED_GSM_DUMMY_BURST_FILTER_H + +#include <grgsm/api.h> +#include <gnuradio/block.h> + +namespace gr { + namespace gsm { + + /*! + * \brief <+description of block+> + * \ingroup gsm + * + */ + class GSM_API dummy_burst_filter : virtual public gr::block + { + public: + typedef boost::shared_ptr<dummy_burst_filter> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of grgsm::dummy_burst_filter. + * + * To avoid accidental use of raw pointers, grgsm::dummy_burst_filter's + * constructor is in a private implementation + * class. grgsm::dummy_burst_filter::make is the public interface for + * creating new instances. + */ + static sptr make(); + }; + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_DUMMY_BURST_FILTER_H */ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 83948b7..10e2e4b 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -48,6 +48,7 @@ list(APPEND grgsm_sources decoding/ViterbiR204.cpp flow_control/burst_timeslot_splitter_impl.cc flow_control/burst_fnr_filter_impl.cc + flow_control/dummy_burst_filter_impl.cc misc_utils/controlled_rotator_cc_impl.cc misc_utils/controlled_const_source_f_impl.cc misc_utils/message_printer_impl.cc diff --git a/lib/flow_control/dummy_burst_filter_impl.cc b/lib/flow_control/dummy_burst_filter_impl.cc new file mode 100644 index 0000000..33c24cb --- /dev/null +++ b/lib/flow_control/dummy_burst_filter_impl.cc @@ -0,0 +1,105 @@ +/* -*- c++ -*- */ +/* @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm 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. + * + * Gr-gsm 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 gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <gnuradio/io_signature.h> +#include "dummy_burst_filter_impl.h" +#include <stdio.h> +#include <grgsm/endian.h> +#include <grgsm/gsmtap.h> + + +namespace gr { + namespace gsm { + + // dummy burst defined in gsm 05.02, section 5.2.6 + const int8_t dummy_burst_filter_impl::d_dummy_burst[] = {0,0,0, + 1,1,1,1,1,0,1,1,0,1,1,1,0,1,1,0, + 0,0,0,0,1,0,1,0,0,1,0,0,1,1,1,0, + 0,0,0,0,1,0,0,1,0,0,0,1,0,0,0,0, + 0,0,0,1,1,1,1,1,0,0,0,1,1,1,0,0, + 0,1,0,1,1,1,0,0,0,1,0,1,1,1,0,0, + 0,1,0,1,0,1,1,1,0,1,0,0,1,0,1,0, + 0,0,1,1,0,0,1,1,0,0,1,1,1,0,0,1, + 1,1,1,0,1,0,0,1,1,1,1,1,0,0,0,1, + 0,0,1,0,1,1,1,1,1,0,1,0,1,0, + 0,0,0 }; + + dummy_burst_filter::sptr + dummy_burst_filter::make() + { + return gnuradio::get_initial_sptr + (new dummy_burst_filter_impl()); + } + + /* + * The private constructor + */ + dummy_burst_filter_impl::dummy_burst_filter_impl() + : gr::block("dummy_burst_filter", + gr::io_signature::make(0, 0, 0), + gr::io_signature::make(0, 0, 0)) + { + message_port_register_in(pmt::mp("in")); + message_port_register_out(pmt::mp("out")); + + set_msg_handler(pmt::mp("in"), boost::bind(&dummy_burst_filter_impl::process_burst, this, _1)); + } + + /* + * Our virtual destructor. + */ + dummy_burst_filter_impl::~dummy_burst_filter_impl() {} + + void dummy_burst_filter_impl::process_burst(pmt::pmt_t msg) + { + pmt::pmt_t header_plus_burst = pmt::cdr(msg); + int8_t * burst = (int8_t *)(pmt::blob_data(header_plus_burst)) + sizeof(gsmtap_hdr); + size_t burst_len = pmt::blob_length(header_plus_burst) - sizeof(gsmtap_hdr); + + if (!is_dummy_burst(burst, burst_len)) + { + message_port_pub(pmt::mp("out"), msg); + } + } + + bool dummy_burst_filter_impl::is_dummy_burst(int8_t *burst, size_t burst_len) + { + if (burst_len != DUMMY_BURST_LEN) + { + return false; + } + for (int i=0; i<DUMMY_BURST_LEN; i++) + { + if (burst[i] != d_dummy_burst[i]) + { + return false; + } + } + return true; + } + + } /* namespace gsm */ +} /* namespace gr */ diff --git a/lib/flow_control/dummy_burst_filter_impl.h b/lib/flow_control/dummy_burst_filter_impl.h new file mode 100644 index 0000000..ce9c741 --- /dev/null +++ b/lib/flow_control/dummy_burst_filter_impl.h @@ -0,0 +1,48 @@ +/* -*- c++ -*- */ +/* @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm 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. + * + * Gr-gsm 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 gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef INCLUDED_GSM_DUMMY_BURST_FILTER_IMPL_H +#define INCLUDED_GSM_DUMMY_BURST_FILTER_IMPL_H + +#define DUMMY_BURST_LEN 148 + +#include <grgsm/flow_control/dummy_burst_filter.h> + +namespace gr { + namespace gsm { + + class dummy_burst_filter_impl : public dummy_burst_filter + { + private: + bool is_dummy_burst(int8_t *burst, size_t burst_len); + static const int8_t d_dummy_burst[]; + public: + dummy_burst_filter_impl(); + ~dummy_burst_filter_impl(); + void process_burst(pmt::pmt_t msg); + }; + + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_DUMMY_BURST_FILTER_IMPL_H */ + diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 0bd5042..8ff87e0 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -49,3 +49,4 @@ set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig) GR_ADD_TEST(qa_decryption ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_decryption.py) GR_ADD_TEST(qa_burst_timeslot_splitter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_timeslot_splitter.py) GR_ADD_TEST(qa_burst_fnr_filter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_fnr_filter.py) +GR_ADD_TEST(qa_dummy_burst_filter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_dummy_burst_filter.py) diff --git a/python/qa_dummy_burst_filter.py b/python/qa_dummy_burst_filter.py new file mode 100755 index 0000000..3988ce8 --- /dev/null +++ b/python/qa_dummy_burst_filter.py @@ -0,0 +1,102 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# @file +# @author Roman Khassraf <rkhassraf@gmail.com> +# @section LICENSE +# +# Gr-gsm 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. +# +# Gr-gsm 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 gr-gsm; 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, gr_unittest, blocks +import grgsm + +class qa_dummy_burst_filter (gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block () + + def tearDown (self): + self.tb = None + + def test_001 (self): + """ + filter mode less_or_equal, limiting frame number 1500123 + 24 bursts as input, 10 of them dummy bursts + """ + framenumbers_input = [1259192, 1076346, 1076242, 235879, 1259218, 2194302, 2714322, 1588, 1259244, 1563637, 1435624, 1928543, 503726, 1571144, 2658397, 1807445, 869789, 624070, 2005511, 1306953, 2284894, 1600339, 551375, 1259270] + timeslots_input = [6, 3, 4, 3, 5, 3, 2, 7, 1, 6, 0, 7, 2, 3, 2, 0, 7, 1, 0, 6, 0, 6, 5, 7] + bursts_input = [ + "0001100001000111100111101111100101000100101011000010011110011101001111101100010100111111100000110100011111101011101100100111110011000100010001010000", + "0001000101000000001001111110000110010110110111110111101000001101001111101100010100111111001110001001110101110001010001000111011010010001011011000000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0000010010100000001001101010100001011100010001101100111111101101001111101100010100111111101101001110100010101110010110101111100010010000110010110000", + "0000010101010110010011110101010101101100000000001000100100101010000111011101001000011101011101110000101011001111000100001000000000001110010001111000", + "0001000000000010111010100000010101000010001010111010000000011010000111011101001000011101000000100010111110101000000001000000000010111010100000000000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0000000000111110101010100001000000100010101110101010000101001010000111011101001000011101001010001111101010001000010000000000101110101010100000010000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0001000100000011001010111001111100011010000000000000001001001010000111011101001000011101010110000101111010011001110110001001011010101000011110110000", + "0001100001000111111111100001011000000011010110111010110000111010000111011101001000011101100010111100100101110001101000110100110000001010101110011000", + "0000000100111011000000000010100100001100101010000000010010101010000111011101001000011101000110110001110110000100110100110110011001100100000101100000", + "0000100101111010011110111010100111010100011011011101100111001010000111011101001000011101010000111010000110100000001000010011101011001001110100011000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0000110101000011011010110000110011010000000001001010110010001010000111011101001000011101010000011000111001101110000000110010100001101110101000100000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0001100010000001000111011100101101101010100001111101001000101010000111011101001000011101111010000011010110010111011111010010001000001101100011111000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0000001000100011000000000000110100000000010000001010100100001010000111011101001000011101000010010000000000001001000001011000000001010000000100010000", + "0000100000110001000000000100000110001011100001001000000000001010000111011101001000011101001010010001010000000111010000000011000001000000000101010000", + ] + + bursts_expected = [ + "0001100001000111100111101111100101000100101011000010011110011101001111101100010100111111100000110100011111101011101100100111110011000100010001010000", + "0001000101000000001001111110000110010110110111110111101000001101001111101100010100111111001110001001110101110001010001000111011010010001011011000000", + "0000010010100000001001101010100001011100010001101100111111101101001111101100010100111111101101001110100010101110010110101111100010010000110010110000", + "0000010101010110010011110101010101101100000000001000100100101010000111011101001000011101011101110000101011001111000100001000000000001110010001111000", + "0001000000000010111010100000010101000010001010111010000000011010000111011101001000011101000000100010111110101000000001000000000010111010100000000000", + "0000000000111110101010100001000000100010101110101010000101001010000111011101001000011101001010001111101010001000010000000000101110101010100000010000", + "0001000100000011001010111001111100011010000000000000001001001010000111011101001000011101010110000101111010011001110110001001011010101000011110110000", + "0001100001000111111111100001011000000011010110111010110000111010000111011101001000011101100010111100100101110001101000110100110000001010101110011000", + "0000000100111011000000000010100100001100101010000000010010101010000111011101001000011101000110110001110110000100110100110110011001100100000101100000", + "0000100101111010011110111010100111010100011011011101100111001010000111011101001000011101010000111010000110100000001000010011101011001001110100011000", + "0000110101000011011010110000110011010000000001001010110010001010000111011101001000011101010000011000111001101110000000110010100001101110101000100000", + "0001100010000001000111011100101101101010100001111101001000101010000111011101001000011101111010000011010110010111011111010010001000001101100011111000", + "0000001000100011000000000000110100000000010000001010100100001010000111011101001000011101000010010000000000001001000001011000000001010000000100010000", + "0000100000110001000000000100000110001011100001001000000000001010000111011101001000011101001010010001010000000111010000000011000001000000000101010000" + ] + + dummy_burst_filter = grgsm.dummy_burst_filter() + + src = grgsm.burst_source_qa(framenumbers_input, timeslots_input, bursts_input) + sink = grgsm.burst_sink_qa() + + self.tb.msg_connect(src, "out", dummy_burst_filter, "in") + self.tb.msg_connect(dummy_burst_filter, "out", sink, "in") + + self.tb.run() + + bursts_result = list(sink.get_burst_data()) + + self.assertEqual(bursts_expected, bursts_result) + + +if __name__ == '__main__': + gr_unittest.run(qa_dummy_burst_filter, "qa_dummy_burst_filter.xml") diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i index eacabb6..ba53b78 100644 --- a/swig/grgsm_swig.i +++ b/swig/grgsm_swig.i @@ -18,6 +18,7 @@ #include "grgsm/demapping/tch_f_chans_demapper.h" #include "grgsm/flow_control/burst_timeslot_splitter.h" #include "grgsm/flow_control/burst_fnr_filter.h" +#include "grgsm/flow_control/dummy_burst_filter.h" #include "grgsm/misc_utils/bursts_printer.h" #include "grgsm/misc_utils/controlled_const_source_f.h" #include "grgsm/misc_utils/controlled_rotator_cc.h" @@ -55,6 +56,8 @@ GR_SWIG_BLOCK_MAGIC2(gsm, tch_f_chans_demapper); GR_SWIG_BLOCK_MAGIC2(gsm, burst_timeslot_splitter); %include "grgsm/flow_control/burst_fnr_filter.h" GR_SWIG_BLOCK_MAGIC2(gsm, burst_fnr_filter); +%include "grgsm/flow_control/dummy_burst_filter.h" +GR_SWIG_BLOCK_MAGIC2(gsm, dummy_burst_filter); %include "grgsm/misc_utils/bursts_printer.h" GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer); |