Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Clean up of processing.

Browse source
This commit is contained in:
Jonathan Naylor 2016-09-22 20:31:25 +01:00
parent 55a34bc995
commit 98ab0845f3
5 changed files with 52 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
P25Control.cpp
View file

@ -135,7 +135,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
m_nid.encode(data + 2U, P25_DUID_HEADER); m_nid.encode(data + 2U, P25_DUID_HEADER);
// Add the dummy header // Add the dummy header
m_netData.createHeader(data + 2U); m_netData.processHeader(data + 2U);
// Add busy bits // Add busy bits
addBusyBits(data + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true); addBusyBits(data + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true);
@ -151,8 +151,6 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
writeFile(data + 2U, len - 2U); writeFile(data + 2U, len - 2U);
#endif #endif
writeNetwork(data + 2U, P25_DUID_HEADER);
if (m_duplex) { if (m_duplex) {
data[0U] = TAG_HEADER; data[0U] = TAG_HEADER;
data[1U] = 0x00U; data[1U] = 0x00U;
@ -160,6 +158,7 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
} }
} else if (duid == P25_DUID_LDU1) { } else if (duid == P25_DUID_LDU1) {
if (m_rfState == RS_RF_LISTENING) { if (m_rfState == RS_RF_LISTENING) {
m_rfData.reset();
m_rfFrames = 0U; m_rfFrames = 0U;
m_rfErrs = 0U; m_rfErrs = 0U;
m_rfBits = 1U; m_rfBits = 1U;
@ -197,6 +196,9 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
writeFile(data + 2U, len - 2U); writeFile(data + 2U, len - 2U);
#endif #endif
if (m_rfFrames == 1U)
writeNetwork(data + 2U, P25_DUID_HEADER);
writeNetwork(data + 2U, P25_DUID_LDU1); writeNetwork(data + 2U, P25_DUID_LDU1);
if (m_duplex) { if (m_duplex) {
@ -253,43 +255,11 @@ bool CP25Control::writeModem(unsigned char* data, unsigned int len)
data[1U] = 0x00U; data[1U] = 0x00U;
writeQueueRF(data, P25_LDU_FRAME_LENGTH_BYTES + 2U); writeQueueRF(data, P25_LDU_FRAME_LENGTH_BYTES + 2U);
} }
} else if (duid == P25_DUID_TERM_LC) { } else if (duid == P25_DUID_TERM || duid == P25_DUID_TERM_LC) {
if (m_rfState == RS_RF_LISTENING) if (m_rfState == RS_RF_LISTENING)
return false; return false;
// Regenerate Sync ::memset(data + 2U, 0x00U, P25_TERM_FRAME_LENGTH_BYTES);
CSync::addP25Sync(data + 2U);
// Regenerate NID
m_nid.encode(data + 2U, P25_DUID_TERM_LC);
// Leave the termination LC untouched
// Add busy bits
addBusyBits(data + 2U, P25_TERMLC_FRAME_LENGTH_BITS, false, true);
m_rfState = RS_RF_LISTENING;
m_rfTimeout.stop();
m_rfData.reset();
m_lastDUID = duid;
LogMessage("P25, received RF end of transmission, %.1f seconds, BER: %.1f%%", float(m_rfFrames) / 5.56F, float(m_rfErrs * 100U) / float(m_rfBits));
m_display->clearP25();
#if defined(DUMP_P25)
closeFile();
#endif
writeNetwork(data + 2U, P25_DUID_TERM_LC);
if (m_duplex) {
data[0U] = TAG_EOT;
data[1U] = 0x00U;
writeQueueRF(data, P25_TERMLC_FRAME_LENGTH_BYTES + 2U);
}
} else if (duid == P25_DUID_TERM) {
if (m_rfState == RS_RF_LISTENING)
return false;
// Regenerate Sync // Regenerate Sync
CSync::addP25Sync(data + 2U); CSync::addP25Sync(data + 2U);
@ -495,6 +465,9 @@ void CP25Control::writeNetwork(const unsigned char *data, unsigned char type)
switch (type) switch (type)
{ {
case P25_DUID_HEADER:
m_network->writeHeader(m_rfData);
break;
case P25_DUID_LDU1: case P25_DUID_LDU1:
m_network->writeLDU1(data, m_rfData, m_rfLSD); m_network->writeLDU1(data, m_rfData, m_rfLSD);
break; break;
@ -523,26 +496,6 @@ void CP25Control::addBusyBits(unsigned char* data, unsigned int length, bool b1,
void CP25Control::createHeader() void CP25Control::createHeader()
{ {
unsigned char buffer[P25_HDR_FRAME_LENGTH_BYTES + 2U];
::memset(buffer, 0x00U, P25_HDR_FRAME_LENGTH_BYTES + 2U);
buffer[0U] = TAG_HEADER;
buffer[1U] = 0x00U;
// Add the sync
CSync::addP25Sync(buffer + 2U);
// Add the NID
m_nid.encode(buffer + 2U, P25_DUID_HEADER);
// Add the dummy header
m_netData.createHeader(buffer + 2U);
// Add busy bits
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true);
writeQueueNet(buffer, P25_HDR_FRAME_LENGTH_BYTES + 2U);
unsigned char lcf = m_netLDU1[51U]; unsigned char lcf = m_netLDU1[51U];
unsigned char mfId = m_netLDU1[52U]; unsigned char mfId = m_netLDU1[52U];
unsigned int dstId = (m_netLDU1[76U] << 16) + (m_netLDU1[77U] << 8) + m_netLDU1[78U]; unsigned int dstId = (m_netLDU1[76U] << 16) + (m_netLDU1[77U] << 8) + m_netLDU1[78U];
@ -556,6 +509,7 @@ void CP25Control::createHeader()
::memcpy(mi + 3U, m_netLDU2 + 76U, 3U); ::memcpy(mi + 3U, m_netLDU2 + 76U, 3U);
::memcpy(mi + 6U, m_netLDU2 + 101U, 3U); ::memcpy(mi + 6U, m_netLDU2 + 101U, 3U);
m_netData.reset();
m_netData.setMI(mi); m_netData.setMI(mi);
m_netData.setAlgId(algId); m_netData.setAlgId(algId);
m_netData.setKId(kId); m_netData.setKId(kId);
@ -574,6 +528,26 @@ void CP25Control::createHeader()
m_netTimeout.start(); m_netTimeout.start();
m_netFrames = 0U; m_netFrames = 0U;
m_netLost = 0U; m_netLost = 0U;
unsigned char buffer[P25_HDR_FRAME_LENGTH_BYTES + 2U];
::memset(buffer, 0x00U, P25_HDR_FRAME_LENGTH_BYTES + 2U);
buffer[0U] = TAG_HEADER;
buffer[1U] = 0x00U;
// Add the sync
CSync::addP25Sync(buffer + 2U);
// Add the NID
m_nid.encode(buffer + 2U, P25_DUID_HEADER);
// Add the dummy header
m_netData.encodeHeader(buffer + 2U);
// Add busy bits
addBusyBits(buffer + 2U, P25_HDR_FRAME_LENGTH_BITS, false, true);
writeQueueNet(buffer, P25_HDR_FRAME_LENGTH_BYTES + 2U);
} }
void CP25Control::createLDU1() void CP25Control::createLDU1()
@ -666,7 +640,7 @@ void CP25Control::createTerminator(const unsigned char* data)
return; return;
unsigned char buffer[P25_TERM_FRAME_LENGTH_BYTES + 2U]; unsigned char buffer[P25_TERM_FRAME_LENGTH_BYTES + 2U];
::memset(buffer, 0x00U, P25_TERMLC_FRAME_LENGTH_BYTES + 2U); ::memset(buffer, 0x00U, P25_TERM_FRAME_LENGTH_BYTES + 2U);
buffer[0U] = TAG_EOT; buffer[0U] = TAG_EOT;
buffer[1U] = 0x00U; buffer[1U] = 0x00U;

11
P25Data.cpp
View file

@ -69,9 +69,11 @@ void CP25Data::processHeader(unsigned char* data)
// CUtils::dump(1U, "P25, raw header", raw, 81U); // CUtils::dump(1U, "P25, raw header", raw, 81U);
// XXX Need to add FEC code // XXX Need to add FEC code
CP25Utils::encode(DUMMY_HEADER, data, 114U, 780U);
} }
void CP25Data::createHeader(unsigned char* data) void CP25Data::encodeHeader(unsigned char* data)
{ {
assert(data != NULL); assert(data != NULL);
@ -385,8 +387,15 @@ unsigned int CP25Data::getDstId() const
void CP25Data::reset() void CP25Data::reset()
{ {
::memset(m_mi, 0x00U, P25_MI_LENGTH_BYTES);
m_algId = 0x80U;
m_kId = 0x0000U;
m_lcf = P25_LCF_GROUP;
m_mfId = 0x00U;
m_srcId = 0U; m_srcId = 0U;
m_dstId = 0U; m_dstId = 0U;
m_emergency = false;
} }
void CP25Data::decodeLDUHamming(const unsigned char* data, unsigned char* raw) void CP25Data::decodeLDUHamming(const unsigned char* data, unsigned char* raw)

2
P25Data.h
View file

@ -27,8 +27,6 @@ public:
~CP25Data(); ~CP25Data();
void processHeader(unsigned char* data); void processHeader(unsigned char* data);
void createHeader(unsigned char* data);
void decodeHeader(const unsigned char* data);
void encodeHeader(unsigned char* data); void encodeHeader(unsigned char* data);
void processLDU1(unsigned char* data); void processLDU1(unsigned char* data);

7
P25Network.cpp
View file

@ -64,7 +64,7 @@ bool CP25Network::open()
return m_socket.open(); return m_socket.open();
} }
bool CP25Network::writeHeader(unsigned int tgid) bool CP25Network::writeHeader(const CP25Data& control)
{ {
if (m_debug) if (m_debug)
CUtils::dump(1U, "P25 Network ICW Sent", STARTICW, 10U); CUtils::dump(1U, "P25 Network ICW Sent", STARTICW, 10U);
@ -84,6 +84,11 @@ bool CP25Network::writeHeader(unsigned int tgid)
return false; return false;
#endif #endif
unsigned int tgid = 0x0000U;
if (control.getLCF() == P25_LCF_GROUP)
tgid = control.getDstId();
// The VHDR2 record // The VHDR2 record
unsigned char buffer[22U]; unsigned char buffer[22U];
::memset(buffer, 0x00U, 22U); ::memset(buffer, 0x00U, 22U);

6
P25Network.h
View file

@ -37,8 +37,12 @@ public:
void enable(bool enabled); void enable(bool enabled);
bool writeHeader(const CP25Data& control);
bool writeLDU1(const unsigned char* ldu1, const CP25Data& control, const CP25LowSpeedData& lsd); bool writeLDU1(const unsigned char* ldu1, const CP25Data& control, const CP25LowSpeedData& lsd);
bool writeLDU2(const unsigned char* ldu2, const CP25Data& control, const CP25LowSpeedData& lsd); bool writeLDU2(const unsigned char* ldu2, const CP25Data& control, const CP25LowSpeedData& lsd);
bool writeTerminator(); bool writeTerminator();
unsigned int read(unsigned char* data, unsigned int length); unsigned int read(unsigned char* data, unsigned int length);
@ -55,8 +59,6 @@ private:
bool m_enabled; bool m_enabled;
CRingBuffer<unsigned char> m_buffer; CRingBuffer<unsigned char> m_buffer;
CP25Audio m_audio; CP25Audio m_audio;
bool writeHeader(unsigned int tgid);
}; };
#endif #endif