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

Revert "Remove redundant code."

Browse Source 
This reverts commit f88c9826a7.
This commit is contained in:
Tim Stewart
2020-11-27 17:13:57 -05:00
parent da92771afa
commit 59b8b5d623
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DStarControl.cpp
View File

@@ -359,7 +359,8 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len)
// Check for the fast data signature // Check for the fast data signature
if (m_rfState == RS_RF_AUDIO && (m_rfN % 2U) == 1U) { if (m_rfState == RS_RF_AUDIO && (m_rfN % 2U) == 1U) {
unsigned char slowDataType = (data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U] ^ DSTAR_SCRAMBLER_BYTES[0U]) & DSTAR_SLOW_DATA_TYPE_MASK; unsigned char slowDataType = (data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 1U] ^ DSTAR_SCRAMBLER_BYTES[0U]) & DSTAR_SLOW_DATA_TYPE_MASK;
if (slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) { unsigned char guard = data[4U + 1U] ^ DSTAR_SCRAMBLER_BYTES[4U];
if ((slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) /* && guard == DSTAR_FAST_DATA_GUARD_BYTE */) {
LogMessage("D-Star, switching to fast data mode"); LogMessage("D-Star, switching to fast data mode");
m_rfState = RS_RF_DATA; m_rfState = RS_RF_DATA;
} }
@@ -735,7 +736,8 @@ void CDStarControl::writeNetwork()
// Check for the fast data signature // Check for the fast data signature
if (m_netState == RS_NET_AUDIO && (n % 2U) == 1U) { if (m_netState == RS_NET_AUDIO && (n % 2U) == 1U) {
unsigned char slowDataType = (data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 2U] ^ DSTAR_SCRAMBLER_BYTES[0U]) & DSTAR_SLOW_DATA_TYPE_MASK; unsigned char slowDataType = (data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 2U] ^ DSTAR_SCRAMBLER_BYTES[0U]) & DSTAR_SLOW_DATA_TYPE_MASK;
if (slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) { unsigned char guard = data[4U + 2U] ^ DSTAR_SCRAMBLER_BYTES[4U];
if ((slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) /* && guard == DSTAR_FAST_DATA_GUARD_BYTE */) {
LogMessage("D-Star, switching to fast data mode"); LogMessage("D-Star, switching to fast data mode");
m_netState = RS_NET_DATA; m_netState = RS_NET_DATA;
} }