#include "LibCEC.h"
#include "platform/serialport.h"
#include "util/StdString.h"
+#include "platform/timeutils.h"
using namespace std;
using namespace CEC;
CAdapterCommunication::CAdapterCommunication(CLibCEC *controller) :
m_port(NULL),
- m_controller(controller),
- m_inbuf(NULL),
- m_iInbufSize(0),
- m_iInbufUsed(0)
+ m_controller(controller)
{
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 */, uint32_t iTimeoutMs /* = 10000 */)
//clear any input bytes
uint8_t buff[1024];
- m_port->Read(buff, sizeof(buff), 50);
-
- Sleep(CEC_SETTLE_DOWN_TIME);
+ m_port->Read(buff, sizeof(buff), 500);
if (CreateThread())
{
CLockObject lock(&m_commMutex);
StopThread();
- if (m_inbuf)
- {
- free(m_inbuf);
- m_inbuf = NULL;
- m_iInbufSize = 0;
- m_iInbufUsed = 0;
- }
-
m_rcvCondition.Broadcast();
}
while (!IsStopped())
{
- {
- CLockObject lock(&m_commMutex);
- ReadFromDevice(100);
- }
-
- if (!IsStopped())
- Sleep(5);
+ ReadFromDevice(100);
+ WriteNextCommand();
+ Sleep(5);
}
return NULL;
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);
- if (m_iInbufUsed + iLen > m_iInbufSize)
- {
- m_iInbufSize = m_iInbufUsed + iLen;
- m_inbuf = (uint8_t*)realloc(m_inbuf, m_iInbufSize);
- }
-
- memcpy(m_inbuf + m_iInbufUsed, data, iLen);
- m_iInbufUsed += iLen;
+ for (unsigned int iPtr = 0; iPtr < iLen; iPtr++)
+ m_inBuffer.Push(data[iPtr]);
m_rcvCondition.Signal();
}
-bool CAdapterCommunication::Write(const cec_frame &data)
+void CAdapterCommunication::WriteNextCommand(void)
{
CLockObject lock(&m_commMutex);
- if (m_port->Write(data) != (int32_t) data.size)
+ CCECAdapterMessage msg;
+ if (m_outBuffer.Pop(msg))
{
- CStdString strError;
- strError.Format("error writing to serial port: %s", m_port->GetError().c_str());
- m_controller->AddLog(CEC_LOG_ERROR, strError);
- return false;
+ 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);
+ }
+ 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)*/);
+ }
}
+}
- m_controller->AddLog(CEC_LOG_DEBUG, "command sent");
- CCondition::Sleep((uint32_t) data.size * (uint32_t)24 /*data*/ + (uint32_t)5 /*start bit (4.5 ms)*/);
-
+bool CAdapterCommunication::Write(const CCECAdapterMessage &data)
+{
+ m_outBuffer.Push(data);
return true;
}
-bool CAdapterCommunication::Read(cec_frame &msg, uint32_t iTimeout)
+bool CAdapterCommunication::Read(CCECAdapterMessage &msg, uint32_t iTimeout)
{
CLockObject lock(&m_bufferMutex);
- if (m_iInbufUsed < 1)
- {
- if (!m_rcvCondition.Wait(&m_bufferMutex, iTimeout))
- return false;
- }
+ msg.clear();
+ uint64_t iNow = GetTimeMs();
+ uint64_t iTarget = iNow + iTimeout;
+ bool bGotFullMessage(false);
+ bool bNextIsEscaped(false);
+ bool bGotStart(false);
- if (m_iInbufUsed < 1 || IsStopped())
- return false;
-
- //search for first start of message
- int16_t startpos = -1;
- for (int16_t iPtr = 0; iPtr < m_iInbufUsed; iPtr++)
+ while(!bGotFullMessage && iNow < iTarget)
{
- if (m_inbuf[iPtr] == MSGSTART)
+ uint8_t buf = 0;
+ if (!m_inBuffer.Pop(buf))
{
- startpos = iPtr;
- break;
+ if (!m_rcvCondition.Wait(&m_bufferMutex, iTarget - iNow))
+ return false;
}
- }
-
- if (startpos == -1)
- return false;
-
- //move anything from the first start of message to the beginning of the buffer
- if (startpos > 0)
- {
- memmove(m_inbuf, m_inbuf + startpos, m_iInbufUsed - startpos);
- m_iInbufUsed -= startpos;
- }
- if (m_iInbufUsed < 2)
- return false;
-
- //look for end of message
- startpos = -1;
- int16_t endpos = -1;
- for (int16_t iPtr = 1; iPtr < m_iInbufUsed; iPtr++)
- {
- if (m_inbuf[iPtr] == MSGEND)
+ if (!bGotStart)
{
- endpos = iPtr;
- break;
+ if (buf == MSGSTART)
+ bGotStart = true;
+ continue;
}
- else if (m_inbuf[iPtr] == MSGSTART)
+ else if (buf == MSGSTART) //we found a msgstart before msgend, this is not right, remove
{
- startpos = iPtr;
- break;
+ m_controller->AddLog(CEC_LOG_ERROR, "received MSGSTART before MSGEND");
+ msg.clear();
+ bGotStart = true;
}
- }
- if (startpos > 0) //we found a msgstart before msgend, this is not right, remove
- {
- m_controller->AddLog(CEC_LOG_ERROR, "received MSGSTART before MSGEND");
- memmove(m_inbuf, m_inbuf + startpos, m_iInbufUsed - startpos);
- m_iInbufUsed -= startpos;
- return false;
- }
-
- if (endpos > 0) //found a MSGEND
- {
- msg.clear();
- bool isesc = false;
- for (int16_t iPtr = 1; iPtr < endpos; iPtr++)
+ if (buf == MSGEND)
{
- if (isesc)
- {
- msg.push_back(m_inbuf[iPtr] + (uint8_t)ESCOFFSET);
- isesc = false;
- }
- else if (m_inbuf[iPtr] == MSGESC)
- {
- isesc = true;
- }
- else
- {
- msg.push_back(m_inbuf[iPtr]);
- }
+ bGotFullMessage = true;
}
-
- if (endpos + 1 < m_iInbufUsed)
- memmove(m_inbuf, m_inbuf + endpos + 1, m_iInbufUsed - endpos - 1);
-
- m_iInbufUsed -= endpos + 1;
-
- return true;
+ else if (bNextIsEscaped)
+ {
+ msg.push_back(buf + (uint8_t)ESCOFFSET);
+ bNextIsEscaped = false;
+ }
+ else if (buf == MSGESC)
+ bNextIsEscaped = true;
+ else
+ msg.push_back(buf);
}
- return false;
+ return bGotFullMessage;
}
std::string CAdapterCommunication::GetError(void) const
return false;
m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
- cec_frame output;
- output.clear();
+ CCECAdapterMessage output;
output.push_back(MSGSTART);
- PushEscaped(output, MSGCODE_START_BOOTLOADER);
+ output.push_escaped(MSGCODE_START_BOOTLOADER);
output.push_back(MSGEND);
if (!Write(output))
return true;
}
-void CAdapterCommunication::PushEscaped(cec_frame &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_frame output;
- output.clear();
+ CCECAdapterMessage output;
output.push_back(MSGSTART);
- PushEscaped(output, MSGCODE_SET_ACK_MASK);
- PushEscaped(output, iMask >> 8);
- PushEscaped(output, (uint8_t)iMask);
+ 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_frame output;
- output.clear();
+ CCECAdapterMessage output;
output.push_back(MSGSTART);
- PushEscaped(output, MSGCODE_PING);
+ output.push_escaped(MSGCODE_PING);
output.push_back(MSGEND);
if (!Write(output))
repositories / deb_libcec.git / blobdiff