diff options
Diffstat (limited to 'include/grgsm/misc_utils')
-rw-r--r-- | include/grgsm/misc_utils/CMakeLists.txt | 8 | ||||
-rw-r--r-- | include/grgsm/misc_utils/burst_file_sink.h (renamed from include/grgsm/misc_utils/burst_sink.h) | 16 | ||||
-rw-r--r-- | include/grgsm/misc_utils/burst_file_source.h (renamed from include/grgsm/misc_utils/burst_source.h) | 16 | ||||
-rw-r--r-- | include/grgsm/misc_utils/burst_sink_qa.h | 60 | ||||
-rw-r--r-- | include/grgsm/misc_utils/burst_source_qa.h | 64 | ||||
-rw-r--r-- | include/grgsm/misc_utils/message_printer.h | 2 |
6 files changed, 20 insertions, 146 deletions
diff --git a/include/grgsm/misc_utils/CMakeLists.txt b/include/grgsm/misc_utils/CMakeLists.txt index 8b74fc7..527ae51 100644 --- a/include/grgsm/misc_utils/CMakeLists.txt +++ b/include/grgsm/misc_utils/CMakeLists.txt @@ -22,14 +22,12 @@ ######################################################################## install(FILES bursts_printer.h - burst_sink.h - burst_source.h - burst_sink_qa.h - burst_source_qa.h + burst_file_source.h + burst_file_sink.h extract_system_info.h extract_immediate_assignment.h controlled_rotator_cc.h controlled_const_source_f.h - message_printer.h + message_printer.h tmsi_dumper.h DESTINATION include/grgsm/misc_utils ) diff --git a/include/grgsm/misc_utils/burst_sink.h b/include/grgsm/misc_utils/burst_file_sink.h index 6903df9..7263baa 100644 --- a/include/grgsm/misc_utils/burst_sink.h +++ b/include/grgsm/misc_utils/burst_file_sink.h @@ -20,8 +20,8 @@ * */ -#ifndef INCLUDED_GSM_BURST_SINK_H -#define INCLUDED_GSM_BURST_SINK_H +#ifndef INCLUDED_GSM_BURST_FILE_SINK_H +#define INCLUDED_GSM_BURST_FILE_SINK_H #include <grgsm/api.h> #include <gnuradio/block.h> @@ -34,17 +34,17 @@ namespace gr { * \ingroup gsm * */ - class GSM_API burst_sink : virtual public gr::block + class GSM_API burst_file_sink : virtual public gr::block { public: - typedef boost::shared_ptr<burst_sink> sptr; + typedef boost::shared_ptr<burst_file_sink> sptr; /*! - * \brief Return a shared_ptr to a new instance of grgsm::burst_sink. + * \brief Return a shared_ptr to a new instance of grgsm::burst_file_sink. * - * To avoid accidental use of raw pointers, grgsm::burst_sink's + * To avoid accidental use of raw pointers, grgsm::burst_file_sink's * constructor is in a private implementation - * class. grgsm::burst_sink::make is the public interface for + * class. grgsm::burst_file_sink::make is the public interface for * creating new instances. */ static sptr make(const std::string &filename); @@ -52,5 +52,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GSM_BURST_SINK_H */ +#endif /* INCLUDED_GSM_BURST_FILE_SINK_H */ diff --git a/include/grgsm/misc_utils/burst_source.h b/include/grgsm/misc_utils/burst_file_source.h index bd8644f..e18ef44 100644 --- a/include/grgsm/misc_utils/burst_source.h +++ b/include/grgsm/misc_utils/burst_file_source.h @@ -20,8 +20,8 @@ * */ -#ifndef INCLUDED_GSM_BURST_SOURCE_H -#define INCLUDED_GSM_BURST_SOURCE_H +#ifndef INCLUDED_GSM_BURST_FILE_SOURCE_H +#define INCLUDED_GSM_BURST_FILE_SOURCE_H #include <grgsm/api.h> #include <gnuradio/block.h> @@ -34,17 +34,17 @@ namespace gr { * \ingroup gsm * */ - class GSM_API burst_source : virtual public gr::block + class GSM_API burst_file_source : virtual public gr::block { public: - typedef boost::shared_ptr<burst_source> sptr; + typedef boost::shared_ptr<burst_file_source> sptr; /*! - * \brief Return a shared_ptr to a new instance of grgsm::burst_source. + * \brief Return a shared_ptr to a new instance of grgsm::burst_file_source. * - * To avoid accidental use of raw pointers, grgsm::burst_source's + * To avoid accidental use of raw pointers, grgsm::burst_file_source's * constructor is in a private implementation - * class. grgsm::burst_source::make is the public interface for + * class. grgsm::burst_file_source::make is the public interface for * creating new instances. */ static sptr make(const std::string &filename); @@ -53,5 +53,5 @@ namespace gr { } // namespace gsm } // namespace gr -#endif /* INCLUDED_GSM_BURST_SOURCE_H */ +#endif /* INCLUDED_GSM_BURST_FILE_SOURCE_H */ diff --git a/include/grgsm/misc_utils/burst_sink_qa.h b/include/grgsm/misc_utils/burst_sink_qa.h deleted file mode 100644 index 3b5cac2..0000000 --- a/include/grgsm/misc_utils/burst_sink_qa.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- 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_BURST_SINK_QA_H -#define INCLUDED_GSM_BURST_SINK_QA_H - -#include <grgsm/api.h> -#include <gnuradio/block.h> - -namespace gr { - namespace gsm { - - /*! - * \brief <+description of block+> - * \ingroup gsm - * - */ - class GSM_API burst_sink_qa : virtual public gr::block - { - public: - typedef boost::shared_ptr<burst_sink_qa> sptr; - - /*! - * \brief Return a shared_ptr to a new instance of grgsm::burst_sink_qa. - * - * To avoid accidental use of raw pointers, grgsm::burst_sink_qa's - * constructor is in a private implementation - * class. grgsm::burst_sink_qa::make is the public interface for - * creating new instances. - */ - static sptr make(); - - virtual std::vector<int> get_framenumbers() = 0; - virtual std::vector<int> get_timeslots() = 0; - virtual std::vector<std::string> get_burst_data() = 0; - }; - } // namespace gsm -} // namespace gr - -#endif /* INCLUDED_GSM_BURST_SINK_QA_H */ - diff --git a/include/grgsm/misc_utils/burst_source_qa.h b/include/grgsm/misc_utils/burst_source_qa.h deleted file mode 100644 index c3c5713..0000000 --- a/include/grgsm/misc_utils/burst_source_qa.h +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- 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_BURST_SOURCE_QA_H -#define INCLUDED_GSM_BURST_SOURCE_QA_H - -#include <grgsm/api.h> -#include <gnuradio/block.h> - -namespace gr { - namespace gsm { - - /*! - * \brief <+description of block+> - * \ingroup gsm - * - */ - class GSM_API burst_source_qa : virtual public gr::block - { - public: - typedef boost::shared_ptr<burst_source_qa> sptr; - - /*! - * \brief Return a shared_ptr to a new instance of grgsm::burst_source_qa. - * - * To avoid accidental use of raw pointers, grgsm::burst_source_qa's - * constructor is in a private implementation - * class. grgsm::burst_source_qa::make is the public interface for - * creating new instances. - */ - static sptr make(const std::vector<int> &framenumbers, - const std::vector<int> ×lots, - const std::vector<std::string> &burst_data); - - virtual void set_framenumbers(const std::vector<int> &framenumbers) = 0; - virtual void set_timeslots(const std::vector<int> ×lots) = 0; - virtual void set_burst_data(const std::vector<std::string> &burst_data) = 0; - }; - - } // namespace gsm -} // namespace gr - -#endif /* INCLUDED_GSM_BURST_SOURCE_QA_H */ - - diff --git a/include/grgsm/misc_utils/message_printer.h b/include/grgsm/misc_utils/message_printer.h index 3914707..d40352f 100644 --- a/include/grgsm/misc_utils/message_printer.h +++ b/include/grgsm/misc_utils/message_printer.h @@ -48,7 +48,7 @@ namespace gr { * class. gsm::message_printer::make is the public interface for * creating new instances. */ - static sptr make(pmt::pmt_t prepend_string); + static sptr make(pmt::pmt_t prepend_string, bool print_gsmtap_header=false); }; } // namespace gsm |