Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into nxdn

Browse source
This commit is contained in:
Jonathan Naylor 2018-01-31 18:17:05 +00:00
parent e78320fc18 63a2ea330d
commit 8e0164f657
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DMRNetwork.cpp
View file

@ -498,6 +498,9 @@ void CDMRNetwork::receiveData(const unsigned char* data, unsigned int length)
if (slotNo == 2U && !m_slot2) if (slotNo == 2U && !m_slot2)
return; return;
m_jitterBuffers[slotNo]->appendData(data, length);
/*
unsigned char dataType = data[15U] & 0x3FU; unsigned char dataType = data[15U] & 0x3FU;
if (dataType == (0x20U | DT_CSBK) || if (dataType == (0x20U | DT_CSBK) ||
dataType == (0x20U | DT_DATA_HEADER) || dataType == (0x20U | DT_DATA_HEADER) ||
@ -511,6 +514,7 @@ void CDMRNetwork::receiveData(const unsigned char* data, unsigned int length)
unsigned char seqNo = data[4U]; unsigned char seqNo = data[4U];
m_jitterBuffers[slotNo]->addData(data, length, seqNo); m_jitterBuffers[slotNo]->addData(data, length, seqNo);
} }
*/
} }
bool CDMRNetwork::writeLogin() bool CDMRNetwork::writeLogin()