From f88c9826a734e5d5c60140c20197078f7d9eb2e5 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 31 Jan 2019 08:25:35 +0000 Subject: [PATCH] Remove redundant code. --- DStarControl.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index cd3b262..6b68906 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -344,8 +344,7 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) // Check for the fast data signature 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 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 */) { + if (slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) { LogMessage("D-Star, switching to fast data mode"); m_rfState = RS_RF_DATA; } @@ -714,8 +713,7 @@ void CDStarControl::writeNetwork() // Check for the fast data signature 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 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 */) { + if (slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) { LogMessage("D-Star, switching to fast data mode"); m_netState = RS_NET_DATA; }