From c00ce9c7b508301812b28a92bc39f4a34d02c924 Mon Sep 17 00:00:00 2001 From: piotr Date: Mon, 4 Aug 2014 11:21:24 +0200 Subject: Moved burst printer to different directory --- lib/CMakeLists.txt | 2 +- lib/burst_printer/bursts_printer_impl.cc | 92 -------------------------------- lib/burst_printer/bursts_printer_impl.h | 45 ---------------- lib/misc_utils/bursts_printer_impl.cc | 84 +++++++++++++++++++++++++++++ lib/misc_utils/bursts_printer_impl.h | 43 +++++++++++++++ 5 files changed, 128 insertions(+), 138 deletions(-) delete mode 100644 lib/burst_printer/bursts_printer_impl.cc delete mode 100644 lib/burst_printer/bursts_printer_impl.h create mode 100644 lib/misc_utils/bursts_printer_impl.cc create mode 100644 lib/misc_utils/bursts_printer_impl.h (limited to 'lib') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 79fa57a..8e707be 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -29,7 +29,7 @@ list(APPEND gsm_sources receiver/receiver_config.cc receiver/viterbi_detector.cc receiver/sch.c - burst_printer/bursts_printer_impl.cc + misc_utils/bursts_printer_impl.cc demapping/get_bcch_or_ccch_bursts_impl.cc decoding/control_channels_decoder_impl.cc decoding/cch.c diff --git a/lib/burst_printer/bursts_printer_impl.cc b/lib/burst_printer/bursts_printer_impl.cc deleted file mode 100644 index c37838b..0000000 --- a/lib/burst_printer/bursts_printer_impl.cc +++ /dev/null @@ -1,92 +0,0 @@ -/* -*- 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 -#include -#include -#include -#include "bursts_printer_impl.h" - -namespace gr { - namespace gsm { - void bursts_printer_impl::bursts_print(pmt::pmt_t msg) - { - 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); - - pmt::pmt_t header_blob = pmt::car(msg); - gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_blob); - d_c0_channels.insert(header->arfcn); - -// d_channels_dbm.insert(header->signal_dbm); -// std::copy( -// d_c0_channels.begin(), -// d_c0_channels.end(), -// std::ostream_iterator(std::cout, " ") -// ); -// std::cout << std::endl; -// std::copy( -// d_channels_dbm.begin(), -// d_channels_dbm.end(), -// std::ostream_iterator(std::cout, " ") -// ); - - for(int ii=0; ii(burst_elements[ii]) << ""; - } - std::cout << std::endl; - } - - bursts_printer::sptr - bursts_printer::make() - { - return gnuradio::get_initial_sptr - (new bursts_printer_impl()); - } - - /* - * The private constructor - */ - bursts_printer_impl::bursts_printer_impl() - : gr::block("bursts_printer", - gr::io_signature::make(0, 0, 0), - gr::io_signature::make(0, 0, 0)) - { - message_port_register_in(pmt::mp("bursts")); - set_msg_handler(pmt::mp("bursts"), boost::bind(&bursts_printer_impl::bursts_print, this, _1)); - } - - /* - * Our virtual destructor. - */ - bursts_printer_impl::~bursts_printer_impl() - { - } - - - } /* namespace gsm */ -} /* namespace gr */ - diff --git a/lib/burst_printer/bursts_printer_impl.h b/lib/burst_printer/bursts_printer_impl.h deleted file mode 100644 index 81e8be6..0000000 --- a/lib/burst_printer/bursts_printer_impl.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- 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_BURSTS_PRINTER_IMPL_H -#define INCLUDED_GSM_BURSTS_PRINTER_IMPL_H - -#include -#include - -namespace gr { - namespace gsm { - - class bursts_printer_impl : public bursts_printer - { - private: - void bursts_print(pmt::pmt_t burst); - std::set d_c0_channels; - - public: - bursts_printer_impl(); - ~bursts_printer_impl(); - }; - - } // namespace gsm -} // namespace gr - -#endif /* INCLUDED_GSM_BURSTS_PRINTER_IMPL_H */ - diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc new file mode 100644 index 0000000..deedf02 --- /dev/null +++ b/lib/misc_utils/bursts_printer_impl.cc @@ -0,0 +1,84 @@ +/* -*- 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 +#include +#include +#include +#include "bursts_printer_impl.h" +#include + +#include + +namespace gr { + namespace gsm { + 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); + + pmt::pmt_t header_blob = pmt::car(msg); + gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_blob); + + for(int ii=0; ii(burst_elements[ii]) << ""; + } + std::cout << std::endl; + } + + bursts_printer::sptr + bursts_printer::make() + { + return gnuradio::get_initial_sptr + (new bursts_printer_impl()); + } + + /* + * The private constructor + */ + bursts_printer_impl::bursts_printer_impl() + : gr::block("bursts_printer", + gr::io_signature::make(0, 0, 0), + gr::io_signature::make(0, 0, 0)) + { + message_port_register_in(pmt::mp("bursts")); + set_msg_handler(pmt::mp("bursts"), boost::bind(&bursts_printer_impl::bursts_print, this, _1)); + } + + /* + * Our virtual destructor. + */ + bursts_printer_impl::~bursts_printer_impl() + { + } + + + } /* namespace gsm */ +} /* namespace gr */ + diff --git a/lib/misc_utils/bursts_printer_impl.h b/lib/misc_utils/bursts_printer_impl.h new file mode 100644 index 0000000..1a6368a --- /dev/null +++ b/lib/misc_utils/bursts_printer_impl.h @@ -0,0 +1,43 @@ +/* -*- 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_BURSTS_PRINTER_IMPL_H +#define INCLUDED_GSM_BURSTS_PRINTER_IMPL_H + +#include +#include + +namespace gr { + namespace gsm { + + class bursts_printer_impl : public bursts_printer + { + private: + void bursts_print(pmt::pmt_t burst); + public: + bursts_printer_impl(); + ~bursts_printer_impl(); + }; + + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_BURSTS_PRINTER_IMPL_H */ + -- cgit v1.2.3