Merge branch 'master' into collect-system-info

6 files changed, 155 insertions, 83 deletions

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 6e00442..680c41f 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -63,6 +63,7 @@ list(APPEND grgsm_sources
     misc_utils/bursts_printer_impl.cc
     misc_utils/extract_system_info_impl.cc
     misc_utils/extract_immediate_assignment_impl.cc
+    misc_utils/extract_cmc_impl.cc
     qa_utils/burst_sink_impl.cc
     qa_utils/burst_source_impl.cc
     qa_utils/message_source_impl.cc
diff --git a/lib/misc_utils/extract_cmc_impl.cc b/lib/misc_utils/extract_cmc_impl.cc
new file mode 100755
index 0000000..b367def
--- /dev/null
+++ b/lib/misc_utils/extract_cmc_impl.cc
@@ -0,0 +1,90 @@
+/* -*- c++ -*- */
+/*
+ * @file
+ * @author Roman Khassraf <rkhassraf@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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnuradio/io_signature.h>
+#include <grgsm/gsmtap.h>
+#include <unistd.h>
+#include <grgsm/endian.h>
+
+#include "extract_cmc_impl.h"
+
+namespace gr {
+  namespace gsm {
+    void extract_cmc_impl::process_messages(pmt::pmt_t msg)
+    {
+        pmt::pmt_t message_plus_header_blob = pmt::cdr(msg);
+        uint8_t * message_plus_header = (uint8_t *)pmt::blob_data(message_plus_header_blob);
+        gsmtap_hdr * header = (gsmtap_hdr *)message_plus_header;
+        uint8_t * msg_elements = (uint8_t *)(message_plus_header+sizeof(gsmtap_hdr));
+
+        if((msg_elements[3] & 0xF) == 0x6 && msg_elements[4] == 0x35)
+        {
+            
+            int frame_nr = be32toh(header->frame_number);
+            int a5_version = ((msg_elements[5] & 0xE) >> 1) + 1;
+
+            d_framenumbers.push_back(frame_nr);
+            d_a5_versions.push_back(a5_version);
+        }
+    }
+    
+    std::vector<int> extract_cmc_impl::get_framenumbers()
+    {
+        return d_framenumbers;
+    }
+    
+    std::vector<int> extract_cmc_impl::get_a5_versions()
+    {
+        return d_a5_versions;
+    }
+    
+    extract_cmc::sptr
+    extract_cmc::make()
+    {
+      return gnuradio::get_initial_sptr
+        (new extract_cmc_impl());
+    }
+
+    /*
+     * The private constructor
+     */
+    extract_cmc_impl::extract_cmc_impl()
+      : gr::block("extract_cmc",
+              gr::io_signature::make(0, 0, 0),
+              gr::io_signature::make(0, 0, 0))
+    {
+        message_port_register_in(pmt::mp("msgs"));
+        set_msg_handler(pmt::mp("msgs"), boost::bind(&extract_cmc_impl::process_messages, this, _1));
+    }
+    
+    /*
+     * Our virtual destructor.
+     */
+    extract_cmc_impl::~extract_cmc_impl()
+    {
+    }
+  } /* namespace gsm */
+} /* namespace gr */
diff --git a/lib/misc_utils/extract_cmc_impl.h b/lib/misc_utils/extract_cmc_impl.h
new file mode 100755
index 0000000..fe97f22
--- /dev/null
+++ b/lib/misc_utils/extract_cmc_impl.h
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * @file
+ * @author Roman Khassraf <rkhassraf@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_GSM_EXTRACT_CMC_IMPL_H
+#define INCLUDED_GSM_EXTRACT_CMC_IMPL_H
+
+#include <grgsm/misc_utils/extract_cmc.h>
+#include <vector>
+
+namespace gr {
+  namespace gsm {          
+    class extract_cmc_impl : public extract_cmc
+    {
+     private:
+      void process_messages(pmt::pmt_t msg);
+      std::vector<int> d_framenumbers;
+      std::vector<int> d_a5_versions;
+     public:
+      virtual std::vector<int> get_framenumbers();
+      virtual std::vector<int> get_a5_versions();
+      extract_cmc_impl();
+      ~extract_cmc_impl();
+    };
+  } // namespace gsm
+} // namespace gr
+#endif /* INCLUDED_GSM_EXTRACT_CMC_IMPL_H */
diff --git a/lib/misc_utils/extract_system_info_impl.cc b/lib/misc_utils/extract_system_info_impl.cc
index bb7fada..6f745a0 100644
--- a/lib/misc_utils/extract_system_info_impl.cc
+++ b/lib/misc_utils/extract_system_info_impl.cc
@@ -76,6 +76,12 @@ namespace gr {
             info.lac = (msg_elements[8]<<8)+msg_elements[9];             //take lac
             info.mcc =  ((msg_elements[5] & 0xF)  * 100) + (((msg_elements[5] & 0xF0) >> 4) * 10) + ((msg_elements[6] & 0xF)); // take mcc
             info.mnc = (msg_elements[7] & 0xF) * 10 + (msg_elements[7]>>4); //take mnc
+            if (((msg_elements[6] & 0xF0) >> 4) < 10) // we have a 3 digit mnc, see figure 10.5.3 of 3GPP TS 24.008
+            {
+                info.mnc *= 10;
+                info.mnc += (msg_elements[6] & 0xF0) >> 4;
+            }
+
             info.ccch_conf = (msg_elements[10] & 0x7); // ccch_conf
             
             boost::mutex::scoped_lock lock(extract_mutex);
@@ -92,6 +98,11 @@ namespace gr {
             info.lac = (msg_elements[6]<<8)+msg_elements[7];            //take lac
             info.mcc =  ((msg_elements[3] & 0xF) * 100) + (((msg_elements[3] & 0xF0) >> 4) * 10) + ((msg_elements[4] & 0xF)); // take mcc
             info.mnc = (msg_elements[5] & 0xF) * 10 + (msg_elements[5]>>4); //take mnc
+            if (((msg_elements[4] & 0xF0) >> 4) < 10) // we have a 3 digit mnc, see figure 10.5.3 of 3GPP TS 24.008
+            {
+                info.mnc *= 10;
+                info.mnc += (msg_elements[4] & 0xF0) >> 4;
+            }
             
             boost::mutex::scoped_lock lock(extract_mutex);
             if(d_c0_channels.find(info.id) != d_c0_channels.end()){
diff --git a/lib/receiver/receiver_impl.cc b/lib/receiver/receiver_impl.cc
index f55d613..e69183f 100644
--- a/lib/receiver/receiver_impl.cc
+++ b/lib/receiver/receiver_impl.cc
@@ -26,7 +26,6 @@
 
 #include <gnuradio/io_signature.h>
 #include <gnuradio/math.h>
-#include <volk/volk.h>
 #include <math.h>
 #include <boost/circular_buffer.hpp>
 #include <algorithm>
@@ -35,7 +34,6 @@
 #include <viterbi_detector.h>
 #include <string.h>
 #include <iostream>
-#include <time.h> //!!!
 //#include <iomanip>
 #include <boost/scoped_ptr.hpp>
 
@@ -82,10 +80,6 @@ receiver_impl::receiver_impl(int osr, const std::vector<int> &cell_allocation, c
     d_last_time(0.0)
 {
     int i;
-
-    unsigned int alignment = volk_get_alignment();
-    d_freq_estim_vector = (lv_32fc_t*)volk_malloc(sizeof(lv_32fc_t)*160, alignment);
-    d_freq_estim_result = (lv_32fc_t*)volk_malloc(sizeof(lv_32fc_t)*1, alignment);
                                                                       //don't send samples to the receiver until there are at least samples for one
     set_output_multiple(floor((TS_BITS + 2 * GUARD_PERIOD) * d_OSR)); // burst and two gurad periods (one gurard period is an arbitrary overlap)
     gmsk_mapper(SYNC_BITS, N_SYNC_BITS, d_sch_training_seq, gr_complex(0.0, -1.0));
@@ -106,8 +100,6 @@ receiver_impl::receiver_impl(int osr, const std::vector<int> &cell_allocation, c
  */
 receiver_impl::~receiver_impl()
 {
-    volk_free(d_freq_estim_vector);
-    volk_free(d_freq_estim_result);
 }
 
 int
@@ -294,7 +286,7 @@ receiver_impl::work(int noutput_items,
 
                 dummy_burst_start = get_norm_chan_imp_resp(input, &channel_imp_resp[0], &dummy_corr_max, TS_DUMMY);
                 normal_burst_start = get_norm_chan_imp_resp(input, &channel_imp_resp[0], &normal_corr_max, d_bcc);
-                            
+
                 if (normal_corr_max > dummy_corr_max)
                 {
                     d_c0_burst_start = normal_burst_start;
@@ -540,83 +532,22 @@ bool receiver_impl::find_fcch_burst(const gr_complex *input, const int nitems, d
     return result;
 }
 
-double receiver_impl::estim_freq_norm(const gr_complex * input, unsigned first_sample, unsigned last_sample) //another frequency estimator
-{
-
-    unsigned ii;
-
-    gr_complex sum = 0;
-
-    for (ii = first_sample; ii < last_sample-d_OSR; ii=ii+d_OSR)
-    {
-        sum += input[ii+d_OSR] * conj(input[ii]);
-    }
-
-    return fast_atan2f(imag(sum), real(sum))/(2*M_PI);
-}
-
-double receiver_impl::estim_freq_norm2(const gr_complex * input, unsigned first_sample, unsigned last_sample) //another frequency estimator - faster one
+double receiver_impl::compute_freq_offset(const gr_complex * input, unsigned first_sample, unsigned last_sample)
 {
-
+    double phase_sum = 0;
     unsigned ii;
 
-    int N = (last_sample-first_sample)/d_OSR;
-    
-    for (unsigned ii = 0; ii < N; ii++)
+    for (ii = first_sample; ii < last_sample; ii++)
     {
-        d_freq_estim_vector[ii] = input[first_sample+ii*d_OSR];
+        double phase_diff = compute_phase_diff(input[ii], input[ii-1]) - (M_PI / 2) / d_OSR;
+        phase_sum += phase_diff;
     }
 
-    volk_32fc_x2_conjugate_dot_prod_32fc(d_freq_estim_result, d_freq_estim_vector+1, d_freq_estim_vector, N-1);
-    
-    return fast_atan2f(imag(d_freq_estim_result[0]), real(d_freq_estim_result[0]))/(2*M_PI);
-}
-
-
-double receiver_impl::compute_freq_offset(const gr_complex * input, unsigned first_sample, unsigned last_sample)
-{
-    float freq_norm = estim_freq_norm2(input, first_sample, last_sample);
-
-//    using namespace std;
-//    clock_t begin = clock();
-//  
-//    for(int ii=0;ii<500;ii++){
-//        float dupa = estim_freq_norm2(input, first_sample, last_sample);
-//    }
-//    clock_t end = clock();
-//    double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;  
-//    std::cout << "elapsed_secs " << elapsed_secs << std::endl;
-
-//    begin = clock();
-//  
-//    for(int ii=0;ii<500;ii++){
-//        float dupa = estim_freq_norm(input, first_sample, last_sample);
-//    }
-//    end = clock();
-//    elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;  
-//    std::cout << "elapsed_secs_old " << elapsed_secs << std::endl;
-  
-    float freq_offset = (freq_norm - 0.25) * 1625000.0/6.0;
-    
+    double phase_offset = phase_sum / (last_sample - first_sample);
+    double freq_offset = phase_offset * 1625000.0 / (12.0 * M_PI);
     return freq_offset;
 }
 
-//double receiver_impl::compute_freq_offset(const gr_complex * input, unsigned first_sample, unsigned last_sample)
-//{
-//    double phase_sum = 0;
-//    unsigned ii;
-
-//    for (ii = first_sample; ii < last_sample; ii++)
-//    {
-//        double phase_diff = compute_phase_diff(input[ii], input[ii-1]) - (M_PI / 2) / d_OSR;
-//        phase_sum += phase_diff;
-//    }
-
-//    double phase_offset = phase_sum / (last_sample - first_sample);
-//    double freq_offset = phase_offset * 1625000.0 / (12.0 * M_PI);
-//    return freq_offset;
-//}
-
 inline float receiver_impl::compute_phase_diff(gr_complex val1, gr_complex val2)
 {
     gr_complex conjprod = val1 * conj(val2);
diff --git a/lib/receiver/receiver_impl.h b/lib/receiver/receiver_impl.h
index eb406f3..6074dd5 100644
--- a/lib/receiver/receiver_impl.h
+++ b/lib/receiver/receiver_impl.h
@@ -37,9 +37,6 @@ namespace gr {
         unsigned int d_c0_burst_start;
         float d_c0_signal_dbm;
         
-        lv_32fc_t* d_freq_estim_vector;//  = (lv_32fc_t*)volk_malloc(sizeof(lv_32fc_t)*160, alignment);
-        lv_32fc_t* d_freq_estim_result;// = (lv_32fc_t*)volk_malloc(sizeof(lv_32fc_t)*1, alignment);
-        
         /**@name Configuration of the receiver */
         //@{
         const int d_OSR; ///< oversampling ratio
@@ -111,9 +108,6 @@ namespace gr {
          * @return true if frequency offset was faound
          */
         double compute_freq_offset(const gr_complex * input, unsigned first_sample, unsigned last_sample);
-
-        double estim_freq_norm(const gr_complex * input, unsigned first_sample, unsigned last_sample); //another frequency estimator
-        double estim_freq_norm2(const gr_complex * input, unsigned first_sample, unsigned last_sample); //another frequency estimator        
         /** Computes angle between two complex numbers
          *
          * @param val1 first complex number