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

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/transmitter/txtime_setter_impl.cc b/lib/transmitter/txtime_setter_impl.cc
index 33bc994..3c07cc6 100644
--- a/lib/transmitter/txtime_setter_impl.cc
+++ b/lib/transmitter/txtime_setter_impl.cc
@@ -90,15 +90,14 @@ namespace gr {
     
     void txtime_setter_impl::process_fn_time_reference(pmt::pmt_t msg)
     {
-      pmt::pmt_t not_found = pmt::intern("not_found");
       pmt::pmt_t fn_time, time_hint;
 
       fn_time = pmt::dict_ref(msg,
-        pmt::intern("fn_time"), not_found);
+        pmt::intern("fn_time"), pmt::PMT_NIL);
       time_hint = pmt::dict_ref(msg,
-        pmt::intern("fn_time"), not_found);
+        pmt::intern("time_hint"), pmt::PMT_NIL);
 
-      if (fn_time != not_found) {
+      if (fn_time != pmt::PMT_NIL) {
         uint32_t fn_ref = static_cast<uint32_t>
           (pmt::to_uint64(pmt::car(pmt::car(fn_time))));
         uint32_t ts = static_cast<uint32_t>
@@ -109,7 +108,7 @@ namespace gr {
           pmt::cdr(pmt::cdr(fn_time)));
 
         set_fn_time_reference(fn_ref, ts, time_secs, time_fracs);
-      } else if (time_hint != not_found) {
+      } else if (time_hint != pmt::PMT_NIL) {
         set_time_hint(pmt::to_uint64(pmt::car(fn_time)),
           pmt::to_double(pmt::cdr(fn_time)));
       }