Merge branch 'fixeria/trx' of https://github.com/axilirator/gr-gsm into fixeria_trx

# Resolved conflicts:
#	apps/grgsm_trx
#	python/trx/radio_if.py
#	swig/grgsm_swig.i

2 files changed, 58 insertions, 0 deletions

diff --git a/include/grgsm/misc_utils/CMakeLists.txt b/include/grgsm/misc_utils/CMakeLists.txt
index 0ec706c..23fe980 100644
--- a/include/grgsm/misc_utils/CMakeLists.txt
+++ b/include/grgsm/misc_utils/CMakeLists.txt
@@ -36,6 +36,7 @@ install(FILES
     tmsi_dumper.h
     msg_to_tag.h
     trx_burst_if.h
+    burst_to_fn_time.h
     controlled_fractional_resampler_cc.h 
     time_spec.h
     fn_time.h DESTINATION include/grgsm/misc_utils
diff --git a/include/grgsm/misc_utils/burst_to_fn_time.h b/include/grgsm/misc_utils/burst_to_fn_time.h
new file mode 100644
index 0000000..870bd83
--- /dev/null
+++ b/include/grgsm/misc_utils/burst_to_fn_time.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/* @file
+ * @author Piotr Krysik <ptrkrysik@gmail.com>
+ * @author Vadim Yanitskiy <axilirator@gmail.com>
+ * @section LICENSE
+ *
+ * Gr-gsm 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.
+ *
+ * Gr-gsm 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 gr-gsm; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef INCLUDED_GRGSM_BURST_TO_FN_TIME_H
+#define INCLUDED_GRGSM_BURST_TO_FN_TIME_H
+
+#include <grgsm/api.h>
+#include <gnuradio/block.h>
+
+namespace gr {
+  namespace gsm {
+
+    /*!
+     * \brief <+description of block+>
+     * \ingroup gsm
+     *
+     */
+    class GRGSM_API burst_to_fn_time : virtual public gr::block
+    {
+     public:
+      typedef boost::shared_ptr<burst_to_fn_time> sptr;
+
+      /*!
+       * \brief Return a shared_ptr to a new instance of grgsm::burst_to_fn_time.
+       *
+       * To avoid accidental use of raw pointers, grgsm::burst_to_fn_time's
+       * constructor is in a private implementation
+       * class. grgsm::burst_to_fn_time::make is the public interface for
+       * creating new instances.
+       */
+      static sptr make();
+    };
+
+  } // namespace gsm
+} // namespace gr
+
+#endif /* INCLUDED_GRGSM_BURST_TO_FN_TIME_H */