MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Format cleanups

Browse Source
This commit is contained in:
Jonathan Naylor
2024-01-25 19:23:32 +00:00
parent 3bde9442f4
commit 0571d90b5b
2 changed files with 80 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
P25Control.cpp
View File

@@ -235,8 +235,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
m_lastDUID = duid; m_lastDUID = duid;
return true; return true;
} }
} } else if (duid == P25_DUID_LDU1) {
else if (duid == P25_DUID_LDU1) {
if (m_rfState == RS_RF_LISTENING) { if (m_rfState == RS_RF_LISTENING) {
m_rfData.reset(); m_rfData.reset();
bool ret = m_rfData.decodeLDU1(data + 2U); bool ret = m_rfData.decodeLDU1(data + 2U);
@@ -295,8 +294,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC"); LogWarning("P25, LDU1 undecodable LC, using last LDU1 LC");
m_rfData = m_rfLastLDU1; m_rfData = m_rfLastLDU1;
m_rfUndecodableLC++; m_rfUndecodableLC++;
} } else {
else {
m_rfLastLDU1 = m_rfData; m_rfLastLDU1 = m_rfData;
} }

6
P25Data.cpp
View File

@@ -98,14 +98,13 @@ bool CP25Data::decodeHeader(const unsigned char* data)
m_mfId = rs[9U]; // Mfg Id. m_mfId = rs[9U]; // Mfg Id.
m_algId = rs[10U]; // Algorithm ID m_algId = rs[10U]; // Algorithm ID
if (m_algId != P25_ALGO_UNENCRYPT) { if (m_algId != P25_ALGO_UNENCRYPT) {
m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; m_mi = new unsigned char[P25_MI_LENGTH_BYTES];
::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES);
::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator ::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator
m_kId = (rs[11U] << 8) + rs[12U]; // Key ID m_kId = (rs[11U] << 8) + rs[12U]; // Key ID
} } else {
else {
m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; m_mi = new unsigned char[P25_MI_LENGTH_BYTES];
::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES); ::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES);
@@ -296,7 +295,6 @@ bool CP25Data::decodeLDU2(const unsigned char* data)
m_algId = rs[9U]; // Algorithm ID m_algId = rs[9U]; // Algorithm ID
if (m_algId != P25_ALGO_UNENCRYPT) { if (m_algId != P25_ALGO_UNENCRYPT) {
m_mi = new unsigned char[P25_MI_LENGTH_BYTES]; m_mi = new unsigned char[P25_MI_LENGTH_BYTES];
::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES);
::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator ::memcpy(m_mi, rs, P25_MI_LENGTH_BYTES); // Message Indicator
m_kId = (rs[10U] << 8) + rs[11U]; // Key ID m_kId = (rs[10U] << 8) + rs[11U]; // Key ID