m_controller(controller),
m_inbuf(NULL),
m_iInbufSize(0),
- m_iInbufUsed(0),
- m_bStarted(false),
- m_bStop(false)
+ m_iInbufUsed(0)
{
m_port = new CSerialPort;
}
delete m_port;
m_port = NULL;
}
+
+ if (m_inbuf)
+ free(m_inbuf);
}
-bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint64_t iTimeoutMs /* = 10000 */)
+bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
{
CLockObject lock(&m_commMutex);
- if (m_bStarted || !m_port)
+ if (!m_port)
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "port is NULL");
return false;
+ }
+
+ if (IsOpen())
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "port is already open");
+ }
if (!m_port->Open(strPort, iBaudRate))
{
if (CreateThread())
{
- m_controller->AddLog(CEC_LOG_DEBUG, "reader thread created");
- m_bStarted = true;
+ m_controller->AddLog(CEC_LOG_DEBUG, "communication thread created");
return true;
}
else
{
- m_controller->AddLog(CEC_LOG_DEBUG, "could not create a reader thread");
+ m_controller->AddLog(CEC_LOG_DEBUG, "could not create a communication thread");
}
return false;
void CAdapterCommunication::Close(void)
{
CLockObject lock(&m_commMutex);
- if (m_port)
- m_port->Close();
-
StopThread();
+
+ if (m_inbuf)
+ {
+ free(m_inbuf);
+ m_inbuf = NULL;
+ m_iInbufSize = 0;
+ m_iInbufUsed = 0;
+ }
+
+ m_rcvCondition.Broadcast();
}
void *CAdapterCommunication::Process(void)
{
m_controller->AddLog(CEC_LOG_DEBUG, "communication thread started");
- while (!m_bStop)
+ while (!IsStopped())
{
- CLockObject lock(&m_commMutex);
- if (!ReadFromDevice(250))
{
- m_bStarted = false;
- break;
+ CLockObject lock(&m_commMutex);
+ ReadFromDevice(100);
}
- if (!m_bStop)
- {
- lock.Leave();
- Sleep(50);
- }
+ if (!IsStopped())
+ Sleep(5);
}
- m_bStarted = false;
return NULL;
}
-bool CAdapterCommunication::ReadFromDevice(uint64_t iTimeout)
+bool CAdapterCommunication::ReadFromDevice(uint32_t iTimeout)
{
+ int32_t iBytesRead;
uint8_t buff[1024];
if (!m_port)
return false;
- int32_t iBytesRead = m_port->Read(buff, sizeof(buff), iTimeout);
+ iBytesRead = m_port->Read(buff, sizeof(buff), iTimeout);
if (iBytesRead < 0 || iBytesRead > 256)
{
CStdString strError;
else if (iBytesRead > 0)
AddData(buff, (uint8_t) iBytesRead);
- return true;
+ return iBytesRead > 0;
}
void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
{
CLockObject lock(&m_bufferMutex);
- if (iLen + m_iInbufUsed > m_iInbufSize)
+ if (m_iInbufUsed + iLen > m_iInbufSize)
{
- m_iInbufSize = iLen + m_iInbufUsed;
+ m_iInbufSize = m_iInbufUsed + iLen;
m_inbuf = (uint8_t*)realloc(m_inbuf, m_iInbufSize);
}
memcpy(m_inbuf + m_iInbufUsed, data, iLen);
m_iInbufUsed += iLen;
- lock.Leave();
- m_condition.Signal();
+
+ m_rcvCondition.Signal();
}
-bool CAdapterCommunication::Write(const cec_frame &data)
+bool CAdapterCommunication::Write(const cec_adapter_message &data)
{
CLockObject lock(&m_commMutex);
-
- if (m_port->Write(data) != (int) data.size())
+ if (m_port->Write(data) != (int32_t) data.size())
{
CStdString strError;
strError.Format("error writing to serial port: %s", m_port->GetError().c_str());
}
m_controller->AddLog(CEC_LOG_DEBUG, "command sent");
-
- Sleep((int) data.size() * 24 /*data*/ + 5 /*start bit (4.5 ms)*/ + 50 /* to be on the safe side */);
+ CCondition::Sleep((uint32_t) data.size() * (uint32_t)24 /*data*/ + (uint32_t)5 /*start bit (4.5 ms)*/);
return true;
}
-bool CAdapterCommunication::Read(cec_frame &msg, uint64_t iTimeout)
+bool CAdapterCommunication::Read(cec_adapter_message &msg, uint32_t iTimeout)
{
CLockObject lock(&m_bufferMutex);
if (m_iInbufUsed < 1)
- m_condition.Wait(&m_bufferMutex, iTimeout);
+ {
+ if (!m_rcvCondition.Wait(&m_bufferMutex, iTimeout))
+ return false;
+ }
- if (m_iInbufUsed < 1)
+ if (m_iInbufUsed < 1 || IsStopped())
return false;
//search for first start of message
- int startpos = -1;
- for (int i = 0; i < m_iInbufUsed; i++)
+ int16_t startpos = -1;
+ for (int16_t iPtr = 0; iPtr < m_iInbufUsed; iPtr++)
{
- if (m_inbuf[i] == MSGSTART)
+ if (m_inbuf[iPtr] == MSGSTART)
{
- startpos = i;
+ startpos = iPtr;
break;
}
}
//look for end of message
startpos = -1;
- int endpos = -1;
- for (int i = 1; i < m_iInbufUsed; i++)
+ int16_t endpos = -1;
+ for (int16_t iPtr = 1; iPtr < m_iInbufUsed; iPtr++)
{
- if (m_inbuf[i] == MSGEND)
+ if (m_inbuf[iPtr] == MSGEND)
{
- endpos = i;
+ endpos = iPtr;
break;
}
- else if (m_inbuf[i] == MSGSTART)
+ else if (m_inbuf[iPtr] == MSGSTART)
{
- startpos = i;
+ startpos = iPtr;
break;
}
}
{
msg.clear();
bool isesc = false;
- for (int i = 1; i < endpos; i++)
+ for (int16_t iPtr = 1; iPtr < endpos; iPtr++)
{
if (isesc)
{
- msg.push_back(m_inbuf[i] + (uint8_t)ESCOFFSET);
+ msg.push_back(m_inbuf[iPtr] + (uint8_t)ESCOFFSET);
isesc = false;
}
- else if (m_inbuf[i] == MSGESC)
+ else if (m_inbuf[iPtr] == MSGESC)
{
isesc = true;
}
else
{
- msg.push_back(m_inbuf[i]);
+ msg.push_back(m_inbuf[iPtr]);
}
}
return false;
m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
- cec_frame output;
+ cec_adapter_message output;
+ output.clear();
+
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_START_BOOTLOADER);
output.push_back(MSGEND);
return true;
}
-void CAdapterCommunication::PushEscaped(cec_frame &vec, uint8_t byte)
+void CAdapterCommunication::PushEscaped(cec_adapter_message &vec, uint8_t byte)
{
if (byte >= MSGESC && byte != MSGSTART)
{
strLog.Format("setting ackmask to %2x", iMask);
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
- cec_frame output;
+ cec_adapter_message output;
+ output.clear();
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_SET_ACK_MASK);
return false;
m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
- cec_frame output;
+ cec_adapter_message output;
+ output.clear();
+
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_PING);
output.push_back(MSGEND);
// TODO check for pong
return true;
}
+
+bool CAdapterCommunication::IsOpen(void) const
+{
+ return !IsStopped() && m_port->IsOpen();
+}
+
+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);
+ }
+}
+
repositories / deb_libcec.git / blobdiff