diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2016-12-29 13:01:48 +0100 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2016-12-29 13:01:48 +0100 |
| commit | 25ae3e2066e589f7faf2ddf9b1811697583233ac (patch) | |
| tree | 7960e68e3060d07ff25ff31c75539bdc15488ff4 /lib | |
| parent | 694ed81d7bd7f55e020897ac07d852542e7cb78e (diff) | |
| parent | ddd096e6b4e41adbf448657ebd7630fb98687f99 (diff) | |
Merge branch '213-3digit-mnc' of https://github.com/romankh/gr-gsm into libosmocore_integration
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/demapping/tch_f_chans_demapper_impl.cc | 2 | ||||
| -rw-r--r-- | lib/flow_control/uplink_downlink_splitter_impl.cc | 1 | ||||
| -rw-r--r-- | lib/misc_utils/extract_system_info_impl.cc | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lib/demapping/tch_f_chans_demapper_impl.cc b/lib/demapping/tch_f_chans_demapper_impl.cc index a672b24..53f46fb 100644 --- a/lib/demapping/tch_f_chans_demapper_impl.cc +++ b/lib/demapping/tch_f_chans_demapper_impl.cc @@ -87,7 +87,7 @@ namespace gr { new_hdr->sub_type = GSMTAP_CHANNEL_TCH_F; if (fn_mod13 == 12) - header->sub_type = GSMTAP_CHANNEL_ACCH|GSMTAP_CHANNEL_TCH_F; + new_hdr->sub_type = GSMTAP_CHANNEL_ACCH|GSMTAP_CHANNEL_TCH_F; pmt::pmt_t msg_binary_blob = pmt::make_blob(new_msg,sizeof(gsmtap_hdr)+BURST_SIZE); pmt::pmt_t msg_out = pmt::cons(pmt::PMT_NIL, msg_binary_blob); diff --git a/lib/flow_control/uplink_downlink_splitter_impl.cc b/lib/flow_control/uplink_downlink_splitter_impl.cc index b98102c..e98c668 100644 --- a/lib/flow_control/uplink_downlink_splitter_impl.cc +++ b/lib/flow_control/uplink_downlink_splitter_impl.cc @@ -27,6 +27,7 @@ #include <gnuradio/io_signature.h> #include "uplink_downlink_splitter_impl.h" #include <grgsm/gsmtap.h> +#include <grgsm/endian.h> #define BURST_SIZE 148 namespace gr { namespace grgsm { 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()){ |