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

Small cleanups.

Browse source
This commit is contained in:
Jonathan Naylor 2016-01-19 17:43:33 +00:00
parent 69abf1e897
commit ac31174b0d
3 changed files with 59 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
DMRSlot.cpp
View file

@ -14,7 +14,6 @@
#include "SlotType.h" #include "SlotType.h"
#include "ShortLC.h" #include "ShortLC.h"
#include "DMRSlot.h" #include "DMRSlot.h"
#include "Defines.h"
#include "DMRSync.h" #include "DMRSync.h"
#include "FullLC.h" #include "FullLC.h"
#include "CSBK.h" #include "CSBK.h"
@ -43,7 +42,7 @@ unsigned char CDMRSlot::m_id2 = 0U;
CDMRSlot::CDMRSlot(unsigned int slotNo, unsigned int timeout) : CDMRSlot::CDMRSlot(unsigned int slotNo, unsigned int timeout) :
m_slotNo(slotNo), m_slotNo(slotNo),
m_queue(1000U), m_queue(1000U),
m_state(SS_LISTENING), m_state(RS_LISTENING),
m_embeddedLC(), m_embeddedLC(),
m_lc(NULL), m_lc(NULL),
m_seqNo(0U), m_seqNo(0U),
@ -60,18 +59,18 @@ CDMRSlot::~CDMRSlot()
void CDMRSlot::writeModem(unsigned char *data) void CDMRSlot::writeModem(unsigned char *data)
{ {
if (data[0U] == TAG_LOST && (m_state == SS_RELAYING_RF_AUDIO || m_state == SS_RELAYING_RF_DATA)) { if (data[0U] == TAG_LOST && (m_state == RS_RELAYING_RF_AUDIO || m_state == RS_RELAYING_RF_DATA)) {
LogMessage("DMR Slot %u, transmission lost", m_slotNo); LogMessage("DMR Slot %u, transmission lost", m_slotNo);
writeEndOfTransmission(); writeEndOfTransmission();
return; return;
} }
if (data[0U] == TAG_LOST && m_state == SS_LATE_ENTRY) { if (data[0U] == TAG_LOST && m_state == RS_LATE_ENTRY) {
m_state = SS_LISTENING; m_state = RS_LISTENING;
return; return;
} }
if (m_state == SS_RELAYING_NETWORK_AUDIO || m_state == SS_RELAYING_NETWORK_DATA) if (m_state == RS_RELAYING_NETWORK_AUDIO || m_state == RS_RELAYING_NETWORK_DATA)
return; return;
bool dataSync = (data[1U] & DMR_SYNC_DATA) == DMR_SYNC_DATA; bool dataSync = (data[1U] & DMR_SYNC_DATA) == DMR_SYNC_DATA;
@ -81,11 +80,10 @@ void CDMRSlot::writeModem(unsigned char *data)
CSlotType slotType; CSlotType slotType;
slotType.putData(data + 2U); slotType.putData(data + 2U);
unsigned char colorCode = slotType.getColorCode(); unsigned char dataType = slotType.getDataType();
unsigned char dataType = slotType.getDataType();
if (dataType == DT_VOICE_LC_HEADER) { if (dataType == DT_VOICE_LC_HEADER) {
if (m_state == SS_RELAYING_RF_AUDIO) if (m_state == RS_RELAYING_RF_AUDIO)
return; return;
CFullLC fullLC; CFullLC fullLC;
@ -119,14 +117,14 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(data); writeQueue(data);
} }
m_state = SS_RELAYING_RF_AUDIO; m_state = RS_RELAYING_RF_AUDIO;
setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO()); setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO());
m_display->writeDMR(m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP, m_lc->getDstId()); m_display->writeDMR(m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP, m_lc->getDstId());
LogMessage("DMR Slot %u, received RF voice header from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId()); LogMessage("DMR Slot %u, received RF voice header from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId());
} else if (dataType == DT_VOICE_PI_HEADER) { } else if (dataType == DT_VOICE_PI_HEADER) {
if (m_state != SS_RELAYING_RF_AUDIO) if (m_state != RS_RELAYING_RF_AUDIO)
return; return;
// Regenerate the Slot Type // Regenerate the Slot Type
@ -146,7 +144,7 @@ void CDMRSlot::writeModem(unsigned char *data)
LogMessage("DMR Slot %u, received PI header", m_slotNo); LogMessage("DMR Slot %u, received PI header", m_slotNo);
} else if (dataType == DT_TERMINATOR_WITH_LC) { } else if (dataType == DT_TERMINATOR_WITH_LC) {
if (m_state != SS_RELAYING_RF_AUDIO) if (m_state != RS_RELAYING_RF_AUDIO)
return; return;
// Regenerate the Slot Type // Regenerate the Slot Type
@ -170,7 +168,7 @@ void CDMRSlot::writeModem(unsigned char *data)
writeEndOfTransmission(); writeEndOfTransmission();
} else if (dataType == DT_DATA_HEADER) { } else if (dataType == DT_DATA_HEADER) {
if (m_state == SS_RELAYING_RF_DATA) if (m_state == RS_RELAYING_RF_DATA)
return; return;
// Regenerate the Slot Type // Regenerate the Slot Type
@ -196,7 +194,7 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(data); writeQueue(data);
} }
m_state = SS_RELAYING_RF_DATA; m_state = RS_RELAYING_RF_DATA;
// setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO()); // setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO());
// m_display->writeDMR(m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP, m_lc->getDstId()); // m_display->writeDMR(m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP, m_lc->getDstId());
@ -218,7 +216,7 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(data); writeQueue(data);
} }
} else if (audioSync) { } else if (audioSync) {
if (m_state == SS_RELAYING_RF_AUDIO) { if (m_state == RS_RELAYING_RF_AUDIO) {
// Convert the Audio Sync to be from the BS // Convert the Audio Sync to be from the BS
CDMRSync sync; CDMRSync sync;
sync.addSync(data + 2U, DST_BS_AUDIO); sync.addSync(data + 2U, DST_BS_AUDIO);
@ -234,14 +232,15 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(data); writeQueue(data);
writeNetwork(data, DT_VOICE_SYNC); writeNetwork(data, DT_VOICE_SYNC);
} else if (m_state == SS_LISTENING) { } else if (m_state == RS_LISTENING) {
m_state = SS_LATE_ENTRY; m_state = RS_LATE_ENTRY;
} }
} else { } else {
if (m_state == SS_RELAYING_RF_AUDIO) { CEMB emb;
emb.putData(data + 2U);
if (m_state == RS_RELAYING_RF_AUDIO) {
// Regenerate the EMB // Regenerate the EMB
CEMB emb;
emb.putData(data + 2U);
emb.setColorCode(m_colorCode); emb.setColorCode(m_colorCode);
emb.getData(data + 2U); emb.getData(data + 2U);
@ -256,10 +255,8 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(data); writeQueue(data);
writeNetwork(data, DT_VOICE); writeNetwork(data, DT_VOICE);
} else if (m_state == SS_LATE_ENTRY) { } else if (m_state == RS_LATE_ENTRY) {
// If we haven't received an LC yet, then be strict on the color code // If we haven't received an LC yet, then be strict on the color code
CEMB emb;
emb.putData(data + 2U);
unsigned char colorCode = emb.getColorCode(); unsigned char colorCode = emb.getColorCode();
if (colorCode != m_colorCode) if (colorCode != m_colorCode)
return; return;
@ -294,6 +291,9 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(start); writeQueue(start);
} }
// Regenerate the EMB
emb.getData(data + 2U);
// Send the original audio frame out // Send the original audio frame out
unsigned char fid = m_lc->getFID(); unsigned char fid = m_lc->getFID();
if (fid == FID_ETSI || fid == FID_DMRA) if (fid == FID_ETSI || fid == FID_DMRA)
@ -307,7 +307,7 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(data); writeQueue(data);
writeNetwork(data, DT_VOICE); writeNetwork(data, DT_VOICE);
m_state = SS_RELAYING_RF_AUDIO; m_state = RS_RELAYING_RF_AUDIO;
setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO()); setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO());
@ -334,7 +334,7 @@ unsigned int CDMRSlot::readModem(unsigned char* data)
void CDMRSlot::writeEndOfTransmission() void CDMRSlot::writeEndOfTransmission()
{ {
m_state = SS_LISTENING; m_state = RS_LISTENING;
setShortLC(m_slotNo, 0U); setShortLC(m_slotNo, 0U);
@ -345,11 +345,15 @@ void CDMRSlot::writeEndOfTransmission()
delete m_lc; delete m_lc;
m_lc = NULL; m_lc = NULL;
#if defined(DUMP_DMR)
closeFile();
#endif
} }
void CDMRSlot::writeNetwork(const CDMRData& dmrData) void CDMRSlot::writeNetwork(const CDMRData& dmrData)
{ {
if (m_state == SS_RELAYING_RF_AUDIO || m_state == SS_RELAYING_RF_DATA || m_state == SS_LATE_ENTRY) if (m_state == RS_RELAYING_RF_AUDIO || m_state == RS_RELAYING_RF_DATA || m_state == RS_LATE_ENTRY)
return; return;
m_networkWatchdog.start(); m_networkWatchdog.start();
@ -360,7 +364,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
dmrData.getData(data + 2U); dmrData.getData(data + 2U);
if (dataType == DT_VOICE_LC_HEADER) { if (dataType == DT_VOICE_LC_HEADER) {
if (m_state == SS_RELAYING_NETWORK_AUDIO) if (m_state == RS_RELAYING_NETWORK_AUDIO)
return; return;
CFullLC fullLC; CFullLC fullLC;
@ -392,7 +396,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
for (unsigned int i = 0U; i < 3U; i++) for (unsigned int i = 0U; i < 3U; i++)
writeQueue(data); writeQueue(data);
m_state = SS_RELAYING_NETWORK_AUDIO; m_state = RS_RELAYING_NETWORK_AUDIO;
setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO()); setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO());
@ -404,7 +408,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
#endif #endif
LogMessage("DMR Slot %u, received network voice header from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId()); LogMessage("DMR Slot %u, received network voice header from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId());
} else if (dataType == DT_VOICE_PI_HEADER) { } else if (dataType == DT_VOICE_PI_HEADER) {
if (m_state != SS_RELAYING_NETWORK_AUDIO) if (m_state != RS_RELAYING_NETWORK_AUDIO)
return; return;
// Regenerate the Slot Type // Regenerate the Slot Type
@ -426,7 +430,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
writeFile(data); writeFile(data);
#endif #endif
} else if (dataType == DT_TERMINATOR_WITH_LC) { } else if (dataType == DT_TERMINATOR_WITH_LC) {
if (m_state != SS_RELAYING_NETWORK_AUDIO) if (m_state != RS_RELAYING_NETWORK_AUDIO)
return; return;
// Regenerate the Slot Type // Regenerate the Slot Type
@ -450,10 +454,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
closeFile(); closeFile();
#endif #endif
LogMessage("DMR Slot %u, received network end of voice transmission", m_slotNo); LogMessage("DMR Slot %u, received network end of voice transmission", m_slotNo);
if (m_state == SS_RELAYING_RF_DATA)
return;
} else if (dataType == DT_DATA_HEADER) { } else if (dataType == DT_DATA_HEADER) {
if (m_state == SS_RELAYING_NETWORK_DATA) if (m_state == RS_RELAYING_NETWORK_DATA)
return; return;
// Regenerate the Slot Type // Regenerate the Slot Type
@ -469,8 +471,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
data[1U] = 0x00U; data[1U] = 0x00U;
m_networkWatchdog.stop();
m_seqNo = 0U; m_seqNo = 0U;
m_n = 0U; m_n = 0U;
@ -481,7 +481,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
for (unsigned i = 0U; i < 3U; i++) for (unsigned i = 0U; i < 3U; i++)
writeQueue(data); writeQueue(data);
m_state = SS_RELAYING_NETWORK_DATA; m_state = RS_RELAYING_NETWORK_DATA;
// setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO()); // setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO());
// m_display->writeDMR(m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP, m_lc->getDstId()); // m_display->writeDMR(m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP, m_lc->getDstId());
@ -489,7 +489,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
// LogMessage("DMR Slot %u, received network data header from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId()); // LogMessage("DMR Slot %u, received network data header from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId());
LogMessage("DMR Slot %u, received network data header", m_slotNo); LogMessage("DMR Slot %u, received network data header", m_slotNo);
} else if (dataType == DT_VOICE_SYNC) { } else if (dataType == DT_VOICE_SYNC) {
if (m_state != SS_RELAYING_NETWORK_AUDIO) if (m_state != RS_RELAYING_NETWORK_AUDIO)
return; return;
// Convert the Audio Sync to be from the BS // Convert the Audio Sync to be from the BS
@ -509,7 +509,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
writeFile(data); writeFile(data);
#endif #endif
} else if (dataType == DT_VOICE) { } else if (dataType == DT_VOICE) {
if (m_state != SS_RELAYING_NETWORK_AUDIO) if (m_state != RS_RELAYING_NETWORK_AUDIO)
return; return;
unsigned char fid = m_lc->getFID(); unsigned char fid = m_lc->getFID();
@ -556,7 +556,7 @@ void CDMRSlot::clock(unsigned int ms)
{ {
m_timeoutTimer.clock(ms); m_timeoutTimer.clock(ms);
if (m_state == SS_RELAYING_NETWORK_AUDIO || m_state == SS_RELAYING_NETWORK_DATA) { if (m_state == RS_RELAYING_NETWORK_AUDIO || m_state == RS_RELAYING_NETWORK_DATA) {
m_networkWatchdog.clock(ms); m_networkWatchdog.clock(ms);
if (m_networkWatchdog.hasExpired()) { if (m_networkWatchdog.hasExpired()) {

30
DMRSlot.h
View file

@ -25,19 +25,11 @@
#include "DMRSlot.h" #include "DMRSlot.h"
#include "DMRData.h" #include "DMRData.h"
#include "Display.h" #include "Display.h"
#include "Defines.h"
#include "Timer.h" #include "Timer.h"
#include "Modem.h" #include "Modem.h"
#include "LC.h" #include "LC.h"
enum SLOT_STATE {
SS_LISTENING,
SS_LATE_ENTRY,
SS_RELAYING_RF_AUDIO,
SS_RELAYING_NETWORK_AUDIO,
SS_RELAYING_RF_DATA,
SS_RELAYING_NETWORK_DATA
};
class CDMRSlot { class CDMRSlot {
public: public:
CDMRSlot(unsigned int slotNo, unsigned int timeout); CDMRSlot(unsigned int slotNo, unsigned int timeout);
@ -54,16 +46,16 @@ public:
static void init(unsigned int colorCode, CModem* modem, CHomebrewDMRIPSC* network, IDisplay* display); static void init(unsigned int colorCode, CModem* modem, CHomebrewDMRIPSC* network, IDisplay* display);
private: private:
unsigned int m_slotNo; unsigned int m_slotNo;
CRingBuffer<unsigned char> m_queue; CRingBuffer<unsigned char> m_queue;
SLOT_STATE m_state; RPT_STATE m_state;
CEmbeddedLC m_embeddedLC; CEmbeddedLC m_embeddedLC;
CLC* m_lc; CLC* m_lc;
unsigned char m_seqNo; unsigned char m_seqNo;
unsigned char m_n; unsigned char m_n;
CTimer m_networkWatchdog; CTimer m_networkWatchdog;
CTimer m_timeoutTimer; CTimer m_timeoutTimer;
FILE* m_fp; FILE* m_fp;
static unsigned int m_colorCode; static unsigned int m_colorCode;
static CModem* m_modem; static CModem* m_modem;

9
Defines.h
View file

@ -29,4 +29,13 @@ const unsigned char TAG_DATA = 0x01U;
const unsigned char TAG_LOST = 0x02U; const unsigned char TAG_LOST = 0x02U;
const unsigned char TAG_EOT = 0x03U; const unsigned char TAG_EOT = 0x03U;
enum RPT_STATE {
RS_LISTENING,
RS_LATE_ENTRY,
RS_RELAYING_RF_AUDIO,
RS_RELAYING_NETWORK_AUDIO,
RS_RELAYING_RF_DATA,
RS_RELAYING_NETWORK_DATA
};
#endif #endif