diff options
author | piotr <Piotr Krysik pkrysik@elka.pw.edu.pl> | 2014-08-06 14:14:15 +0200 |
---|---|---|
committer | piotr <Piotr Krysik pkrysik@elka.pw.edu.pl> | 2014-08-06 14:14:15 +0200 |
commit | ab663c884480cc9030a5716d1389dc8b525afe82 (patch) | |
tree | 6c58982756b15de1b98cf7b45842f4df233b6679 /lib/misc_utils | |
parent | 510deeb455464000c4eaf577783790bcaffb7b67 (diff) |
Added new block for message printing, removed legacy code from the decoder and bursts printer
Diffstat (limited to 'lib/misc_utils')
-rw-r--r-- | lib/misc_utils/bursts_printer_impl.cc | 2 | ||||
-rw-r--r-- | lib/misc_utils/message_printer_impl.cc | 75 | ||||
-rw-r--r-- | lib/misc_utils/message_printer_impl.h | 42 |
3 files changed, 117 insertions, 2 deletions
diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc index deedf02..3e7d843 100644 --- a/lib/misc_utils/bursts_printer_impl.cc +++ b/lib/misc_utils/bursts_printer_impl.cc @@ -36,8 +36,6 @@ namespace gr { boost::mutex printer_mutex; void bursts_printer_impl::bursts_print(pmt::pmt_t msg) { - boost::mutex::scoped_lock lock(printer_mutex); - pmt::pmt_t burst = pmt::cdr(msg); int8_t * burst_elements = (int8_t *)pmt::blob_data(burst); size_t burst_len=pmt::blob_length(burst); diff --git a/lib/misc_utils/message_printer_impl.cc b/lib/misc_utils/message_printer_impl.cc new file mode 100644 index 0000000..36bd964 --- /dev/null +++ b/lib/misc_utils/message_printer_impl.cc @@ -0,0 +1,75 @@ +/* -*- c++ -*- */ +/* + * Copyright 2014 <+YOU OR YOUR COMPANY+>. + * + * This 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. + * + * This software 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 software; 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 "message_printer_impl.h" + +namespace gr { + namespace gsm { + + void message_printer_impl::message_print(pmt::pmt_t msg) + { + pmt::pmt_t message = pmt::cdr(msg); + uint8_t * message_elements = (uint8_t *)pmt::blob_data(message); + size_t message_len=pmt::blob_length(message); + +// pmt::pmt_t header_blob = pmt::car(msg); +// gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_blob); + + for(int ii=0; ii<message_len; ii++) + { + printf(" %02x", message_elements[ii]); + } + std::cout << std::endl; + } + + message_printer::sptr + message_printer::make() + { + return gnuradio::get_initial_sptr + (new message_printer_impl()); + } + + /* + * The private constructor + */ + message_printer_impl::message_printer_impl() + : gr::block("message_printer", + gr::io_signature::make(0, 0, 0), + gr::io_signature::make(0, 0, 0)) + { + message_port_register_in(pmt::mp("msgs")); + set_msg_handler(pmt::mp("msgs"), boost::bind(&message_printer_impl::message_print, this, _1)); + + } + + /* + * Our virtual destructor. + */ + message_printer_impl::~message_printer_impl() + { + } + } /* namespace gsm */ +} /* namespace gr */ + diff --git a/lib/misc_utils/message_printer_impl.h b/lib/misc_utils/message_printer_impl.h new file mode 100644 index 0000000..625a1e6 --- /dev/null +++ b/lib/misc_utils/message_printer_impl.h @@ -0,0 +1,42 @@ +/* -*- c++ -*- */ +/* + * Copyright 2014 <+YOU OR YOUR COMPANY+>. + * + * This 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. + * + * This software 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 software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H +#define INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H + +#include <gsm/message_printer.h> + +namespace gr { + namespace gsm { + + class message_printer_impl : public message_printer + { + private: + void message_print(pmt::pmt_t msg); + public: + message_printer_impl(); + ~message_printer_impl(); + }; + + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H */ + |