From 821db7910a36cd0fad0a8a5b9a937a881b7ce0ac Mon Sep 17 00:00:00 2001 From: Tim Stewart Date: Fri, 27 Nov 2020 17:51:06 -0500 Subject: [PATCH] Revert "Regenerate the data mode markers." This reverts commit 54fbacb4878059679740f4b0eda71f09ecf988b2. --- DStarControl.cpp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/DStarControl.cpp b/DStarControl.cpp index 12e41fd..9687716 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -371,16 +371,6 @@ bool CDStarControl::writeModem(unsigned char *data, unsigned int len) } if (m_rfState == RS_RF_DATA) { - // Regenerate the data mode markers - if (m_rfFrames < 21U) { - if (CUtils::compare(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) - ::memcpy(data + 1U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES); - else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) - ::memcpy(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES); - else if (CUtils::compare(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) - ::memcpy(data + 1U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES); - } - m_rfBits += 72U; m_rfErrs = 0U; m_rfFrames++; @@ -751,16 +741,6 @@ void CDStarControl::writeNetwork() } if (m_netState == RS_NET_DATA) { - // Regenerate the data mode markers - if (m_netFrames < 21U) { - if (CUtils::compare(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) - ::memcpy(data + 2U, DSTAR_KENWOOD_DATA_MODE_BYTES, DSTAR_VOICE_FRAME_LENGTH_BYTES); - else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) - ::memcpy(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES1, DSTAR_VOICE_FRAME_LENGTH_BYTES); - else if (CUtils::compare(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES) < 5U) - ::memcpy(data + 2U, DSTAR_ICOM_DATA_MODE_BYTES2, DSTAR_VOICE_FRAME_LENGTH_BYTES); - } - unsigned char n = data[1U]; data[1U] = TAG_DATA;