CUSBCECAdapterCommunication::CUSBCECAdapterCommunication(CCECProcessor *processor, const char *strPort, uint16_t iBaudRate /* = 38400 */) :
m_port(NULL),
m_processor(processor),
+ m_bHasData(false),
m_iLineTimeout(0),
m_iFirmwareVersion(CEC_FW_VERSION_UNKNOWN),
m_lastInitiator(CECDEVICE_UNKNOWN),
void CUSBCECAdapterCommunication::Close(void)
{
- CLockObject lock(m_mutex);
- m_rcvCondition.Broadcast();
+ SetAckMask(0);
+ {
+ CLockObject lock(m_mutex);
+ m_bHasData = true;
+ m_rcvCondition.Broadcast();
+ }
StopThread();
}
CCECAdapterMessage *msg(NULL);
if (m_outBuffer.Pop(msg))
- msg->condition.Broadcast();
+ msg->event.Broadcast();
if (m_port)
{
cec_adapter_message_state CUSBCECAdapterCommunication::Write(const cec_command &data, uint8_t iMaxTries, uint8_t iLineTimeout /* = 3 */, uint8_t iRetryLineTimeout /* = 3 */)
{
cec_adapter_message_state retVal(ADAPTER_MESSAGE_STATE_UNKNOWN);
+ if (!IsRunning())
+ return retVal;
CCECAdapterMessage *output = new CCECAdapterMessage(data);
bool CUSBCECAdapterCommunication::Write(CCECAdapterMessage *data)
{
- CLockObject lock(data->mutex);
data->state = ADAPTER_MESSAGE_STATE_WAITING_TO_BE_SENT;
m_outBuffer.Push(data);
- data->condition.Wait(data->mutex);
+ data->event.Wait();
if ((data->expectControllerAck && data->state != ADAPTER_MESSAGE_STATE_SENT_ACKED) ||
(!data->expectControllerAck && data->state != ADAPTER_MESSAGE_STATE_SENT))
bool CUSBCECAdapterCommunication::Read(cec_command &command, uint32_t iTimeout)
{
+ if (!IsRunning())
+ return false;
+
CCECAdapterMessage msg;
if (Read(msg, iTimeout))
{
if (!m_inBuffer.Pop(buf))
{
- if (iTimeout == 0 || !m_rcvCondition.Wait(m_mutex, iTimeout))
+ if (iTimeout == 0 || !m_rcvCondition.Wait(m_mutex, m_bHasData, iTimeout))
return false;
m_inBuffer.Pop(buf);
+ m_bHasData = m_inBuffer.Size() > 0;
}
if (buf)
{
msg.packet = buf->packet;
- msg.state = msg.state = ADAPTER_MESSAGE_STATE_INCOMING;
+ msg.state = ADAPTER_MESSAGE_STATE_INCOMING;
delete buf;
return true;
}
uint16_t CUSBCECAdapterCommunication::GetFirmwareVersion(void)
{
- CLockObject lock(m_mutex);
uint16_t iReturn(m_iFirmwareVersion);
if (!IsRunning())
return iReturn;
if (iReturn == CEC_FW_VERSION_UNKNOWN)
{
+ CLockObject lock(m_mutex);
CLibCEC::AddLog(CEC_LOG_DEBUG, "requesting the firmware version");
CCECAdapterMessage *output = new CCECAdapterMessage;
m_currentAdapterMessage.Clear();
m_bGotStart = false;
m_bNextIsEscaped = false;
+ m_bHasData = true;
m_rcvCondition.Signal();
}
else if (m_bNextIsEscaped)
if (iBytesRead < 0 || iBytesRead > 256)
{
CLibCEC::AddLog(CEC_LOG_ERROR, "error reading from serial port: %s", m_port->GetError().c_str());
+ StopThread(false);
return false;
}
else if (iBytesRead > 0)
void CUSBCECAdapterCommunication::SendMessageToAdapter(CCECAdapterMessage *msg)
{
CLockObject adapterLock(m_mutex);
- CLockObject lock(msg->mutex);
if (msg->tries == 1)
SetLineTimeout(msg->lineTimeout);
else
CLibCEC::AddLog(CEC_LOG_DEBUG, "did not receive ack");
}
}
- msg->condition.Signal();
+ msg->event.Signal();
}
void CUSBCECAdapterCommunication::WriteNextCommand(void)