correct strangness with queue size errors;

3.0-rcon_maint
Bryan Biedenkapp 3 years ago
parent 180e94e324
commit beded631cf

@ -1940,7 +1940,7 @@ bool Host::createModem()
uint32_t dmrQueueSize = dmrProtocol["queueSize"].as<uint32_t>(24U);
// clamp queue size to no less then 24 and no greater the 100
if (dmrQueueSize <= 24U) {
if (dmrQueueSize < 24U) {
LogWarning(LOG_HOST, "DMR queue size must be greater then 24 frames, defaulting to 24 frames!");
dmrQueueSize = 24U;
}
@ -1958,7 +1958,7 @@ bool Host::createModem()
uint32_t p25QueueSize = p25Protocol["queueSize"].as<uint16_t>(12U);
// clamp queue size to no less then 12 and no greater the 100 frames
if (p25QueueSize <= 12U) {
if (p25QueueSize < 12U) {
LogWarning(LOG_HOST, "P25 queue size must be greater then 12 frames, defaulting to 12 frames!");
p25QueueSize = 12U;
}
@ -1976,7 +1976,7 @@ bool Host::createModem()
uint32_t nxdnQueueSize = nxdnProtocol["queueSize"].as<uint32_t>(31U);
// clamp queue size to no less then 31 and no greater the 50 frames
if (nxdnQueueSize <= 31U) {
if (nxdnQueueSize < 31U) {
LogWarning(LOG_HOST, "NXDN queue size must be greater then 31 frames, defaulting to 31 frames!");
nxdnQueueSize = 31U;
}
@ -1984,9 +1984,6 @@ bool Host::createModem()
LogWarning(LOG_HOST, "NXDN queue size must be less then 50 frames, defaulting to 50 frames!");
nxdnQueueSize = 50U;
}
if (nxdnQueueSize > 30U) {
LogWarning(LOG_HOST, "NXDN queue size is excessive, >30 frames!");
}
m_nxdnQueueSizeBytes = nxdnQueueSize * nxdn::NXDN_FRAME_LENGTH_BYTES;
@ -2118,11 +2115,6 @@ bool Host::createModem()
if (portType == PTY_PORT) {
#if !defined(_WIN32) && !defined(_WIN64)
/*
modemPort = new port::PseudoPTYPort(uartPort, serialSpeed, true);
LogInfo(" PTY File: %s", uartPort.c_str());
LogInfo(" PTY Speed: %u", uartSpeed);
*/
modemPort = new port::UARTPort(uartPort, serialSpeed, false);
LogInfo(" PTY Port: %s", uartPort.c_str());
LogInfo(" PTY Speed: %u", uartSpeed);

Loading…
Cancel
Save

Powered by TurnKey Linux.