From be231ab3df66f225212f69191d633c116f433f04 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sun, 8 May 2022 14:37:06 -0400 Subject: [PATCH] remove old patch group code (this code never did what it was supposed and was more of a PoC to test patching, a real implementation will need to be done in the future); --- p25/dfsi/DFSIVoicePacket.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/p25/dfsi/DFSIVoicePacket.cpp b/p25/dfsi/DFSIVoicePacket.cpp index ca422480..0b8322f7 100644 --- a/p25/dfsi/DFSIVoicePacket.cpp +++ b/p25/dfsi/DFSIVoicePacket.cpp @@ -306,12 +306,6 @@ bool DFSIVoicePacket::process(uint8_t* data, uint32_t len) ::ActivityLog("P25", true, "RF %svoice transmission from %u to %s%u", encrypted ? "encrypted " : "", srcId, group ? "TG " : "", dstId); if (m_p25->m_control) { - if (group && (m_lastPatchGroup != dstId) && - (dstId != m_p25->m_trunk->m_patchSuperGroup)) { - m_p25->m_trunk->writeRF_TSDU_Mot_Patch(dstId, 0U, 0U); - m_lastPatchGroup = dstId; - } - // if the group wasn't granted out -- explicitly grant the group if (!m_p25->m_trunk->hasDstIdGranted(dstId)) { if (m_p25->m_legacyGroupGrnt) { @@ -994,14 +988,6 @@ void DFSIVoicePacket::writeNet_LDU1() ::ActivityLog("P25", false, "network %svoice transmission from %u to %s%u", m_netLC.getEncrypted() ? "encrypted " : "", srcId, group ? "TG " : "", dstId); - if (m_p25->m_control) { - if (group && (m_lastPatchGroup != dstId) && - (dstId != m_p25->m_trunk->m_patchSuperGroup)) { - m_p25->m_trunk->writeRF_TSDU_Mot_Patch(dstId, 0U, 0U); - m_lastPatchGroup = dstId; - } - } - // single-channel trunking or voice on control support? if (m_p25->m_control && m_p25->m_voiceOnControl) { m_p25->m_ccRunning = false; // otherwise the grant will be bundled with other packets