sdr
/
gr-gsm
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '213-3digit-mnc' of https://github.com/romankh/gr-gsm into romankh-213-3digit-mnc

This commit is contained in:
Piotr Krysik 2016-12-29 13:08:39 +01:00
parent fcf7e347be ddd096e6b4
commit 993ea3989e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/misc_utils/extract_system_info_impl.cc
View File

@ -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()){