if (byte >= MSGESC && byte != MSGSTART)
{
push_back(MSGESC);
- push_back(byte - ESCOFFSET);
+ push_back((uint8_t) (byte - ESCOFFSET));
}
else
- push_back(byte);
+ push_back((uint8_t) byte);
}
CAdapterCommunication::CAdapterCommunication(CLibCEC *controller) :
bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
{
+ CLockObject lock(&m_mutex);
if (!m_port)
{
m_controller->AddLog(CEC_LOG_ERROR, "port is NULL");
if (CreateThread())
{
- m_controller->AddLog(CEC_LOG_DEBUG, "communication thread created");
+ m_startCondition.Wait(&m_mutex);
+ m_controller->AddLog(CEC_LOG_DEBUG, "communication thread started");
return true;
}
else
void CAdapterCommunication::Close(void)
{
- StopThread();
-
+ CLockObject lock(&m_mutex);
+ m_startCondition.Broadcast();
m_rcvCondition.Broadcast();
+ StopThread();
}
void *CAdapterCommunication::Process(void)
{
- m_controller->AddLog(CEC_LOG_DEBUG, "communication thread started");
+ {
+ CLockObject lock(&m_mutex);
+ m_startCondition.Signal();
+ }
while (!IsStopped())
{
void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
{
- CLockObject lock(&m_bufferMutex);
+ CLockObject lock(&m_mutex);
for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
m_inBuffer.Push(data[iPtr]);
void CAdapterCommunication::WriteNextCommand(void)
{
- CCECAdapterMessage msg;
+ CCECAdapterMessagePtr msg;
if (m_outBuffer.Pop(msg))
{
- if (m_port->Write(msg) != (int32_t) msg.size())
+ CLockObject lock(&msg->mutex);
+ if (m_port->Write(msg) != (int32_t) msg->size())
{
CStdString strError;
strError.Format("error writing to serial port: %s", m_port->GetError().c_str());
m_controller->AddLog(CEC_LOG_ERROR, strError);
+ msg->state = ADAPTER_MESSAGE_STATE_ERROR;
}
else
{
m_controller->AddLog(CEC_LOG_DEBUG, "command sent");
- CCondition::Sleep((uint32_t) msg.size() * (uint32_t)24 /*data*/ + (uint32_t)5 /*start bit (4.5 ms)*/);
+ CCondition::Sleep((uint32_t) msg->size() * (uint32_t)24 /*data*/ + (uint32_t)5 /*start bit (4.5 ms)*/);
+ msg->state = ADAPTER_MESSAGE_STATE_SENT;
}
+ msg->condition.Signal();
}
}
-bool CAdapterCommunication::Write(const CCECAdapterMessage &data)
+bool CAdapterCommunication::Write(CCECAdapterMessagePtr data)
{
+ data->state = ADAPTER_MESSAGE_STATE_WAITING;
m_outBuffer.Push(data);
return true;
}
bool CAdapterCommunication::Read(CCECAdapterMessage &msg, uint32_t iTimeout)
{
- CLockObject lock(&m_bufferMutex);
+ CLockObject lock(&m_mutex);
msg.clear();
uint64_t iNow = GetTimeMs();
uint8_t buf = 0;
if (!m_inBuffer.Pop(buf))
{
- if (!m_rcvCondition.Wait(&m_bufferMutex, iTarget - iNow))
+ if (!m_rcvCondition.Wait(&m_mutex, (uint32_t) (iTarget - iNow)))
return false;
}
msg.push_back(buf);
}
+ if (bGotFullMessage)
+ msg.state = ADAPTER_MESSAGE_STATE_RECEIVED;
+
return bGotFullMessage;
}
return false;
m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
- CCECAdapterMessage output;
+ CCECAdapterMessagePtr output(new CCECAdapterMessage);
- output.push_back(MSGSTART);
- output.push_escaped(MSGCODE_START_BOOTLOADER);
- output.push_back(MSGEND);
+ output->push_back(MSGSTART);
+ output->push_escaped(MSGCODE_START_BOOTLOADER);
+ output->push_back(MSGEND);
if (!Write(output))
{
strLog.Format("setting ackmask to %2x", iMask);
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
- CCECAdapterMessage output;
+ CCECAdapterMessagePtr output(new CCECAdapterMessage);
- output.push_back(MSGSTART);
- output.push_escaped(MSGCODE_SET_ACK_MASK);
- output.push_escaped(iMask >> 8);
- output.push_escaped((uint8_t)iMask);
- output.push_back(MSGEND);
+ output->push_back(MSGSTART);
+ output->push_escaped(MSGCODE_SET_ACK_MASK);
+ output->push_escaped(iMask >> 8);
+ output->push_escaped((uint8_t)iMask);
+ output->push_back(MSGEND);
if (!Write(output))
{
return false;
m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
- CCECAdapterMessage output;
+ CCECAdapterMessagePtr output(new CCECAdapterMessage);
- output.push_back(MSGSTART);
- output.push_escaped(MSGCODE_PING);
- output.push_back(MSGEND);
+ output->push_back(MSGSTART);
+ output->push_escaped(MSGCODE_PING);
+ output->push_back(MSGEND);
if (!Write(output))
{
bool CAdapterCommunication::IsOpen(void) const
{
- return !IsStopped() && m_port->IsOpen();
+ return !IsStopped() && m_port->IsOpen() && IsRunning();
}