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

Remove all of the Embedded LC regeneration.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-12-10 13:21:25 +00:00
parent bd4b98a76f
commit 8195f91815
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DMRSlot.cpp
View File

@@ -60,7 +60,6 @@ m_queue(5000U, "DMR Slot"),
m_rfState(RS_RF_LISTENING), m_rfState(RS_RF_LISTENING),
m_netState(RS_NET_IDLE), m_netState(RS_NET_IDLE),
m_rfEmbeddedLC(), m_rfEmbeddedLC(),
m_netEmbeddedLC(),
m_rfLC(NULL), m_rfLC(NULL),
m_netLC(NULL), m_netLC(NULL),
m_rfDataHeader(), m_rfDataHeader(),
@@ -775,9 +774,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
dstId = rewriteId; dstId = rewriteId;
} }
// Store the LC for the embedded LC
m_netEmbeddedLC.setData(*m_netLC);
// Regenerate the LC data // Regenerate the LC data
fullLC.encode(*m_netLC, data + 2U, DT_VOICE_LC_HEADER); fullLC.encode(*m_netLC, data + 2U, DT_VOICE_LC_HEADER);
@@ -1632,10 +1628,10 @@ void CDMRSlot::insertSilence(unsigned int count)
if (n == 0U) { if (n == 0U) {
CSync::addDMRAudioSync(data + 2U, m_duplex); CSync::addDMRAudioSync(data + 2U, m_duplex);
} else { } else {
unsigned char lcss = m_netEmbeddedLC.getData(data + 2U, n); ::memset(data + 2U + 13U, 0x00U, 7U);
m_lastEMB.setColorCode(m_colorCode); m_lastEMB.setColorCode(m_colorCode);
m_lastEMB.setLCSS(lcss); m_lastEMB.setLCSS(0U);
m_lastEMB.getData(data + 2U); m_lastEMB.getData(data + 2U);
} }

1
DMRSlot.h
View File

@@ -58,7 +58,6 @@ private:
RPT_RF_STATE m_rfState; RPT_RF_STATE m_rfState;
RPT_NET_STATE m_netState; RPT_NET_STATE m_netState;
CDMREmbeddedLC m_rfEmbeddedLC; CDMREmbeddedLC m_rfEmbeddedLC;
CDMREmbeddedLC m_netEmbeddedLC;
CDMRLC* m_rfLC; CDMRLC* m_rfLC;
CDMRLC* m_netLC; CDMRLC* m_netLC;
CDMRDataHeader m_rfDataHeader; CDMRDataHeader m_rfDataHeader;