Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests 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
Show stats 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_netState(RS_NET_IDLE),
m_rfEmbeddedLC(),
m_netEmbeddedLC(),
m_rfLC(NULL),
m_netLC(NULL),
m_rfDataHeader(),
@ -775,9 +774,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
dstId = rewriteId;
}
// Store the LC for the embedded LC
m_netEmbeddedLC.setData(*m_netLC);
// Regenerate the LC data
fullLC.encode(*m_netLC, data + 2U, DT_VOICE_LC_HEADER);
@ -1632,10 +1628,10 @@ void CDMRSlot::insertSilence(unsigned int count)
if (n == 0U) {
CSync::addDMRAudioSync(data + 2U, m_duplex);
} else {
unsigned char lcss = m_netEmbeddedLC.getData(data + 2U, n);
::memset(data + 2U + 13U, 0x00U, 7U);
m_lastEMB.setColorCode(m_colorCode);
m_lastEMB.setLCSS(lcss);
m_lastEMB.setLCSS(0U);
m_lastEMB.getData(data + 2U);
}

1
DMRSlot.h
View file

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