Moving trx burst interface to trx directory
and to new 'Transceiver' cathegory in gnuradio-companion
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index c3646a2..ae06065 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -24,6 +24,7 @@
add_subdirectory(flow_control)
add_subdirectory(misc_utils)
add_subdirectory(transmitter)
+add_subdirectory(trx)
install(FILES
gsm_block_tree.xml DESTINATION share/gnuradio/grc/blocks
)
diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml
index 7415bf0..2e502d0 100644
--- a/grc/gsm_block_tree.xml
+++ b/grc/gsm_block_tree.xml
@@ -30,6 +30,10 @@
<block>gsm_gen_test_ab</block>
</cat>
<cat>
+ <name>Transceiver</name>
+ <block>gsm_trx_burst_if</block>
+ </cat>
+ <cat>
<name>Logical channels demapping</name>
<block>gsm_universal_ctrl_chans_demapper</block>
<block>gsm_bcch_ccch_demapper</block>
@@ -75,7 +79,6 @@
<block>gsm_clock_offset_corrector_tagged</block>
<block>gsm_msg_to_tag</block>
<block>gsm_tmsi_dumper</block>
- <block>gsm_trx_burst_if</block>
<block>gsm_burst_to_fn_time</block>
</cat>
</cat>
diff --git a/grc/misc_utils/CMakeLists.txt b/grc/misc_utils/CMakeLists.txt
index 78f66c9..bad53e6 100644
--- a/grc/misc_utils/CMakeLists.txt
+++ b/grc/misc_utils/CMakeLists.txt
@@ -32,7 +32,6 @@
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
gsm_burst_to_fn_time.xml
diff --git a/grc/trx/CMakeLists.txt b/grc/trx/CMakeLists.txt
new file mode 100644
index 0000000..ac4ae13
--- /dev/null
+++ b/grc/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.
+
+install(FILES
+ gsm_trx_burst_if.xml
+ DESTINATION share/gnuradio/grc/blocks
+)
diff --git a/grc/misc_utils/gsm_trx_burst_if.xml b/grc/trx/gsm_trx_burst_if.xml
similarity index 100%
rename from grc/misc_utils/gsm_trx_burst_if.xml
rename to grc/trx/gsm_trx_burst_if.xml
diff --git a/include/grgsm/CMakeLists.txt b/include/grgsm/CMakeLists.txt
index 2f76929..2982ef1 100644
--- a/include/grgsm/CMakeLists.txt
+++ b/include/grgsm/CMakeLists.txt
@@ -37,3 +37,4 @@
add_subdirectory(qa_utils)
add_subdirectory(flow_control)
add_subdirectory(transmitter)
+add_subdirectory(trx)
diff --git a/include/grgsm/misc_utils/CMakeLists.txt b/include/grgsm/misc_utils/CMakeLists.txt
index 23fe980..f8d8cbc 100644
--- a/include/grgsm/misc_utils/CMakeLists.txt
+++ b/include/grgsm/misc_utils/CMakeLists.txt
@@ -35,7 +35,6 @@
message_printer.h
tmsi_dumper.h
msg_to_tag.h
- trx_burst_if.h
burst_to_fn_time.h
controlled_fractional_resampler_cc.h
time_spec.h
diff --git a/lib/misc_utils/udp_socket.h b/include/grgsm/misc_utils/udp_socket.h
similarity index 100%
rename from lib/misc_utils/udp_socket.h
rename to include/grgsm/misc_utils/udp_socket.h
diff --git a/include/grgsm/trx/CMakeLists.txt b/include/grgsm/trx/CMakeLists.txt
new file mode 100644
index 0000000..a9847dd
--- /dev/null
+++ b/include/grgsm/trx/CMakeLists.txt
@@ -0,0 +1,26 @@
+# 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 public header files
+########################################################################
+install(FILES
+ trx_burst_if.h
+ DESTINATION include/grgsm/trx
+)
diff --git a/include/grgsm/misc_utils/trx_burst_if.h b/include/grgsm/trx/trx_burst_if.h
similarity index 100%
rename from include/grgsm/misc_utils/trx_burst_if.h
rename to include/grgsm/trx/trx_burst_if.h
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(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 @@
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/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
similarity index 98%
rename from lib/misc_utils/trx_burst_if_impl.cc
rename to 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
similarity index 100%
rename from lib/misc_utils/trx_burst_if_impl.h
rename to lib/trx/trx_burst_if_impl.h