diff options
author | Vadim Yanitskiy <axilirator@gmail.com> | 2017-10-17 08:24:25 +0700 |
---|---|---|
committer | Piotr Krysik <ptrkrysik@users.noreply.github.com> | 2017-11-05 17:33:26 +0100 |
commit | e601c366bd179f908d4f34da9fe535c2606cac32 (patch) | |
tree | 6ac7846752a17c375abda18bb97e08166c784522 /grc | |
parent | ba7ad29638ecb08af8c7a38dc98c8da715a5fcde (diff) |
Refactor the 'TRX Burst Interface' block
The following changes were made:
- Both implementation and headers were merged with misc_utils
- Fixed namespace mess: was gr::grgsm, became gr::gsm
- More accurate class name was chosen: "trx_burst_if"
Diffstat (limited to 'grc')
-rw-r--r-- | grc/CMakeLists.txt | 1 | ||||
-rw-r--r-- | grc/misc_utils/CMakeLists.txt | 1 | ||||
-rw-r--r-- | grc/misc_utils/gsm_trx_burst_if.xml (renamed from grc/trx_interface/gsm_trx.xml) | 6 | ||||
-rw-r--r-- | grc/trx_interface/CMakeLists.txt | 22 |
4 files changed, 4 insertions, 26 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 26a91d5..c3646a2 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -23,7 +23,6 @@ add_subdirectory(demapping) add_subdirectory(receiver) add_subdirectory(flow_control) add_subdirectory(misc_utils) -add_subdirectory(trx_interface) add_subdirectory(transmitter) install(FILES gsm_block_tree.xml DESTINATION share/gnuradio/grc/blocks diff --git a/grc/misc_utils/CMakeLists.txt b/grc/misc_utils/CMakeLists.txt index adb90d3..9407caf 100644 --- a/grc/misc_utils/CMakeLists.txt +++ b/grc/misc_utils/CMakeLists.txt @@ -31,6 +31,7 @@ install(FILES gsm_burst_file_source.xml gsm_message_file_sink.xml gsm_message_file_source.xml + gsm_trx_burst_if.xml gsm_msg_to_tag.xml gsm_controlled_fractional_resampler_cc.xml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/trx_interface/gsm_trx.xml b/grc/misc_utils/gsm_trx_burst_if.xml index cbe268c..d3dab5c 100644 --- a/grc/trx_interface/gsm_trx.xml +++ b/grc/misc_utils/gsm_trx_burst_if.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <block> - <name>TRX Interface</name> - <key>grgsm_trx_interface</key> + <name>TRX Burst Interface</name> + <key>grgsm_trx_burst_if</key> <import>import grgsm</import> - <make>grgsm.trx($remote_addr, $base_port)</make> + <make>grgsm.trx_burst_if($remote_addr, $base_port)</make> <param> <name>base_port</name> diff --git a/grc/trx_interface/CMakeLists.txt b/grc/trx_interface/CMakeLists.txt deleted file mode 100644 index 752b7a7..0000000 --- a/grc/trx_interface/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -install(FILES - gsm_trx.xml DESTINATION share/gnuradio/grc/blocks -) |