using namespace std;
using namespace CEC;
+CCECAdapterMessage::CCECAdapterMessage(const cec_command &command)
+{
+ clear();
+
+ //set ack polarity to high when transmitting to the broadcast address
+ //set ack polarity low when transmitting to any other address
+ push_back(MSGSTART);
+ push_escaped(MSGCODE_TRANSMIT_ACK_POLARITY);
+ if (command.destination == CECDEVICE_BROADCAST)
+ push_escaped(CEC_TRUE);
+ else
+ push_escaped(CEC_FALSE);
+ push_back(MSGEND);
+
+ // add source and destination
+ push_back(MSGSTART);
+ push_escaped(MSGCODE_TRANSMIT);
+ push_back(((uint8_t)command.initiator << 4) + (uint8_t)command.destination);
+ push_back(MSGEND);
+
+ // add opcode
+ push_back(MSGSTART);
+ push_escaped(command.parameters.empty() ? (uint8_t)MSGCODE_TRANSMIT_EOM : (uint8_t)MSGCODE_TRANSMIT);
+ push_back((uint8_t) command.opcode);
+ push_back(MSGEND);
+
+ // add parameters
+ for (int8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+ {
+ push_back(MSGSTART);
+
+ if (iPtr == command.parameters.size - 1)
+ push_escaped( MSGCODE_TRANSMIT_EOM);
+ else
+ push_escaped(MSGCODE_TRANSMIT);
+
+ push_escaped(command.parameters[iPtr]);
+
+ push_back(MSGEND);
+ }
+}
+
+CCECAdapterMessage &CCECAdapterMessage::operator =(const CCECAdapterMessage &msg)
+{
+ packet = msg.packet;
+ return *this;
+}
+
+void CCECAdapterMessage::push_escaped(int16_t byte)
+{
+ if (byte >= MSGESC && byte != MSGSTART)
+ {
+ push_back(MSGESC);
+ push_back((uint8_t) (byte - ESCOFFSET));
+ }
+ else
+ push_back((uint8_t) byte);
+}
+
CAdapterCommunication::CAdapterCommunication(CLibCEC *controller) :
m_port(NULL),
m_controller(controller)
bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
{
- CLockObject lock(&m_commMutex);
+ 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)
{
- CLockObject lock(&m_commMutex);
- 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())
{
- ReadFromDevice(100);
+ ReadFromDevice(500);
WriteNextCommand();
Sleep(5);
}
bool CAdapterCommunication::ReadFromDevice(uint32_t iTimeout)
{
- CLockObject lock(&m_commMutex);
int32_t iBytesRead;
uint8_t buff[1024];
if (!m_port)
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)
{
- CLockObject lock(&m_commMutex);
- cec_adapter_message 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 cec_adapter_message &data)
+bool CAdapterCommunication::Write(CCECAdapterMessagePtr data)
{
+ data->state = ADAPTER_MESSAGE_STATE_WAITING;
m_outBuffer.Push(data);
return true;
}
-bool CAdapterCommunication::Read(cec_adapter_message &msg, uint32_t iTimeout)
+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");
- cec_adapter_message output;
- output.clear();
+ CCECAdapterMessagePtr output(new CCECAdapterMessage);
- output.push_back(MSGSTART);
- PushEscaped(output, MSGCODE_START_BOOTLOADER);
- output.push_back(MSGEND);
+ output->push_back(MSGSTART);
+ output->push_escaped(MSGCODE_START_BOOTLOADER);
+ output->push_back(MSGEND);
if (!Write(output))
{
return true;
}
-void CAdapterCommunication::PushEscaped(cec_adapter_message &vec, uint8_t byte)
-{
- if (byte >= MSGESC && byte != MSGSTART)
- {
- vec.push_back(MSGESC);
- vec.push_back(byte - ESCOFFSET);
- }
- else
- {
- vec.push_back(byte);
- }
-}
-
bool CAdapterCommunication::SetAckMask(uint16_t iMask)
{
if (!IsRunning())
strLog.Format("setting ackmask to %2x", iMask);
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
- cec_adapter_message output;
- output.clear();
+ CCECAdapterMessagePtr output(new CCECAdapterMessage);
- output.push_back(MSGSTART);
- PushEscaped(output, MSGCODE_SET_ACK_MASK);
- PushEscaped(output, iMask >> 8);
- PushEscaped(output, (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");
- cec_adapter_message output;
- output.clear();
+ CCECAdapterMessagePtr output(new CCECAdapterMessage);
- output.push_back(MSGSTART);
- PushEscaped(output, 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();
}
-
-void CAdapterCommunication::FormatAdapterMessage(const cec_command &command, cec_adapter_message &packet)
-{
- packet.clear();
-
- //set ack polarity to high when transmitting to the broadcast address
- //set ack polarity low when transmitting to any other address
- packet.push_back(MSGSTART);
- PushEscaped(packet, MSGCODE_TRANSMIT_ACK_POLARITY);
- if (command.destination == CECDEVICE_BROADCAST)
- PushEscaped(packet, CEC_TRUE);
- else
- PushEscaped(packet, CEC_FALSE);
- packet.push_back(MSGEND);
-
- // add source and destination
- packet.push_back(MSGSTART);
- PushEscaped(packet, MSGCODE_TRANSMIT);
- packet.push_back(((uint8_t)command.initiator << 4) + (uint8_t)command.destination);
- packet.push_back(MSGEND);
-
- // add opcode
- packet.push_back(MSGSTART);
- PushEscaped(packet, command.parameters.empty() ? (uint8_t)MSGCODE_TRANSMIT_EOM : (uint8_t)MSGCODE_TRANSMIT);
- packet.push_back((uint8_t) command.opcode);
- packet.push_back(MSGEND);
-
- // add parameters
- for (int8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
- {
- packet.push_back(MSGSTART);
-
- if (iPtr == command.parameters.size - 1)
- PushEscaped(packet, MSGCODE_TRANSMIT_EOM);
- else
- PushEscaped(packet, MSGCODE_TRANSMIT);
-
- PushEscaped(packet, command.parameters[iPtr]);
-
- packet.push_back(MSGEND);
- }
-}
-