Changed fn_time to use time_spec_t copied from libUHD
diff --git a/include/grgsm/misc_utils/CMakeLists.txt b/include/grgsm/misc_utils/CMakeLists.txt
index 5bfef6a..978695e 100644
--- a/include/grgsm/misc_utils/CMakeLists.txt
+++ b/include/grgsm/misc_utils/CMakeLists.txt
@@ -35,5 +35,6 @@
tmsi_dumper.h
msg_to_tag.h
controlled_fractional_resampler_cc.h
+ time_spec.h
fn_time.h DESTINATION include/grgsm/misc_utils
)
diff --git a/include/grgsm/misc_utils/fn_time.h b/include/grgsm/misc_utils/fn_time.h
index 240506a..560ee4a 100644
--- a/include/grgsm/misc_utils/fn_time.h
+++ b/include/grgsm/misc_utils/fn_time.h
@@ -25,7 +25,7 @@
#define INCLUDED_GRGSM_FN_TIME_H
#include <stdint.h>
-#include <uhd/types/time_spec.hpp>
+#include <grgsm/misc_utils/time_spec.h>
namespace gr {
namespace gsm {
@@ -41,8 +41,8 @@
* frame numbers
* @return difference between fn_ref and fn
*/
- uhd::time_spec_t fn_time_delta(uint32_t fn_ref, uhd::time_spec_t time_ref, uint32_t fn_x,
- uhd::time_spec_t time_hint, uint32_t ts_num, uint32_t ts_ref);
+ time_spec_t fn_time_delta2(uint32_t fn_ref, time_spec_t time_ref, uint32_t fn_x,
+ time_spec_t time_hint, uint32_t ts_num, uint32_t ts_ref);
} // namespace grgsm
} // namespace gr
diff --git a/lib/receiver/time_spec.h b/include/grgsm/misc_utils/time_spec.h
similarity index 100%
rename from lib/receiver/time_spec.h
rename to include/grgsm/misc_utils/time_spec.h
diff --git a/lib/misc_utils/CMakeLists.txt b/lib/misc_utils/CMakeLists.txt
index 8597553..81f2ca8 100644
--- a/lib/misc_utils/CMakeLists.txt
+++ b/lib/misc_utils/CMakeLists.txt
@@ -32,6 +32,7 @@
message_printer_impl.cc
msg_to_tag_impl.cc
tmsi_dumper_impl.cc
+ time_spec.cc
fn_time.cc
)
diff --git a/lib/misc_utils/fn_time.cc b/lib/misc_utils/fn_time.cc
index 5248211..25c8e65 100644
--- a/lib/misc_utils/fn_time.cc
+++ b/lib/misc_utils/fn_time.cc
@@ -23,7 +23,6 @@
#include <grgsm/misc_utils/fn_time.h>
#include <math.h>
-#include <uhd/types/time_spec.hpp>
#define GSM_HYPER_FRAME 26 * 51 * 2048
#define GSM_SYM_RATE 13.0e6 / 48.0
@@ -33,7 +32,6 @@
namespace gr {
namespace gsm {
- using namespace uhd;
/**
* Computes difference between two frame numbers modulo
* GSM_HYPER_FRAME / 2. The result is correct if difference
@@ -79,7 +77,7 @@
* frame numbers
* @return difference between fn_ref and fn
*/
- time_spec_t fn_time_delta(uint32_t fn_ref, time_spec_t time_ref, uint32_t fn_x,
+ time_spec_t fn_time_delta2(uint32_t fn_ref, time_spec_t time_ref, uint32_t fn_x,
time_spec_t time_hint, uint32_t ts_num, uint32_t ts_ref)
{
time_spec_t time_diff_hint = time_hint - time_ref;
diff --git a/lib/receiver/time_spec.cc b/lib/misc_utils/time_spec.cc
similarity index 100%
rename from lib/receiver/time_spec.cc
rename to lib/misc_utils/time_spec.cc
diff --git a/lib/receiver/CMakeLists.txt b/lib/receiver/CMakeLists.txt
index 1c5fd53..123eba5 100644
--- a/lib/receiver/CMakeLists.txt
+++ b/lib/receiver/CMakeLists.txt
@@ -23,6 +23,5 @@
receiver_config.cc
receiver_impl.cc
viterbi_detector.cc
- time_spec.cc
time_sample_ref.cc
)
diff --git a/lib/receiver/time_sample_ref.h b/lib/receiver/time_sample_ref.h
index 1fecb81..793944d 100644
--- a/lib/receiver/time_sample_ref.h
+++ b/lib/receiver/time_sample_ref.h
@@ -24,7 +24,7 @@
#define INCLUDED_TIME_SAMPLE_REF_IMPL_H
#include <stdint.h>
-#include "time_spec.h"
+#include <grgsm/misc_utils/time_spec.h>
namespace gr {
namespace gsm {
diff --git a/python/misc_utils/CMakeLists.txt b/python/misc_utils/CMakeLists.txt
index 1accda9..ec732a4 100644
--- a/python/misc_utils/CMakeLists.txt
+++ b/python/misc_utils/CMakeLists.txt
@@ -22,5 +22,6 @@
arfcn.py
clock_offset_corrector_tagged.py
hier_block.py
- fn_time.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+ fn_time.py
+ DESTINATION ${GR_PYTHON_DIR}/grgsm
)
diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i
index 08d95f1..d5132dc 100644
--- a/swig/grgsm_swig.i
+++ b/swig/grgsm_swig.i
@@ -65,6 +65,7 @@
#include "grgsm/misc_utils/msg_to_tag.h"
#include "grgsm/misc_utils/controlled_fractional_resampler_cc.h"
#include "grgsm/trx_interface/trx.h"
+#include "grgsm/misc_utils/time_spec.h"
#include "grgsm/misc_utils/fn_time.h"
%}
@@ -147,4 +148,5 @@
GR_SWIG_BLOCK_MAGIC2(gsm, message_sink);
%include "grgsm/trx_interface/trx.h"
GR_SWIG_BLOCK_MAGIC2(grgsm, trx);
-%include "grgsm/misc_utils/fn_time.h"
+//%include "grgsm/misc_utils/time_spec.h"
+//%include "grgsm/misc_utils/fn_time.h"