{
m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
- cec_command command;
- cec_adapter_message msg;
+ cec_command command;
+ CCECAdapterMessage msg;
+ CCECAdapterMessagePtr msgPtr;
while (!IsStopped())
{
{
CLockObject lock(&m_mutex);
- if (m_communication->IsOpen() && m_communication->Read(msg, 50))
- bParseFrame = ParseMessage(msg);
+ if (m_frameBuffer.Pop(msgPtr))
+ bParseFrame = ParseMessage(msgPtr);
+ else if (m_communication->IsOpen() && m_communication->Read(msg, 50))
+ {
+ msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
+ bParseFrame = ParseMessage(msgPtr);
+ }
bParseFrame &= !IsStopped();
if (bParseFrame)
m_controller->AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
}
-bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
-{
- LogOutput(data);
-
- cec_adapter_message output;
- output.clear();
- CAdapterCommunication::FormatAdapterMessage(data, output);
-
- return TransmitFormatted(output, bWaitForAck);
-}
-
bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
{
- CStdString strLog;
- strLog.Format("<< setting logical address to %1x", iLogicalAddress);
- m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
+ if (m_iLogicalAddress != iLogicalAddress)
+ {
+ CStdString strLog;
+ strLog.Format("<< setting logical address to %1x", iLogicalAddress);
+ m_controller->AddLog(CEC_LOG_NOTICE, strLog.c_str());
- m_iLogicalAddress = iLogicalAddress;
- return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+ m_iLogicalAddress = iLogicalAddress;
+ return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+ }
+
+ return true;
}
bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
}
-bool CCECProcessor::TransmitFormatted(const cec_adapter_message &data, bool bWaitForAck /* = true */)
+bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
{
bool bReturn(false);
+ LogOutput(data);
+
+ CCECAdapterMessagePtr output(new CCECAdapterMessage(data));
+
CLockObject lock(&m_mutex);
- if (!m_communication || !m_communication->Write(data))
+ if (!m_communication || !m_communication->Write(output))
return bReturn;
if (bWaitForAck)
{
- uint64_t now = GetTimeMs();
- uint64_t target = now + 1000;
bool bError(false);
-
- while (!bReturn && now < target && !bError)
- {
- bReturn = WaitForAck(&bError, data.size(), (uint32_t) (target - now));
- now = GetTimeMs();
- }
-
- if (!bReturn)
+ if ((bReturn = WaitForAck(&bError, output->size(), 1000)) == false)
m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
}
else
while (!bTransmitSucceeded && !*bError && (iTimeout == 0 || iNow < iTargetTime))
{
- cec_adapter_message msg;
- msg.clear();
+ CCECAdapterMessage msg;
if (!m_communication->Read(msg, iTimeout > 0 ? (int32_t)(iTargetTime - iNow) : 1000))
{
*bError = true;
break;
default:
- m_frameBuffer.Push(msg);
+ CCECAdapterMessagePtr msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
+ m_frameBuffer.Push(msgPtr);
break;
}
return bTransmitSucceeded && !*bError;
}
-bool CCECProcessor::ParseMessage(cec_adapter_message &msg)
+bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg)
{
bool bEom = false;
- if (msg.empty())
+ if (msg->empty())
return bEom;
CStdString logStr;
- switch(msg.message())
+ switch(msg->message())
{
case MSGCODE_NOTHING:
m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_NOTHING");
case MSGCODE_HIGH_ERROR:
case MSGCODE_LOW_ERROR:
{
- if (msg.message() == MSGCODE_TIMEOUT_ERROR)
+ if (msg->message() == MSGCODE_TIMEOUT_ERROR)
logStr = "MSGCODE_TIMEOUT";
- else if (msg.message() == MSGCODE_HIGH_ERROR)
+ else if (msg->message() == MSGCODE_HIGH_ERROR)
logStr = "MSGCODE_HIGH_ERROR";
else
logStr = "MSGCODE_LOW_ERROR";
- int iLine = (msg.size() >= 3) ? (msg[1] << 8) | (msg[2]) : 0;
- uint32_t iTime = (msg.size() >= 7) ? (msg[3] << 24) | (msg[4] << 16) | (msg[5] << 8) | (msg[6]) : 0;
+ int iLine = (msg->size() >= 3) ? (msg->at(1) << 8) | (msg->at(2)) : 0;
+ uint32_t iTime = (msg->size() >= 7) ? (msg->at(3) << 24) | (msg->at(4) << 16) | (msg->at(5) << 8) | (msg->at(6)) : 0;
logStr.AppendFormat(" line:%i", iLine);
logStr.AppendFormat(" time:%u", iTime);
m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str());
{
logStr = "MSGCODE_FRAME_START";
m_currentframe.clear();
- if (msg.size() >= 2)
+ if (msg->size() >= 2)
{
- logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg.initiator(), msg.destination(), msg.ack() ? "high" : "low", msg.eom() ? "eom" : "");
- m_currentframe.initiator = msg.initiator();
- m_currentframe.destination = msg.destination();
- m_currentframe.ack = msg.ack();
- m_currentframe.eom = msg.eom();
+ logStr.AppendFormat(" initiator:%u destination:%u ack:%s %s", msg->initiator(), msg->destination(), msg->ack() ? "high" : "low", msg->eom() ? "eom" : "");
+ m_currentframe.initiator = msg->initiator();
+ m_currentframe.destination = msg->destination();
+ m_currentframe.ack = msg->ack();
+ m_currentframe.eom = msg->eom();
}
m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
}
case MSGCODE_FRAME_DATA:
{
logStr = "MSGCODE_FRAME_DATA";
- if (msg.size() >= 2)
+ if (msg->size() >= 2)
{
- uint8_t iData = msg[1];
+ uint8_t iData = msg->at(1);
logStr.AppendFormat(" %02x", iData);
m_currentframe.push_back(iData);
- m_currentframe.eom = msg.eom();
+ m_currentframe.eom = msg->eom();
}
m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
- bEom = msg.eom();
+ bEom = msg->eom();
}
break;
case MSGCODE_COMMAND_ACCEPTED: