m_strDeviceName(strDeviceName),
m_communication(serComm),
m_controller(controller),
- m_bMonitor(false)
+ m_bMonitor(false),
+ m_bLogicalAddressSet(false)
{
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;
- CCECAdapterMessage msg;
+ cec_command command;
+ CCECAdapterMessage msg;
+
+ m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
while (!IsStopped())
{
{
CLockObject lock(&m_mutex);
if (m_communication->IsOpen() && m_communication->Read(msg, 50))
- bParseFrame = ParseMessage(msg);
+ bParseFrame = ParseMessage(msg) && !IsStopped();
- bParseFrame &= !IsStopped();
if (bParseFrame)
command = m_currentframe;
}
if (!IsRunning())
return false;
- return m_busDevices[m_iLogicalAddress]->BroadcastActiveView();
+ if (m_iLogicalAddress != CECDEVICE_UNKNOWN && m_busDevices[m_iLogicalAddress])
+ return m_busDevices[m_iLogicalAddress]->BroadcastActiveView();
+ return false;
}
bool CCECProcessor::SetInactiveView(void)
if (!IsRunning())
return false;
- return m_busDevices[m_iLogicalAddress]->BroadcastInactiveView();
+ if (m_iLogicalAddress != CECDEVICE_UNKNOWN && m_busDevices[m_iLogicalAddress])
+ return m_busDevices[m_iLogicalAddress]->BroadcastInactiveView();
+ return false;
}
void CCECProcessor::LogOutput(const cec_command &data)
m_controller->AddLog(CEC_LOG_TRAFFIC, strTx.c_str());
}
-bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress)
+bool CCECProcessor::SetLogicalAddress(cec_logical_address iLogicalAddress /* = CECDEVICE_UNKNOWN */)
{
- if (m_iLogicalAddress != iLogicalAddress)
+ if (iLogicalAddress != CECDEVICE_UNKNOWN)
{
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_bLogicalAddressSet = false;
}
- return true;
+ if (!m_bLogicalAddressSet && m_iLogicalAddress != CECDEVICE_UNKNOWN)
+ m_bLogicalAddressSet = m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
+
+ return m_bLogicalAddressSet;
}
bool CCECProcessor::SetPhysicalAddress(uint16_t iPhysicalAddress)
{
- m_busDevices[m_iLogicalAddress]->SetPhysicalAddress(iPhysicalAddress);
- return m_busDevices[m_iLogicalAddress]->BroadcastActiveView();
+ if (m_iLogicalAddress != CECDEVICE_UNKNOWN && m_busDevices[m_iLogicalAddress])
+ {
+ m_busDevices[m_iLogicalAddress]->SetPhysicalAddress(iPhysicalAddress);
+ return m_busDevices[m_iLogicalAddress]->BroadcastActiveView();
+ }
+ return false;
}
bool CCECProcessor::SwitchMonitoring(bool bEnable)
return m_communication && m_communication->SetAckMask(0x1 << (uint8_t)m_iLogicalAddress);
}
-bool CCECProcessor::Transmit(const cec_command &data, bool bWaitForAck /* = true */)
+cec_version CCECProcessor::GetDeviceCecVersion(cec_logical_address iAddress)
{
+ return m_busDevices[iAddress]->GetCecVersion();
+}
+
+bool CCECProcessor::GetDeviceMenuLanguage(cec_logical_address iAddress, cec_menu_language *language)
+{
+ if (m_busDevices[iAddress])
+ {
+ *language = m_busDevices[iAddress]->GetMenuLanguage();
+ return (strcmp(language->language, "???") == 0);
+ }
+ return false;
+}
+
+uint64_t CCECProcessor::GetDeviceVendorId(cec_logical_address iAddress)
+{
+ if (m_busDevices[iAddress])
+ return m_busDevices[iAddress]->GetVendorId();
+ return false;
+}
+
+cec_power_status CCECProcessor::GetDevicePowerStatus(cec_logical_address iAddress)
+{
+ if (m_busDevices[iAddress])
+ return m_busDevices[iAddress]->GetPowerStatus();
+ return CEC_POWER_STATUS_UNKNOWN;
+}
+
+bool CCECProcessor::Transmit(const cec_command &data)
+{
+ SetLogicalAddress();
+
bool bReturn(false);
LogOutput(data);
- CCECAdapterMessage output(data);
+ CCECAdapterMessagePtr output(new CCECAdapterMessage(data));
CLockObject lock(&m_mutex);
- if (!m_communication || !m_communication->Write(output))
- return bReturn;
-
- if (bWaitForAck)
{
- bool bError(false);
- if ((bReturn = WaitForAck(&bError, output.size(), 1000)) == false)
- m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
- }
- else
- {
- bReturn = true;
+ CLockObject msgLock(&output->mutex);
+ if (!m_communication || !m_communication->Write(output))
+ return bReturn;
+ else
+ {
+ output->condition.Wait(&output->mutex, 1000);
+ if (output->state != ADAPTER_MESSAGE_STATE_SENT)
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "command was not sent");
+ return bReturn;
+ }
+ }
+
+ if (data.transmit_timeout > 0)
+ {
+ if ((bReturn = WaitForTransmitSucceeded(output->size(), data.transmit_timeout)) == false)
+ m_controller->AddLog(CEC_LOG_ERROR, "did not receive ack");
+ }
+ else
+ bReturn = true;
}
return bReturn;
Transmit(command);
}
-bool CCECProcessor::WaitForAck(bool *bError, uint8_t iLength, uint32_t iTimeout /* = 1000 */)
+bool CCECProcessor::WaitForTransmitSucceeded(uint8_t iLength, uint32_t iTimeout /* = 1000 */)
{
- bool bTransmitSucceeded = false;
+ bool bError(false);
+ bool bTransmitSucceeded(false);
uint8_t iPacketsLeft(iLength / 4);
- *bError = false;
int64_t iNow = GetTimeMs();
int64_t iTargetTime = iNow + (uint64_t) iTimeout;
- while (!bTransmitSucceeded && !*bError && (iTimeout == 0 || iNow < iTargetTime))
+ while (!bTransmitSucceeded && !bError && (iTimeout == 0 || iNow < iTargetTime))
{
CCECAdapterMessage msg;
continue;
}
+ bError = msg.is_error();
+ m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
+
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;
+ bError = !bTransmitSucceeded;
break;
default:
- m_frameBuffer.Push(msg);
+ CStdString strLog;
+ strLog.Format("received unexpected reply '%1x' instead of ack", msg.message());
+ m_controller->AddLog(CEC_LOG_WARNING, strLog);
+ bError = true;
break;
}
iNow = GetTimeMs();
}
- return bTransmitSucceeded && !*bError;
+ return bTransmitSucceeded && !bError;
}
-bool CCECProcessor::ParseMessage(CCECAdapterMessage &msg)
+bool CCECProcessor::ParseMessage(const CCECAdapterMessage &msg)
{
bool bEom = false;
if (msg.empty())
return bEom;
- CStdString logStr;
+ m_controller->AddLog(msg.is_error() ? CEC_LOG_WARNING : CEC_LOG_DEBUG, msg.ToString());
switch(msg.message())
{
- case MSGCODE_NOTHING:
- m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_NOTHING");
- break;
- case MSGCODE_TIMEOUT_ERROR:
- case MSGCODE_HIGH_ERROR:
- case MSGCODE_LOW_ERROR:
- {
- 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());
- }
- break;
case MSGCODE_FRAME_START:
{
- 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());
}
break;
case MSGCODE_FRAME_DATA:
{
- logStr = "MSGCODE_FRAME_DATA";
if (msg.size() >= 2)
{
- uint8_t iData = msg[1];
- logStr.AppendFormat(" %02x", iData);
- m_currentframe.push_back(iData);
+ m_currentframe.push_back(msg[1]);
m_currentframe.eom = msg.eom();
}
- m_controller->AddLog(CEC_LOG_DEBUG, logStr.c_str());
-
bEom = msg.eom();
}
break;
- case MSGCODE_COMMAND_ACCEPTED:
- m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_COMMAND_ACCEPTED");
- break;
- case MSGCODE_TRANSMIT_SUCCEEDED:
- m_controller->AddLog(CEC_LOG_DEBUG, "MSGCODE_TRANSMIT_SUCCEEDED");
- break;
- case MSGCODE_RECEIVE_FAILED:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_RECEIVE_FAILED");
- break;
- case MSGCODE_COMMAND_REJECTED:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_COMMAND_REJECTED");
- break;
- case MSGCODE_TRANSMIT_FAILED_LINE:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_LINE");
- break;
- case MSGCODE_TRANSMIT_FAILED_ACK:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_ACK");
- break;
- case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA");
- break;
- case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE:
- m_controller->AddLog(CEC_LOG_WARNING, "MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE");
- break;
default:
break;
}
uint16_t CCECProcessor::GetPhysicalAddress(void) const
{
- return m_busDevices[m_iLogicalAddress]->GetPhysicalAddress();
+ if (m_iLogicalAddress != CECDEVICE_UNKNOWN && m_busDevices[m_iLogicalAddress])
+ return m_busDevices[m_iLogicalAddress]->GetPhysicalAddress();
+ return false;
}
void CCECProcessor::SetCurrentButton(cec_user_control_code iButtonCode)
repositories / deb_libcec.git / blobdiff