diff options
author | Piotr Krysik <ptrkrysik@gmail.com> | 2018-05-05 12:38:11 +0200 |
---|---|---|
committer | Piotr Krysik <pkrysik@elka.pw.edu.pl> | 2018-05-05 12:38:11 +0200 |
commit | 993055342d9076da075ee7962113165228c560f3 (patch) | |
tree | 4d621fc39ecd8b3c1f92ae829ec632a85ce1804b /lib | |
parent | 3c1452f94f238b8d124a3bc7b3242e5b616dad21 (diff) |
Moving trx burst interface to trx directory
and to new 'Transceiver' cathegory in gnuradio-companion
Diffstat (limited to 'lib')
-rw-r--r-- | lib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/misc_utils/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/misc_utils/udp_socket.cc | 2 | ||||
-rw-r--r-- | lib/misc_utils/udp_socket.h | 69 | ||||
-rw-r--r-- | lib/trx/CMakeLists.txt | 23 | ||||
-rw-r--r-- | lib/trx/trx_burst_if_impl.cc (renamed from lib/misc_utils/trx_burst_if_impl.cc) | 2 | ||||
-rw-r--r-- | lib/trx/trx_burst_if_impl.h (renamed from lib/misc_utils/trx_burst_if_impl.h) | 0 |
7 files changed, 26 insertions, 72 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 923de48..518edc4 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -71,6 +71,7 @@ add_subdirectory(misc_utils) add_subdirectory(qa_utils) add_subdirectory(receiver) add_subdirectory(transmitter) +add_subdirectory(trx) ######################################################################## # Setup library diff --git a/lib/misc_utils/CMakeLists.txt b/lib/misc_utils/CMakeLists.txt index c81a92d..63effe5 100644 --- a/lib/misc_utils/CMakeLists.txt +++ b/lib/misc_utils/CMakeLists.txt @@ -36,7 +36,6 @@ add_sources( time_spec.cc fn_time.cc udp_socket.cc - trx_burst_if_impl.cc burst_to_fn_time_impl.cc ) diff --git a/lib/misc_utils/udp_socket.cc b/lib/misc_utils/udp_socket.cc index 5c689c7..73393a0 100644 --- a/lib/misc_utils/udp_socket.cc +++ b/lib/misc_utils/udp_socket.cc @@ -30,7 +30,7 @@ #include <pmt/pmt.h> #include <boost/lexical_cast.hpp> -#include "udp_socket.h" +#include "grgsm/misc_utils/udp_socket.h" using boost::asio::ip::udp; diff --git a/lib/misc_utils/udp_socket.h b/lib/misc_utils/udp_socket.h deleted file mode 100644 index 15b2c66..0000000 --- a/lib/misc_utils/udp_socket.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2013 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * GNU Radio 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. - * - * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef INCLUDED_GRGSM_TRX_UDP_SOCKET_H -#define INCLUDED_GRGSM_TRX_UDP_SOCKET_H - -#include <gnuradio/thread/thread.h> - -#include <boost/function.hpp> -#include <boost/array.hpp> -#include <boost/asio.hpp> -#include <boost/bind.hpp> -#include <pmt/pmt.h> - -namespace gr { - namespace gsm { - - class udp_socket - { - private: - boost::asio::io_service d_io_service; - std::vector<char> d_rxbuf; - gr::thread::thread d_thread; - bool d_started; - bool d_finished; - - boost::asio::ip::udp::endpoint d_udp_endpoint_rx; - boost::asio::ip::udp::endpoint d_udp_endpoint_tx; - boost::shared_ptr<boost::asio::ip::udp::socket> d_udp_socket; - - void handle_udp_read(const boost::system::error_code& error, - size_t bytes_transferred); - void run_io_service(void); - - public: - udp_socket( - const std::string &remote_addr, - const std::string &src_port, - const std::string &dst_port, - size_t mtu); - ~udp_socket(); - - void udp_send(uint8_t *data, size_t len); - boost::function<void (uint8_t *, size_t)> udp_rx_handler; - }; - - } /* namespace gsm */ -} /* namespace gr */ - -#endif /* INCLUDED_GRGSM_TRX_UDP_SOCKET_H */ diff --git a/lib/trx/CMakeLists.txt b/lib/trx/CMakeLists.txt new file mode 100644 index 0000000..32694b2 --- /dev/null +++ b/lib/trx/CMakeLists.txt @@ -0,0 +1,23 @@ +# Copyright 2011,2012 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio 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. +# +# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +add_sources( + trx_burst_if_impl.cc +) + diff --git a/lib/misc_utils/trx_burst_if_impl.cc b/lib/trx/trx_burst_if_impl.cc index 8f458b0..e3fcc89 100644 --- a/lib/misc_utils/trx_burst_if_impl.cc +++ b/lib/trx/trx_burst_if_impl.cc @@ -27,7 +27,7 @@ #include <gnuradio/io_signature.h> #include <boost/lexical_cast.hpp> -#include "udp_socket.h" +#include "grgsm/misc_utils/udp_socket.h" #include "trx_burst_if_impl.h" #define BURST_SIZE 148 diff --git a/lib/misc_utils/trx_burst_if_impl.h b/lib/trx/trx_burst_if_impl.h index 35f939c..35f939c 100644 --- a/lib/misc_utils/trx_burst_if_impl.h +++ b/lib/trx/trx_burst_if_impl.h |