MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2026-02-05 06:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add extra debughing of the output queues.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-03-07 18:08:50 +00:00
parent 7e31a226de
commit bfb74d3155
5 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
DStarControl.cpp
View File

@@ -29,7 +29,7 @@ m_gateway(NULL),
m_network(network),
m_display(display),
m_duplex(duplex),
m_rfQueue(1000U, "D-Star Control"),
m_queue(1000U, "D-Star Control"),
m_rfHeader(),
m_netHeader(),
m_rfState(RS_RF_LISTENING),
@@ -343,7 +343,7 @@ bool CDStarControl::writeModem(unsigned char *data)
unsigned int CDStarControl::readModem(unsigned char* data)
{
if (m_rfQueue.isEmpty())
if (m_queue.isEmpty())
return 0U;
// Don't relay data until the timer has stopped.
@@ -351,9 +351,9 @@ unsigned int CDStarControl::readModem(unsigned char* data)
return 0U;
unsigned char len = 0U;
m_rfQueue.getData(&len, 1U);
m_queue.getData(&len, 1U);
m_rfQueue.getData(data, len);
m_queue.getData(data, len);
return len;
}
@@ -565,9 +565,16 @@ void CDStarControl::writeQueueHeaderRF(const unsigned char *data)
return;
unsigned char len = DSTAR_HEADER_LENGTH_BYTES + 1U;
m_rfQueue.addData(&len, 1U);
m_rfQueue.addData(data, len);
unsigned int space = m_queue.freeSpace();
if (space < (len + 1U)) {
LogError("D-Star, overflow in the D-Star RF queue");
return;
}
m_queue.addData(&len, 1U);
m_queue.addData(data, len);
}
void CDStarControl::writeQueueDataRF(const unsigned char *data)
@@ -581,9 +588,16 @@ void CDStarControl::writeQueueDataRF(const unsigned char *data)
return;
unsigned char len = DSTAR_FRAME_LENGTH_BYTES + 1U;
m_rfQueue.addData(&len, 1U);
m_rfQueue.addData(data, len);
unsigned int space = m_queue.freeSpace();
if (space < (len + 1U)) {
LogError("D-Star, overflow in the D-Star RF queue");
return;
}
m_queue.addData(&len, 1U);
m_queue.addData(data, len);
}
void CDStarControl::writeQueueEOTRF()
@@ -595,10 +609,17 @@ void CDStarControl::writeQueueEOTRF()
return;
unsigned char len = 1U;
m_rfQueue.addData(&len, 1U);
unsigned int space = m_queue.freeSpace();
if (space < (len + 1U)) {
LogError("D-Star, overflow in the D-Star RF queue");
return;
}
m_queue.addData(&len, 1U);
unsigned char data = TAG_EOT;
m_rfQueue.addData(&data, len);
m_queue.addData(&data, len);
}
void CDStarControl::writeQueueHeaderNet(const unsigned char *data)
@@ -609,9 +630,16 @@ void CDStarControl::writeQueueHeaderNet(const unsigned char *data)
return;
unsigned char len = DSTAR_HEADER_LENGTH_BYTES + 1U;
m_rfQueue.addData(&len, 1U);
m_rfQueue.addData(data, len);
unsigned int space = m_queue.freeSpace();
if (space < (len + 1U)) {
LogError("D-Star, overflow in the D-Star RF queue");
return;
}
m_queue.addData(&len, 1U);
m_queue.addData(data, len);
}
void CDStarControl::writeQueueDataNet(const unsigned char *data)
@@ -622,9 +650,16 @@ void CDStarControl::writeQueueDataNet(const unsigned char *data)
return;
unsigned char len = DSTAR_FRAME_LENGTH_BYTES + 1U;
m_rfQueue.addData(&len, 1U);
m_rfQueue.addData(data, len);
unsigned int space = m_queue.freeSpace();
if (space < (len + 1U)) {
LogError("D-Star, overflow in the D-Star RF queue");
return;
}
m_queue.addData(&len, 1U);
m_queue.addData(data, len);
}
void CDStarControl::writeQueueEOTNet()
@@ -633,10 +668,17 @@ void CDStarControl::writeQueueEOTNet()
return;
unsigned char len = 1U;
m_rfQueue.addData(&len, 1U);
unsigned int space = m_queue.freeSpace();
if (space < (len + 1U)) {
LogError("D-Star, overflow in the D-Star RF queue");
return;
}
m_queue.addData(&len, 1U);
unsigned char data = TAG_EOT;
m_rfQueue.addData(&data, len);
m_queue.addData(&data, len);
}
void CDStarControl::writeNetworkHeaderRF(const unsigned char* data)