repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: moved some logic to the cec_packet struct. fix package output
[deb_libcec.git]
/
src
/
lib
/
AdapterCommunication.cpp
diff --git
a/src/lib/AdapterCommunication.cpp
b/src/lib/AdapterCommunication.cpp
index d56ee168b642df7d2ab173677569c0271222ecdb..7b82053de77926180e56255b01120e561ce291b8 100644
(file)
--- a/
src/lib/AdapterCommunication.cpp
+++ b/
src/lib/AdapterCommunication.cpp
@@
-40,29
+40,42
@@
using namespace std;
using namespace CEC;
CAdapterCommunication::CAdapterCommunication(CLibCEC *controller) :
using namespace CEC;
CAdapterCommunication::CAdapterCommunication(CLibCEC *controller) :
+ m_port(NULL),
m_controller(controller),
m_inbuf(NULL),
m_iInbufSize(0),
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;
}
CAdapterCommunication::~CAdapterCommunication(void)
{
{
m_port = new CSerialPort;
}
CAdapterCommunication::~CAdapterCommunication(void)
{
- StopThread();
- m_port->Close();
- delete m_port;
- m_port = NULL;
+ Close();
+
+ if (m_port)
+ {
+ delete m_port;
+ m_port = NULL;
+ }
+
+ if (m_inbuf)
+ free(m_inbuf);
}
}
-bool CAdapterCommunication::Open(const char *strPort,
int iBaudRate /* = 38400 */, in
t iTimeoutMs /* = 10000 */)
+bool CAdapterCommunication::Open(const char *strPort,
uint16_t iBaudRate /* = 38400 */, uint32_
t iTimeoutMs /* = 10000 */)
{
CLockObject lock(&m_commMutex);
{
CLockObject lock(&m_commMutex);
- if (m_bStarted)
+ if (!m_port)
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "port is NULL");
return false;
return false;
+ }
+
+ if (IsOpen())
+ {
+ m_controller->AddLog(CEC_LOG_ERROR, "port is already open");
+ }
if (!m_port->Open(strPort, iBaudRate))
{
if (!m_port->Open(strPort, iBaudRate))
{
@@
-78,19
+91,16
@@
bool CAdapterCommunication::Open(const char *strPort, int iBaudRate /* = 38400 *
uint8_t buff[1024];
m_port->Read(buff, sizeof(buff), 50);
uint8_t buff[1024];
m_port->Read(buff, sizeof(buff), 50);
- CCondition::Sleep(CEC_SETTLE_DOWN_TIME);
-
- m_bStop = false;
- m_bStarted = true;
+ Sleep(CEC_SETTLE_DOWN_TIME);
if (CreateThread())
{
if (CreateThread())
{
- m_controller->AddLog(CEC_LOG_DEBUG, "
reader
thread created");
+ m_controller->AddLog(CEC_LOG_DEBUG, "
communication
thread created");
return true;
}
else
{
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;
}
return false;
@@
-98,39
+108,47
@@
bool CAdapterCommunication::Open(const char *strPort, int iBaudRate /* = 38400 *
void CAdapterCommunication::Close(void)
{
void CAdapterCommunication::Close(void)
{
+ CLockObject lock(&m_commMutex);
StopThread();
StopThread();
- m_port->Close();
+
+ if (m_inbuf)
+ {
+ free(m_inbuf);
+ m_inbuf = NULL;
+ m_iInbufSize = 0;
+ m_iInbufUsed = 0;
+ }
+
+ m_rcvCondition.Broadcast();
}
void *CAdapterCommunication::Process(void)
{
}
void *CAdapterCommunication::Process(void)
{
- while (!m_bStop)
+ m_controller->AddLog(CEC_LOG_DEBUG, "communication thread started");
+
+ while (!IsStopped())
{
{
- if (!ReadFromDevice(250))
{
{
-
m_bStarted = false
;
-
break
;
+
CLockObject lock(&m_commMutex)
;
+
ReadFromDevice(100)
;
}
}
- if (!
m_bStop
)
-
CCondition::Sleep(50
);
+ if (!
IsStopped()
)
+
Sleep(5
);
}
}
- CLockObject lock(&m_commMutex);
- m_bStarted = false;
return NULL;
}
return NULL;
}
-bool CAdapterCommunication::ReadFromDevice(
in
t iTimeout)
+bool CAdapterCommunication::ReadFromDevice(
uint32_
t iTimeout)
{
{
+ int32_t iBytesRead;
uint8_t buff[1024];
uint8_t buff[1024];
- CLockObject lock(&m_commMutex);
if (!m_port)
return false;
if (!m_port)
return false;
- int iBytesRead = m_port->Read(buff, sizeof(buff), iTimeout);
- lock.Leave();
- if (iBytesRead < 0)
+ iBytesRead = m_port->Read(buff, sizeof(buff), iTimeout);
+ if (iBytesRead < 0 || iBytesRead > 256)
{
CStdString strError;
strError.Format("error reading from serial port: %s", m_port->GetError().c_str());
{
CStdString strError;
strError.Format("error reading from serial port: %s", m_port->GetError().c_str());
@@
-138,31
+156,30
@@
bool CAdapterCommunication::ReadFromDevice(int iTimeout)
return false;
}
else if (iBytesRead > 0)
return false;
}
else if (iBytesRead > 0)
- AddData(buff, iBytesRead);
+ AddData(buff,
(uint8_t)
iBytesRead);
- return
true
;
+ return
iBytesRead > 0
;
}
}
-void CAdapterCommunication::AddData(uint8_t *data,
in
t iLen)
+void CAdapterCommunication::AddData(uint8_t *data,
uint8_
t iLen)
{
CLockObject lock(&m_bufferMutex);
{
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;
m_inbuf = (uint8_t*)realloc(m_inbuf, m_iInbufSize);
}
memcpy(m_inbuf + m_iInbufUsed, data, iLen);
m_iInbufUsed += iLen;
- lock.Leave();
- m_
c
ondition.Signal();
+
+ m_
rcvC
ondition.Signal();
}
bool CAdapterCommunication::Write(const cec_frame &data)
{
CLockObject lock(&m_commMutex);
}
bool CAdapterCommunication::Write(const cec_frame &data)
{
CLockObject lock(&m_commMutex);
-
- if (m_port->Write(data) != 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());
{
CStdString strError;
strError.Format("error writing to serial port: %s", m_port->GetError().c_str());
@@
-171,29
+188,31
@@
bool CAdapterCommunication::Write(const cec_frame &data)
}
m_controller->AddLog(CEC_LOG_DEBUG, "command sent");
}
m_controller->AddLog(CEC_LOG_DEBUG, "command sent");
-
- CCondition::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;
}
return true;
}
-bool CAdapterCommunication::Read(cec_frame &msg,
in
t iTimeout)
+bool CAdapterCommunication::Read(cec_frame &msg,
uint32_
t iTimeout)
{
CLockObject lock(&m_bufferMutex);
if (m_iInbufUsed < 1)
{
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
return false;
//search for first start of message
- int startpos = -1;
- for (int
i = 0; i < m_iInbufUsed; i
++)
+ int
16_t
startpos = -1;
+ for (int
16_t iPtr = 0; iPtr < m_iInbufUsed; iPtr
++)
{
{
- if (m_inbuf[i] == MSGSTART)
+ if (m_inbuf[i
Ptr
] == MSGSTART)
{
{
- startpos = i;
+ startpos = i
Ptr
;
break;
}
}
break;
}
}
@@
-213,17
+232,17
@@
bool CAdapterCommunication::Read(cec_frame &msg, int iTimeout)
//look for end of message
startpos = -1;
//look for end of message
startpos = -1;
- int endpos = -1;
- for (int
i = 1; i < m_iInbufUsed; i
++)
+ int
16_t
endpos = -1;
+ for (int
16_t iPtr = 1; iPtr < m_iInbufUsed; iPtr
++)
{
{
- if (m_inbuf[i] == MSGEND)
+ if (m_inbuf[i
Ptr
] == MSGEND)
{
{
- endpos = i;
+ endpos = i
Ptr
;
break;
}
break;
}
- else if (m_inbuf[i] == MSGSTART)
+ else if (m_inbuf[i
Ptr
] == MSGSTART)
{
{
- startpos = i;
+ startpos = i
Ptr
;
break;
}
}
break;
}
}
@@
-240,20
+259,20
@@
bool CAdapterCommunication::Read(cec_frame &msg, int iTimeout)
{
msg.clear();
bool isesc = false;
{
msg.clear();
bool isesc = false;
- for (int
i = 1; i < endpos; i
++)
+ for (int
16_t iPtr = 1; iPtr < endpos; iPtr
++)
{
if (isesc)
{
{
if (isesc)
{
- msg.push_back(m_inbuf[i] + (uint8_t)ESCOFFSET);
+ msg.push_back(m_inbuf[i
Ptr
] + (uint8_t)ESCOFFSET);
isesc = false;
}
isesc = false;
}
- else if (m_inbuf[i] == MSGESC)
+ else if (m_inbuf[i
Ptr
] == MSGESC)
{
isesc = true;
}
else
{
{
isesc = true;
}
else
{
- msg.push_back(m_inbuf[i]);
+ msg.push_back(m_inbuf[i
Ptr
]);
}
}
}
}
@@
-280,6
+299,8
@@
bool CAdapterCommunication::StartBootloader(void)
m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
cec_frame output;
m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
cec_frame output;
+ output.clear();
+
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_START_BOOTLOADER);
output.push_back(MSGEND);
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_START_BOOTLOADER);
output.push_back(MSGEND);
@@
-316,6
+337,7
@@
bool CAdapterCommunication::SetAckMask(uint16_t iMask)
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
cec_frame output;
m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
cec_frame output;
+ output.clear();
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_SET_ACK_MASK);
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_SET_ACK_MASK);
@@
-339,6
+361,8
@@
bool CAdapterCommunication::PingAdapter(void)
m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
cec_frame output;
m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
cec_frame output;
+ output.clear();
+
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_PING);
output.push_back(MSGEND);
output.push_back(MSGSTART);
PushEscaped(output, MSGCODE_PING);
output.push_back(MSGEND);
@@
-354,3
+378,8
@@
bool CAdapterCommunication::PingAdapter(void)
// TODO check for pong
return true;
}
// TODO check for pong
return true;
}
+
+bool CAdapterCommunication::IsOpen(void) const
+{
+ return !IsStopped() && m_port->IsOpen();
+}