using namespace std;
CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm, const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, uint16_t iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) :
- m_iLogicalAddress(iLogicalAddress),
+ m_iLogicalAddress(CECDEVICE_UNKNOWN),
m_strDeviceName(strDeviceName),
m_communication(serComm),
m_controller(controller),
m_bMonitor(false)
{
- for (unsigned int iPtr = 0; iPtr < 16; iPtr++)
+ for (int iPtr = 0; iPtr < 16; iPtr++)
m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, iPtr == iLogicalAddress ? iPhysicalAddress : 0);
}
CCECProcessor::~CCECProcessor(void)
{
+ m_startCondition.Broadcast();
StopThread();
m_communication = NULL;
m_controller = NULL;
bool CCECProcessor::Start(void)
{
+ CLockObject lock(&m_mutex);
if (!m_communication || !m_communication->IsOpen())
{
m_controller->AddLog(CEC_LOG_ERROR, "connection is closed");
}
if (CreateThread())
+ {
+ if (!m_startCondition.Wait(&m_mutex))
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+ return false;
+ }
return true;
+ }
else
m_controller->AddLog(CEC_LOG_ERROR, "could not create a processor thread");
void *CCECProcessor::Process(void)
{
- m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ {
+ CLockObject lock(&m_mutex);
+ m_controller->AddLog(CEC_LOG_DEBUG, "processor thread started");
+ m_startCondition.Signal();
+ }
- cec_command command;
- cec_adapter_message msg;
+ cec_command command;
+ CCECAdapterMessage msg;
+ CCECAdapterMessagePtr msgPtr;
+
+ m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
while (!IsStopped())
{
bool bParseFrame(false);
- bool bError(false);
- bool bTransmitSucceeded(false);
command.clear();
msg.clear();
{
CLockObject lock(&m_mutex);
- if (m_communication->IsOpen() && m_communication->Read(msg, 50))
- ParseMessage(msg, &bError, &bTransmitSucceeded, &bParseFrame);
+ 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 */)
+cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress)
{
- CLockObject lock(&m_mutex);
- if (!m_communication || !m_communication->Write(data))
- return false;
+ return m_busDevices[iAddress]->GetCecVersion();
+}
- if (bWaitForAck)
- {
- uint64_t now = GetTimeMs();
- uint64_t target = now + 1000;
- bool bError(false);
- bool bGotAck(false);
+bool CCECProcessor::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language)
+{
+ *language = m_busDevices[iAddress]->GetMenuLanguage();
+ return (strcmp(language->language, "???"));
+}
- while (!bGotAck && now < target)
- {
- bGotAck = WaitForAck(&bError, (uint32_t) (target - now));
- now = GetTimeMs();
+bool CCECProcessor::Transmit(const cec_command &data)
+{
+ bool bReturn(false);
+ LogOutput(data);
+
+ CCECAdapterMessagePtr output(new CCECAdapterMessage(data));
- if (bError && now < target)
+ CLockObject lock(&m_mutex);
+ {
+ CLockObject msgLock(&output->mutex);
+ if (!m_communication || !m_communication->Write(output))
+ return bReturn;
+ else
+ {
+ output->condition.Wait(&output->mutex);
+ if (output->state != ADAPTER_MESSAGE_STATE_SENT)
{
- m_controller->AddLog(CEC_LOG_ERROR, "retransmitting previous frame");
- if (!m_communication->Write(data))
- return false;
+ m_controller->AddLog(CEC_LOG_ERROR, "command was not sent");
+ return bReturn;
}
}
+
+ if (data.ack_timeout > 0)
+ {
+ bool bError(false);
+ if ((bReturn = WaitForAck(&bError, output->size(), data.ack_timeout)) == false)
+ m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
+ }
+ else
+ {
+ bReturn = true;
+ }
}
- return true;
+ return bReturn;
}
void CCECProcessor::TransmitAbort(cec_logical_address address, cec_opcode opcode, ECecAbortReason reason /* = CEC_ABORT_REASON_UNRECOGNIZED_OPCODE */)
Transmit(command);
}
-bool CCECProcessor::WaitForAck(bool *bError, uint32_t iTimeout /* = 1000 */)
+bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout /* = 1000 */)
{
- bool bTransmitSucceeded = false, bEom = false;
+ bool bTransmitSucceeded = false;
+ uint8_t iPacketsLeft(iLength / 4);
*bError = false;
int64_t iNow = GetTimeMs();
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))
{
continue;
}
- ParseMessage(msg, bError, &bTransmitSucceeded, &bEom, false);
+ switch(msg.message())
+ {
+ case MSGCODE_TIMEOUT_ERROR:
+ case MSGCODE_HIGH_ERROR:
+ case MSGCODE_LOW_ERROR:
+ {
+ CStdString logStr;
+ if (msg.message() == MSGCODE_TIMEOUT_ERROR)
+ logStr = "MSGCODE_TIMEOUT";
+ 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;
+ logStr.AppendFormat(" line:%i", iLine);
+ logStr.AppendFormat(" time:%u", iTime);
+ m_controller->AddLog(CEC_LOG_WARNING, logStr.c_str());
+ *bError = true;
+ }
+ break;
+ case MSGCODE_COMMAND_ACCEPTED:
+ m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED");
+ iPacketsLeft--;
+ break;
+ case MSGCODE_TRANSMIT_SUCCEEDED:
+ m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED");
+ bTransmitSucceeded = (iPacketsLeft == 0);
+ *bError = !bTransmitSucceeded;
+ break;
+ case MSGCODE_RECEIVE_FAILED:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED");
+ *bError = true;
+ break;
+ case MSGCODE_COMMAND_REJECTED:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED");
+ *bError = true;
+ break;
+ case MSGCODE_TRANSMIT_FAILED_LINE:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE");
+ *bError = true;
+ break;
+ case MSGCODE_TRANSMIT_FAILED_ACK:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK");
+ *bError = true;
+ break;
+ case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA");
+ *bError = true;
+ break;
+ case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE:
+ m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE");
+ *bError = true;
+ break;
+ default:
+ CCECAdapterMessagePtr msgPtr = CCECAdapterMessagePtr(new CCECAdapterMessage(msg));
+ m_frameBuffer.Push(msgPtr);
+ break;
+ }
+
iNow = GetTimeMs();
}
return bTransmitSucceeded && !*bError;
}
-void CCECProcessor::ParseMessage(cec_adapter_message &msg, bool *bError, bool *bTransmitSucceeded, bool *bEom, bool bProcessMessages /* = true */)
+bool CCECProcessor::ParseMessage(CCECAdapterMessagePtr msg)
{
- *bError = false;
- *bTransmitSucceeded = false;
- *bEom = false;
+ bool bEom = false;
- if (msg.empty())
- return;
+ 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());
- *bError = true;
}
break;
case MSGCODE_FRAME_START:
{
- if (bProcessMessages)
- {
- logStr = "MSGCODE_FRAME_START";
- m_currentframe.clear();
- 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();
- }
- m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
- }
- else
+ logStr = "MSGCODE_FRAME_START";
+ m_currentframe.clear();
+ if (msg->size() >= 2)
{
- m_frameBuffer.Push(msg);
+ 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());
}
break;
case MSGCODE_FRAME_DATA:
{
- if (bProcessMessages)
+ logStr = "MSGCODE_FRAME_DATA";
+ if (msg->size() >= 2)
{
- logStr = "MSGCODE_FRAME_DATA";
- if (msg.size() >= 2)
- {
- uint8_t iData = msg[1];
- logStr.AppendFormat(" %02x", iData);
- m_currentframe.push_back(iData);
- m_currentframe.eom = msg.eom();
- }
- m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
- }
- else
- {
- m_frameBuffer.Push(msg);
+ uint8_t iData = msg->at(1);
+ logStr.AppendFormat(" %02x", iData);
+ m_currentframe.push_back(iData);
+ 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:
break;
case MSGCODE_TRANSMIT_SUCCEEDED:
m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED");
- *bTransmitSucceeded = true;
break;
case MSGCODE_RECEIVE_FAILED:
m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED");
- *bError = true;
break;
case MSGCODE_COMMAND_REJECTED:
m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED");
- *bError = true;
break;
case MSGCODE_TRANSMIT_FAILED_LINE:
m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE");
- *bError = true;
break;
case MSGCODE_TRANSMIT_FAILED_ACK:
m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK");
- *bError = true;
break;
case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA:
m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA");
- *bError = true;
break;
case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE:
m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE");
- *bError = true;
break;
default:
break;
}
+
+ return bEom;
}
void CCECProcessor::ParseCommand(cec_command &command)
repositories / deb_libcec.git / blobdiff